From 209e7212190c3d9effdb009135468389f35e1052 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 6 Aug 2018 12:45:46 -0400 Subject: [PATCH 1/8] Post-release version bump --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 6f1c240aa..69269e2a8 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -22,7 +22,7 @@ if sys.version_info[0] < 3: DeprecationWarning ) -VERSION = '2.4.0' +VERSION = '2.4.1-dev' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) From 12dfd4b6e0a201024849911094b25f56e7242f05 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 6 Aug 2018 13:32:52 -0400 Subject: [PATCH 2/8] Fixes #2308: Custom fields panel absent from object view in UI --- netbox/templates/inc/custom_fields_panel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/templates/inc/custom_fields_panel.html b/netbox/templates/inc/custom_fields_panel.html index 3b82b8ee6..e469048af 100644 --- a/netbox/templates/inc/custom_fields_panel.html +++ b/netbox/templates/inc/custom_fields_panel.html @@ -1,4 +1,4 @@ -{% with custom_fields=obj.custom_fields %} +{% with custom_fields=obj.get_custom_fields %} {% if custom_fields %}
From bba88b2be4747c54ac5e48d4919fedcae4e1977b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 6 Aug 2018 14:14:40 -0400 Subject: [PATCH 3/8] Fixes #2303: Always redirect to parent object when bulk editing/deleting components --- netbox/templates/dcim/device.html | 2 +- netbox/templates/dcim/inc/devicetype_component_table.html | 4 ++-- netbox/templates/virtualization/virtualmachine.html | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index a915d0c7f..62b54f361 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -553,7 +553,7 @@ {% endif %} {% if interfaces and perms.dcim.delete_interface %} - {% endif %} diff --git a/netbox/templates/dcim/inc/devicetype_component_table.html b/netbox/templates/dcim/inc/devicetype_component_table.html index b43a3612f..e549880f9 100644 --- a/netbox/templates/dcim/inc/devicetype_component_table.html +++ b/netbox/templates/dcim/inc/devicetype_component_table.html @@ -9,12 +9,12 @@
{% if table.rows %} {% if edit_url %} - {% endif %} {% if delete_url %} - {% endif %} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 97502af5c..e3b092ba8 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -282,12 +282,12 @@ - {% endif %} {% if interfaces and perms.dcim.delete_interface %} - {% endif %} From 98bdb0cb3c2f030e1300f35ce47e8d4bbd390f9e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 6 Aug 2018 17:40:45 -0400 Subject: [PATCH 4/8] Fixes #2310: False validation error on certain nested serializers --- netbox/dcim/api/serializers.py | 6 ++-- netbox/dcim/tests/test_api.py | 40 ++++++++++++++++++++---- netbox/virtualization/api/serializers.py | 2 +- netbox/virtualization/tests/test_api.py | 11 ++++++- 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 12981c6e3..d1bfa535d 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -362,7 +362,7 @@ class NestedPlatformSerializer(WritableNestedSerializer): # # Cannot import ipam.api.NestedIPAddressSerializer due to circular dependency -class DeviceIPAddressSerializer(serializers.ModelSerializer): +class DeviceIPAddressSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail') class Meta: @@ -371,7 +371,7 @@ class DeviceIPAddressSerializer(serializers.ModelSerializer): # Cannot import virtualization.api.NestedClusterSerializer due to circular dependency -class NestedClusterSerializer(serializers.ModelSerializer): +class NestedClusterSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:cluster-detail') class Meta: @@ -380,7 +380,7 @@ class NestedClusterSerializer(serializers.ModelSerializer): # Cannot import NestedVirtualChassisSerializer due to circular dependency -class DeviceVirtualChassisSerializer(serializers.ModelSerializer): +class DeviceVirtualChassisSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail') master = NestedDeviceSerializer() diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 6498e7f39..d4a42c196 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals from django.urls import reverse +from netaddr import IPNetwork from rest_framework import status from dcim.constants import ( @@ -13,9 +14,10 @@ from dcim.models import ( InventoryItem, Platform, PowerPort, PowerPortTemplate, PowerOutlet, PowerOutletTemplate, Rack, RackGroup, RackReservation, RackRole, Region, Site, VirtualChassis, ) -from ipam.models import VLAN +from ipam.models import IPAddress, VLAN from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE from utilities.testing import APITestCase +from virtualization.models import Cluster, ClusterType class RegionTest(APITestCase): @@ -1680,14 +1682,28 @@ class DeviceTest(APITestCase): self.devicerole2 = DeviceRole.objects.create( name='Test Device Role 2', slug='test-device-role-2', color='00ff00' ) + cluster_type = ClusterType.objects.create(name='Test Cluster Type 1', slug='test-cluster-type-1') + self.cluster1 = Cluster.objects.create(name='Test Cluster 1', type=cluster_type) self.device1 = Device.objects.create( - device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 1', site=self.site1 + device_type=self.devicetype1, + device_role=self.devicerole1, + name='Test Device 1', + site=self.site1, + cluster=self.cluster1 ) self.device2 = Device.objects.create( - device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 2', site=self.site1 + device_type=self.devicetype1, + device_role=self.devicerole1, + name='Test Device 2', + site=self.site1, + cluster=self.cluster1 ) self.device3 = Device.objects.create( - device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 3', site=self.site1 + device_type=self.devicetype1, + device_role=self.devicerole1, + name='Test Device 3', + site=self.site1, + cluster=self.cluster1 ) def test_get_device(self): @@ -1696,6 +1712,8 @@ class DeviceTest(APITestCase): response = self.client.get(url, **self.header) self.assertEqual(response.data['name'], self.device1.name) + self.assertEqual(response.data['device_role']['id'], self.devicerole1.pk) + self.assertEqual(response.data['cluster']['id'], self.cluster1.pk) def test_list_devices(self): @@ -1711,6 +1729,7 @@ class DeviceTest(APITestCase): 'device_role': self.devicerole1.pk, 'name': 'Test Device 4', 'site': self.site1.pk, + 'cluster': self.cluster1.pk, } url = reverse('dcim-api:device-list') @@ -1722,7 +1741,8 @@ class DeviceTest(APITestCase): self.assertEqual(device4.device_type_id, data['device_type']) self.assertEqual(device4.device_role_id, data['device_role']) self.assertEqual(device4.name, data['name']) - self.assertEqual(device4.site_id, data['site']) + self.assertEqual(device4.site.pk, data['site']) + self.assertEqual(device4.cluster.pk, data['cluster']) def test_create_device_bulk(self): @@ -1758,11 +1778,17 @@ class DeviceTest(APITestCase): def test_update_device(self): + interface = Interface.objects.create(name='Test Interface 1', device=self.device1) + ip4_address = IPAddress.objects.create(address=IPNetwork('192.0.2.1/24'), interface=interface) + ip6_address = IPAddress.objects.create(address=IPNetwork('2001:db8::1/64'), interface=interface) + data = { 'device_type': self.devicetype2.pk, 'device_role': self.devicerole2.pk, 'name': 'Test Device X', 'site': self.site2.pk, + 'primary_ip4': ip4_address.pk, + 'primary_ip6': ip6_address.pk, } url = reverse('dcim-api:device-detail', kwargs={'pk': self.device1.pk}) @@ -1774,7 +1800,9 @@ class DeviceTest(APITestCase): self.assertEqual(device1.device_type_id, data['device_type']) self.assertEqual(device1.device_role_id, data['device_role']) self.assertEqual(device1.name, data['name']) - self.assertEqual(device1.site_id, data['site']) + self.assertEqual(device1.site.pk, data['site']) + self.assertEqual(device1.primary_ip4.pk, data['primary_ip4']) + self.assertEqual(device1.primary_ip6.pk, data['primary_ip6']) def test_delete_device(self): diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py index 9664e9218..218578d1a 100644 --- a/netbox/virtualization/api/serializers.py +++ b/netbox/virtualization/api/serializers.py @@ -82,7 +82,7 @@ class NestedClusterSerializer(WritableNestedSerializer): # # Cannot import ipam.api.NestedIPAddressSerializer due to circular dependency -class VirtualMachineIPAddressSerializer(serializers.ModelSerializer): +class VirtualMachineIPAddressSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail') class Meta: diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index b397e9dff..c3eebf5ed 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -1,11 +1,12 @@ from __future__ import unicode_literals from django.urls import reverse +from netaddr import IPNetwork from rest_framework import status from dcim.constants import IFACE_FF_VIRTUAL, IFACE_MODE_TAGGED from dcim.models import Interface -from ipam.models import VLAN +from ipam.models import IPAddress, VLAN from utilities.testing import APITestCase from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine @@ -367,6 +368,10 @@ class VirtualMachineTest(APITestCase): def test_update_virtualmachine(self): + interface = Interface.objects.create(name='Test Interface 1', virtual_machine=self.virtualmachine1) + ip4_address = IPAddress.objects.create(address=IPNetwork('192.0.2.1/24'), interface=interface) + ip6_address = IPAddress.objects.create(address=IPNetwork('2001:db8::1/64'), interface=interface) + cluster2 = Cluster.objects.create( name='Test Cluster 2', type=ClusterType.objects.first(), @@ -375,6 +380,8 @@ class VirtualMachineTest(APITestCase): data = { 'name': 'Test Virtual Machine X', 'cluster': cluster2.pk, + 'primary_ip4': ip4_address.pk, + 'primary_ip6': ip6_address.pk, } url = reverse('virtualization-api:virtualmachine-detail', kwargs={'pk': self.virtualmachine1.pk}) @@ -385,6 +392,8 @@ class VirtualMachineTest(APITestCase): virtualmachine1 = VirtualMachine.objects.get(pk=response.data['id']) self.assertEqual(virtualmachine1.name, data['name']) self.assertEqual(virtualmachine1.cluster.pk, data['cluster']) + self.assertEqual(virtualmachine1.primary_ip4.pk, data['primary_ip4']) + self.assertEqual(virtualmachine1.primary_ip6.pk, data['primary_ip6']) def test_delete_virtualmachine(self): From 64f34d9cd7011ec078ed1038a73f3ff377b8edcd Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 7 Aug 2018 08:46:41 -0400 Subject: [PATCH 5/8] Fixes #2311: Redirect to parent after editing interface from device/VM view --- netbox/templates/dcim/inc/interface.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 6fd0bd52e..44da7cbc2 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -111,7 +111,7 @@ {% endif %} {% endif %} - + {% endif %} From 1905516536d2440985a43bcf628347da8a26ff5d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 7 Aug 2018 08:52:57 -0400 Subject: [PATCH 6/8] Fixes #2314: Serialized representation of object in change log does not incldue assigned tags --- netbox/utilities/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py index 2ba5fa4ba..14c29d211 100644 --- a/netbox/utilities/utils.py +++ b/netbox/utilities/utils.py @@ -101,8 +101,8 @@ def serialize_object(obj, extra=None): } # Include any tags - # if hasattr(obj, 'tags'): - # data['tags'] = [tag.name for tag in obj.tags.all()] + if hasattr(obj, 'tags'): + data['tags'] = [tag.name for tag in obj.tags.all()] # Append any extra data if extra is not None: From c7acddbc5cdccaddd6e51e10848f494e9820877c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 7 Aug 2018 09:12:05 -0400 Subject: [PATCH 7/8] Fixes #2312: Running a report yields a ValueError exception --- netbox/_reports | 1 + netbox/extras/reports.py | 6 ++---- netbox/reports/__init__.py | 0 3 files changed, 3 insertions(+), 4 deletions(-) create mode 160000 netbox/_reports delete mode 100644 netbox/reports/__init__.py diff --git a/netbox/_reports b/netbox/_reports new file mode 160000 index 000000000..b3a449437 --- /dev/null +++ b/netbox/_reports @@ -0,0 +1 @@ +Subproject commit b3a449437792668041d5cfb9cd6d025e1a5b3470 diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py index 9b45f47aa..a516a0b09 100644 --- a/netbox/extras/reports.py +++ b/netbox/extras/reports.py @@ -16,16 +16,14 @@ def is_report(obj): """ Returns True if the given object is a Report. """ - if obj in Report.__subclasses__(): - return True - return False + return obj in Report.__subclasses__() def get_report(module_name, report_name): """ Return a specific report from within a module. """ - module = importlib.import_module('reports.{}'.format(module_name)) + module = importlib.import_module(module_name) report = getattr(module, report_name, None) if report is None: return None diff --git a/netbox/reports/__init__.py b/netbox/reports/__init__.py deleted file mode 100644 index e69de29bb..000000000 From 81479ac1778ef58379e8a3bf1abb5a2bb6f4d82a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 7 Aug 2018 09:23:49 -0400 Subject: [PATCH 8/8] Release v2.4.1 --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 69269e2a8..b161c4823 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -22,7 +22,7 @@ if sys.version_info[0] < 3: DeprecationWarning ) -VERSION = '2.4.1-dev' +VERSION = '2.4.1' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))