Merge release v2.4.6

netbox/ipam/tests/test_api.py

@@ -32,6 +32,16 @@ class VRFTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
+    def test_list_vrfs_brief(self):
+
+        url = reverse('ipam-api:vrf-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'rd', 'url']
+        )
+
     def test_create_vrf(self):
 
         data = {
@@ -123,6 +133,16 @@ class RIRTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
+    def test_list_rirs_brief(self):
+
+        url = reverse('ipam-api:rir-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
     def test_create_rir(self):
 
         data = {
@@ -216,6 +236,16 @@ class AggregateTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
+    def test_list_aggregates_brief(self):
+
+        url = reverse('ipam-api:aggregate-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['family', 'id', 'prefix', 'url']
+        )
+
     def test_create_aggregate(self):
 
         data = {
@@ -307,6 +337,16 @@ class RoleTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
+    def test_list_roles_brief(self):
+
+        url = reverse('ipam-api:role-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
     def test_create_role(self):
 
         data = {
@@ -395,13 +435,23 @@ class PrefixTest(APITestCase):
 
         self.assertEqual(response.data['prefix'], str(self.prefix1.prefix))
 
-    def test_list_prefixs(self):
+    def test_list_prefixes(self):
 
         url = reverse('ipam-api:prefix-list')
         response = self.client.get(url, **self.header)
 
         self.assertEqual(response.data['count'], 3)
 
+    def test_list_prefixes_brief(self):
+
+        url = reverse('ipam-api:prefix-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['family', 'id', 'prefix', 'url']
+        )
+
     def test_create_prefix(self):
 
         data = {
@@ -628,6 +678,16 @@ class IPAddressTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
+    def test_list_ipaddresses_brief(self):
+
+        url = reverse('ipam-api:ipaddress-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['address', 'family', 'id', 'url']
+        )
+
     def test_create_ipaddress(self):
 
         data = {
@@ -716,6 +776,16 @@ class VLANGroupTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
+    def test_list_vlangroups_brief(self):
+
+        url = reverse('ipam-api:vlangroup-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['id', 'name', 'slug', 'url']
+        )
+
     def test_create_vlangroup(self):
 
         data = {
@@ -807,6 +877,16 @@ class VLANTest(APITestCase):
 
         self.assertEqual(response.data['count'], 3)
 
+    def test_list_vlans_brief(self):
+
+        url = reverse('ipam-api:vlan-list')
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
+
+        self.assertEqual(
+            sorted(response.data['results'][0]),
+            ['display_name', 'id', 'name', 'url', 'vid']
+        )
+
     def test_create_vlan(self):
 
         data = {

netbox/ipam/views.py

@@ -989,6 +989,9 @@ class ServiceCreateView(PermissionRequiredMixin, ObjectEditView):
             obj.virtual_machine = get_object_or_404(VirtualMachine, pk=url_kwargs['virtualmachine'])
         return obj
 
+    def get_return_url(self, request, service):
+        return service.parent.get_absolute_url()
+
 
 class ServiceEditView(ServiceCreateView):
     permission_required = 'ipam.change_service'