From 25d6bbf6593aa32553a546782e960cb8a1159fb0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 23 Jun 2020 14:38:45 -0400 Subject: [PATCH] Update view and permission names for VMInterface --- netbox/ipam/tables.py | 2 +- netbox/templates/dcim/inc/interface.html | 4 +-- netbox/templates/dcim/interface.html | 4 +-- .../templates/virtualization/interface.html | 4 +-- .../virtualization/interface_edit.html | 2 +- .../virtualization/virtualmachine.html | 6 ++-- .../virtualization/virtualmachine_list.html | 2 +- .../virtualization/api/nested_serializers.py | 2 +- netbox/virtualization/models.py | 2 +- netbox/virtualization/tests/test_api.py | 36 +++++++++---------- netbox/virtualization/urls.py | 14 ++++---- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 8f731b7ae..064b8d7ce 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -168,7 +168,7 @@ VLAN_MEMBER_UNTAGGED = """ VLAN_MEMBER_ACTIONS = """ {% if perms.dcim.change_interface %} - + {% endif %} """ diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 2fe970fd7..640fca338 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -166,7 +166,7 @@ {% endif %} - + {% endif %} @@ -176,7 +176,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 5714c8940..b4485edae 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -17,12 +17,12 @@
{% if perms.dcim.change_interface %} - + Edit {% endif %} {% if perms.dcim.delete_interface %} - + Delete {% endif %} diff --git a/netbox/templates/virtualization/interface.html b/netbox/templates/virtualization/interface.html index 15b432a3f..8c3cb47ff 100644 --- a/netbox/templates/virtualization/interface.html +++ b/netbox/templates/virtualization/interface.html @@ -17,12 +17,12 @@
{% if perms.dcim.change_interface %} - + Edit {% endif %} {% if perms.dcim.delete_interface %} - + Delete {% endif %} diff --git a/netbox/templates/virtualization/interface_edit.html b/netbox/templates/virtualization/interface_edit.html index 437b960c9..6b0313284 100644 --- a/netbox/templates/virtualization/interface_edit.html +++ b/netbox/templates/virtualization/interface_edit.html @@ -21,7 +21,7 @@ {% block buttons %} {% if obj.pk %} - + {% else %} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index ea8f4fedb..b3ac51f37 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -297,18 +297,18 @@ - {% endif %} {% if interfaces and perms.dcim.delete_interface %} - {% endif %} {% if perms.dcim.add_interface %}
- + Add interfaces
diff --git a/netbox/templates/virtualization/virtualmachine_list.html b/netbox/templates/virtualization/virtualmachine_list.html index 74839b250..f8ee77626 100644 --- a/netbox/templates/virtualization/virtualmachine_list.html +++ b/netbox/templates/virtualization/virtualmachine_list.html @@ -7,7 +7,7 @@ Add Components
{% endif %} diff --git a/netbox/virtualization/api/nested_serializers.py b/netbox/virtualization/api/nested_serializers.py index 47b7e6442..6e7a7c460 100644 --- a/netbox/virtualization/api/nested_serializers.py +++ b/netbox/virtualization/api/nested_serializers.py @@ -57,7 +57,7 @@ class NestedVirtualMachineSerializer(WritableNestedSerializer): class NestedInterfaceSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:interface-detail') + url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:vminterface-detail') virtual_machine = NestedVirtualMachineSerializer(read_only=True) class Meta: diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py index 1ef4832a8..24e5f4e87 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -431,7 +431,7 @@ class VMInterface(BaseInterface): return self.name def get_absolute_url(self): - return reverse('virtualization:interface', kwargs={'pk': self.pk}) + return reverse('virtualization:vminterface', kwargs={'pk': self.pk}) def to_csv(self): return ( diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index bc1b3332c..c307d6da6 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -221,22 +221,22 @@ class InterfaceTest(APITestCase): self.vlan3 = VLAN.objects.create(name="Test VLAN 3", vid=3) def test_get_interface(self): - url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk}) - self.add_permissions('virtualization.view_interface') + url = reverse('virtualization-api:vminterface-detail', kwargs={'pk': self.interface1.pk}) + self.add_permissions('virtualization.view_vminterface') response = self.client.get(url, **self.header) self.assertEqual(response.data['name'], self.interface1.name) def test_list_interfaces(self): - url = reverse('virtualization-api:interface-list') - self.add_permissions('virtualization.view_interface') + url = reverse('virtualization-api:vminterface-list') + self.add_permissions('virtualization.view_vminterface') response = self.client.get(url, **self.header) self.assertEqual(response.data['count'], 3) def test_list_interfaces_brief(self): - url = reverse('virtualization-api:interface-list') - self.add_permissions('virtualization.view_interface') + url = reverse('virtualization-api:vminterface-list') + self.add_permissions('virtualization.view_vminterface') response = self.client.get('{}?brief=1'.format(url), **self.header) self.assertEqual( @@ -249,8 +249,8 @@ class InterfaceTest(APITestCase): 'virtual_machine': self.virtualmachine.pk, 'name': 'Test Interface 4', } - url = reverse('virtualization-api:interface-list') - self.add_permissions('virtualization.add_interface') + url = reverse('virtualization-api:vminterface-list') + self.add_permissions('virtualization.add_vminterface') response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) @@ -267,8 +267,8 @@ class InterfaceTest(APITestCase): 'untagged_vlan': self.vlan3.id, 'tagged_vlans': [self.vlan1.id, self.vlan2.id], } - url = reverse('virtualization-api:interface-list') - self.add_permissions('virtualization.add_interface') + url = reverse('virtualization-api:vminterface-list') + self.add_permissions('virtualization.add_vminterface') response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) @@ -293,8 +293,8 @@ class InterfaceTest(APITestCase): 'name': 'Test Interface 6', }, ] - url = reverse('virtualization-api:interface-list') - self.add_permissions('virtualization.add_interface') + url = reverse('virtualization-api:vminterface-list') + self.add_permissions('virtualization.add_vminterface') response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) @@ -327,8 +327,8 @@ class InterfaceTest(APITestCase): 'tagged_vlans': [self.vlan1.id], }, ] - url = reverse('virtualization-api:interface-list') - self.add_permissions('virtualization.add_interface') + url = reverse('virtualization-api:vminterface-list') + self.add_permissions('virtualization.add_vminterface') response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) @@ -343,8 +343,8 @@ class InterfaceTest(APITestCase): 'virtual_machine': self.virtualmachine.pk, 'name': 'Test Interface X', } - url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk}) - self.add_permissions('virtualization.change_interface') + url = reverse('virtualization-api:vminterface-detail', kwargs={'pk': self.interface1.pk}) + self.add_permissions('virtualization.change_vminterface') response = self.client.put(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_200_OK) @@ -353,8 +353,8 @@ class InterfaceTest(APITestCase): self.assertEqual(interface1.name, data['name']) def test_delete_interface(self): - url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk}) - self.add_permissions('virtualization.delete_interface') + url = reverse('virtualization-api:vminterface-detail', kwargs={'pk': self.interface1.pk}) + self.add_permissions('virtualization.delete_vminterface') response = self.client.delete(url, **self.header) self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py index 4e29f861a..b4aae617b 100644 --- a/netbox/virtualization/urls.py +++ b/netbox/virtualization/urls.py @@ -51,12 +51,12 @@ urlpatterns = [ path('virtual-machines//services/assign/', ServiceEditView.as_view(), name='virtualmachine_service_assign'), # VM interfaces - path('interfaces/add/', views.InterfaceCreateView.as_view(), name='interface_add'), - path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), - path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), - path('interfaces//', views.InterfaceView.as_view(), name='interface'), - path('interfaces//edit/', views.InterfaceEditView.as_view(), name='interface_edit'), - path('interfaces//delete/', views.InterfaceDeleteView.as_view(), name='interface_delete'), - path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_interface'), + path('interfaces/add/', views.InterfaceCreateView.as_view(), name='vminterface_add'), + path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'), + path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'), + path('interfaces//', views.InterfaceView.as_view(), name='vminterface'), + path('interfaces//edit/', views.InterfaceEditView.as_view(), name='vminterface_edit'), + path('interfaces//delete/', views.InterfaceDeleteView.as_view(), name='vminterface_delete'), + path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_vminterface'), ]