nautobot 2.0.0a3__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/ipam/tests/test_api.py

@@ -1,8 +1,7 @@
 from concurrent.futures.thread import ThreadPoolExecutor
 import json
-import logging
-from random import shuffle
 from unittest import skip
+from random import shuffle
 
 from django.db import connection
 from django.urls import reverse
@@ -28,7 +27,6 @@ class AppTest(APITestCase):
 @skip("Needs to be updated for Namespaces")
 class VRFTest(APIViewTestCases.APIViewTestCase):
     model = VRF
-    brief_fields = ["display", "id", "name", "prefix_count", "rd", "url"]
     create_data = [
         {
             "name": "VRF 4",
@@ -50,7 +48,6 @@ class VRFTest(APIViewTestCases.APIViewTestCase):
 
 class RouteTargetTest(APIViewTestCases.APIViewTestCase):
     model = RouteTarget
-    brief_fields = ["display", "id", "name", "url"]
     create_data = [
         {
             "name": "65000:1004",
@@ -69,7 +66,6 @@ class RouteTargetTest(APIViewTestCases.APIViewTestCase):
 
 class RIRTest(APIViewTestCases.APIViewTestCase):
     model = RIR
-    brief_fields = ["assigned_prefix_count", "display", "id", "name", "url"]
     create_data = [
         {
             "name": "RIR 4",
@@ -103,7 +99,6 @@ class RIRTest(APIViewTestCases.APIViewTestCase):
 @skip("Needs to be updated for Namespaces")
 class PrefixTest(APIViewTestCases.APIViewTestCase):
     model = Prefix
-    brief_fields = ["display", "id", "ip_version", "namespace", "prefix", "url"]
     choices_fields = []
 
     @classmethod
@@ -186,7 +181,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             response = self.client.post(url, data, format="json", **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
             self.assertEqual(response.data["prefix"], str(prefixes_to_be_created[i]))
-            self.assertEqual(response.data["vrf"]["id"], str(prefix.vrf.pk))
+            self.assertEqual(str(response.data["vrf"]), self.absolute_api_url(prefix.vrf))
             self.assertEqual(response.data["description"], data["description"])
 
         # Try to create one more prefix
@@ -279,7 +274,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             }
             response = self.client.post(url, data, format="json", **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
-            self.assertEqual(response.data["vrf"]["id"], str(vrf.pk))
+            self.assertEqual(str(response.data["vrf"]), self.absolute_api_url(vrf))
             self.assertEqual(response.data["description"], data["description"])
 
         # Try to create one more IP
@@ -317,31 +312,31 @@ class ParallelPrefixTest(APITransactionTestCase):
     """
 
     def test_create_multiple_available_prefixes_parallel(self):
-        prefix = Prefix.objects.create(prefix=IPNetwork("192.0.2.0/28"), type=choices.PrefixTypeChoices.TYPE_POOL)
         prefix_status = Status.objects.get_for_model(Prefix).first()
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork("192.0.2.0/28"), type=choices.PrefixTypeChoices.TYPE_POOL, status=prefix_status
+        )
 
         # 5 Prefixes
         requests = [
             {"prefix_length": 30, "description": f"Test Prefix {i}", "status": prefix_status.pk} for i in range(1, 6)
         ]
         url = reverse("ipam-api:prefix-available-prefixes", kwargs={"pk": prefix.pk})
-        logging.disable(logging.ERROR)
         self._do_parallel_requests(url, requests)
-        logging.disable(logging.NOTSET)
 
         prefixes = [str(o) for o in Prefix.objects.filter(prefix_length=30).all()]
         self.assertEqual(len(prefixes), len(set(prefixes)), "Duplicate prefixes should not exist")
 
     def test_create_multiple_available_ips_parallel(self):
-        prefix = Prefix.objects.create(prefix=IPNetwork("192.0.2.0/29"), type=choices.PrefixTypeChoices.TYPE_POOL)
         prefix_status = Status.objects.get_for_model(Prefix).first()
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork("192.0.2.0/29"), type=choices.PrefixTypeChoices.TYPE_POOL, status=prefix_status
+        )
 
         # 8 IPs
         requests = [{"description": f"Test IP {i}", "status": prefix_status.pk} for i in range(1, 9)]
         url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        logging.disable(logging.ERROR)
         self._do_parallel_requests(url, requests)
-        logging.disable(logging.NOTSET)
         ips = [str(o) for o in IPAddress.objects.filter().all()]
         self.assertEqual(len(ips), len(set(ips)), "Duplicate IPs should not exist")
 
@@ -366,7 +361,6 @@ class ParallelPrefixTest(APITransactionTestCase):
 @skip("Needs to be updated for Namespaces")
 class IPAddressTest(APIViewTestCases.APIViewTestCase):
     model = IPAddress
-    brief_fields = ["address", "display", "id", "ip_version", "parent", "url"]
 
     @classmethod
     def setUpTestData(cls):
@@ -430,7 +424,7 @@ class IPAddressTest(APIViewTestCases.APIViewTestCase):
         self.assertHttpStatus(ip2, status.HTTP_201_CREATED)
 
         response = self.client.get(
-            self._get_detail_url(nat_inside),
+            self._get_detail_url(nat_inside) + "?depth=1",
             **self.header,
         )
         self.assertHttpStatus(response, status.HTTP_200_OK)
@@ -440,7 +434,6 @@ class IPAddressTest(APIViewTestCases.APIViewTestCase):
 
 class VLANGroupTest(APIViewTestCases.APIViewTestCase):
     model = VLANGroup
-    brief_fields = ["display", "id", "name", "slug", "url", "vlan_count"]
     create_data = [
         {
             "name": "VLAN Group 4",
@@ -466,7 +459,6 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
 
 class VLANTest(APIViewTestCases.APIViewTestCase):
     model = VLAN
-    brief_fields = ["display", "id", "name", "url", "vid"]
     choices_fields = []
 
     @classmethod
@@ -530,7 +522,6 @@ class VLANTest(APIViewTestCases.APIViewTestCase):
 
 class ServiceTest(APIViewTestCases.APIViewTestCase):
     model = Service
-    brief_fields = ["display", "id", "name", "ports", "protocol", "url"]
     bulk_update_data = {
         "description": "New description",
     }
@@ -542,6 +533,7 @@ class ServiceTest(APIViewTestCases.APIViewTestCase):
         manufacturer = Manufacturer.objects.first()
         devicetype = DeviceType.objects.create(manufacturer=manufacturer, model="Device Type 1")
         devicerole = Role.objects.get_for_model(Device).first()
+        devicestatus = Status.objects.get_for_model(Device).first()
 
         devices = (
             Device.objects.create(
@@ -549,12 +541,14 @@ class ServiceTest(APIViewTestCases.APIViewTestCase):
                 location=location,
                 device_type=devicetype,
                 role=devicerole,
+                status=devicestatus,
             ),
             Device.objects.create(
                 name="Device 2",
                 location=location,
                 device_type=devicetype,
                 role=devicerole,
+                status=devicestatus,
             ),
         )
         cls.devices = devices
@@ -627,3 +621,12 @@ class ServiceTest(APIViewTestCases.APIViewTestCase):
         response = self.client.post(url, data, format="json", **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(response.json()["ports"], expected)
+
+    # TODO: Unskip after resolving #2908, #2909
+    @skip("DRF's built-in OrderingFilter triggering natural key attribute error in our base")
+    def test_list_objects_ascending_ordered(self):
+        pass
+
+    @skip("DRF's built-in OrderingFilter triggering natural key attribute error in our base")
+    def test_list_objects_descending_ordered(self):
+        pass

nautobot/ipam/tests/test_filters.py

@@ -295,9 +295,10 @@ class PrefixTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
     def test_location(self):
         location_type_1 = LocationType.objects.get(name="Campus")
         location_type_2 = LocationType.objects.get(name="Building")
+        loc_status = Status.objects.get_for_model(Location).first()
         test_locations = (
-            Location.objects.create(name="Location 1", location_type=location_type_1),
-            Location.objects.create(name="Location 2", location_type=location_type_2),
+            Location.objects.create(name="Location 1", location_type=location_type_1, status=loc_status),
+            Location.objects.create(name="Location 2", location_type=location_type_2, status=loc_status),
         )
         test_locations[1].parent = test_locations[0]
         PrefixFactory(location=test_locations[0])
@@ -343,6 +344,7 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
         manufacturer = Manufacturer.objects.first()
         device_type = DeviceType.objects.create(manufacturer=manufacturer, model="Device Type 1")
         device_role = Role.objects.get_for_model(Device).first()
+        device_status = Status.objects.get_for_model(Device).first()
 
         devices = (
             Device.objects.create(
@@ -350,40 +352,58 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
                 name="Device 1",
                 location=location,
                 role=device_role,
+                status=device_status,
             ),
             Device.objects.create(
                 device_type=device_type,
                 name="Device 2",
                 location=location,
                 role=device_role,
+                status=device_status,
             ),
             Device.objects.create(
                 device_type=device_type,
                 name="Device 3",
                 location=location,
                 role=device_role,
+                status=device_status,
             ),
         )
 
+        interface_status = Status.objects.get_for_model(Interface).first()
         interfaces = (
-            Interface.objects.create(device=devices[0], name="Interface 1"),
-            Interface.objects.create(device=devices[1], name="Interface 2"),
-            Interface.objects.create(device=devices[2], name="Interface 3"),
+            Interface.objects.create(
+                device=devices[0],
+                name="Interface 1",
+                status=interface_status,
+            ),
+            Interface.objects.create(
+                device=devices[1],
+                name="Interface 2",
+                status=interface_status,
+            ),
+            Interface.objects.create(
+                device=devices[2],
+                name="Interface 3",
+                status=interface_status,
+            ),
         )
 
         clustertype = ClusterType.objects.create(name="Cluster Type 1")
         cluster = Cluster.objects.create(cluster_type=clustertype, name="Cluster 1")
 
+        vm_status = Status.objects.get_for_model(VirtualMachine).first()
         virtual_machines = (
-            VirtualMachine.objects.create(name="Virtual Machine 1", cluster=cluster),
-            VirtualMachine.objects.create(name="Virtual Machine 2", cluster=cluster),
-            VirtualMachine.objects.create(name="Virtual Machine 3", cluster=cluster),
+            VirtualMachine.objects.create(name="Virtual Machine 1", cluster=cluster, status=vm_status),
+            VirtualMachine.objects.create(name="Virtual Machine 2", cluster=cluster, status=vm_status),
+            VirtualMachine.objects.create(name="Virtual Machine 3", cluster=cluster, status=vm_status),
         )
 
+        vmint_status = Status.objects.get_for_model(VMInterface).first()
         vminterfaces = (
-            VMInterface.objects.create(virtual_machine=virtual_machines[0], name="Interface 1"),
-            VMInterface.objects.create(virtual_machine=virtual_machines[1], name="Interface 2"),
-            VMInterface.objects.create(virtual_machine=virtual_machines[2], name="Interface 3"),
+            VMInterface.objects.create(virtual_machine=virtual_machines[0], name="Interface 1", status=vmint_status),
+            VMInterface.objects.create(virtual_machine=virtual_machines[1], name="Interface 2", status=vmint_status),
+            VMInterface.objects.create(virtual_machine=virtual_machines[2], name="Interface 3", status=vmint_status),
         )
 
         tenants = Tenant.objects.filter(tenant_group__isnull=False)[:3]
@@ -582,9 +602,15 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
         )
 
     def test_mask_length(self):
-        params = {"mask_length": self.queryset.first().prefix_length}
+        # Test filtering by a single integer value
+        params = {"mask_length": self.queryset.first().mask_length}
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs, self.queryset.filter(mask_length=params["mask_length"])
+        )
+        # Test filtering by multiple integer values
+        params = {"mask_length": [self.queryset.first().mask_length, self.queryset.last().mask_length]}
         self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs, self.queryset.filter(prefix_length=params["mask_length"])
+            self.filterset(params, self.queryset).qs, self.queryset.filter(mask_length=params["mask_length"])
         )
 
     def test_vrf(self):
@@ -672,10 +698,11 @@ class VLANGroupTestCase(FilterTestCases.NameSlugFilterTestCase):
     def setUpTestData(cls):
         cls.location_type_1 = LocationType.objects.get(name="Campus")
         cls.location_type_2 = LocationType.objects.get(name="Building")
+        loc_status = Status.objects.get_for_model(Location).first()
         cls.locations = (
-            Location.objects.create(name="Location 1", location_type=cls.location_type_1),
-            Location.objects.create(name="Location 2", location_type=cls.location_type_1),
-            Location.objects.create(name="Location 3", location_type=cls.location_type_2),
+            Location.objects.create(name="Location 1", location_type=cls.location_type_1, status=loc_status),
+            Location.objects.create(name="Location 2", location_type=cls.location_type_1, status=loc_status),
+            Location.objects.create(name="Location 3", location_type=cls.location_type_2, status=loc_status),
         )
         cls.locations[1].parent = cls.locations[0]
         cls.locations[2].parent = cls.locations[1]
@@ -710,10 +737,11 @@ class VLANTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilter
     def setUpTestData(cls):
         cls.location_type_1 = LocationType.objects.get(name="Campus")
         cls.location_type_2 = LocationType.objects.get(name="Building")
+        loc_status = Status.objects.get_for_model(Location).first()
         cls.locations = (
-            Location.objects.create(name="Location 1", location_type=cls.location_type_1),
-            Location.objects.create(name="Location 2", location_type=cls.location_type_1),
-            Location.objects.create(name="Location 3", location_type=cls.location_type_2),
+            Location.objects.create(name="Location 1", location_type=cls.location_type_1, status=loc_status),
+            Location.objects.create(name="Location 2", location_type=cls.location_type_1, status=loc_status),
+            Location.objects.create(name="Location 3", location_type=cls.location_type_2, status=loc_status),
         )
         cls.locations[1].parent = cls.locations[0]
 
@@ -838,7 +866,10 @@ class VLANTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilter
         devicetype = DeviceType.objects.create(manufacturer=manufacturer, model="Device Type 1", slug="device-type-1")
         location = self.locations[0]
         devicerole = Role.objects.get_for_model(Device).first()
-        device = Device.objects.create(device_type=devicetype, role=devicerole, name="Device 1", location=location)
+        devicestatus = Status.objects.get_for_model(Device).first()
+        device = Device.objects.create(
+            device_type=devicetype, role=devicerole, name="Device 1", location=location, status=devicestatus
+        )
         params = {"available_on_device": [device.pk]}
         self.assertQuerysetEqual(
             self.filterset(params, self.queryset).qs,
@@ -856,6 +887,7 @@ class ServiceTestCase(FilterTestCases.FilterTestCase):
         manufacturer = Manufacturer.objects.first()
         device_type = DeviceType.objects.create(manufacturer=manufacturer, model="Device Type 1")
         device_role = Role.objects.get_for_model(Device).first()
+        device_status = Status.objects.get_for_model(Device).first()
 
         devices = (
             Device.objects.create(
@@ -863,28 +895,32 @@ class ServiceTestCase(FilterTestCases.FilterTestCase):
                 name="Device 1",
                 location=location,
                 role=device_role,
+                status=device_status,
             ),
             Device.objects.create(
                 device_type=device_type,
                 name="Device 2",
                 location=location,
                 role=device_role,
+                status=device_status,
             ),
             Device.objects.create(
                 device_type=device_type,
                 name="Device 3",
                 location=location,
                 role=device_role,
+                status=device_status,
             ),
         )
 
         clustertype = ClusterType.objects.create(name="Cluster Type 1")
         cluster = Cluster.objects.create(cluster_type=clustertype, name="Cluster 1")
 
+        vmstatus = Status.objects.get_for_model(VirtualMachine).first()
         virtual_machines = (
-            VirtualMachine.objects.create(name="Virtual Machine 1", cluster=cluster),
-            VirtualMachine.objects.create(name="Virtual Machine 2", cluster=cluster),
-            VirtualMachine.objects.create(name="Virtual Machine 3", cluster=cluster),
+            VirtualMachine.objects.create(name="Virtual Machine 1", cluster=cluster, status=vmstatus),
+            VirtualMachine.objects.create(name="Virtual Machine 2", cluster=cluster, status=vmstatus),
+            VirtualMachine.objects.create(name="Virtual Machine 3", cluster=cluster, status=vmstatus),
         )
 
         services = (

nautobot/ipam/tests/test_migrations.py

@@ -1,17 +1,16 @@
 import uuid
 
-from unittest import skipIf
+from unittest import skip, skipIf
 
 from django.db import connection
-from taggit.managers import TaggableManager
 
+from nautobot.core.models.fields import TagsField
 from nautobot.core.models.utils import serialize_object
 from nautobot.core.testing.migrations import NautobotDataMigrationTest
-from nautobot.core.models.generics import _NautobotTaggableManager
 from nautobot.extras import choices as extras_choices
-from nautobot.extras import models as extras_models
 
 
+@skip("test skipped until base test can be fixed to handle new migrations")
 class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
     """Test data migrations removing the Aggregate model and replacing with Prefix in v2.0"""
 
@@ -34,14 +33,11 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
     def populateDataBeforeMigration(self, apps):
         """Populate Aggregate data before migrating to Prefixes"""
 
+        self.aggregate = apps.get_model("ipam", "Aggregate")
         # Workaround for django-taggit manager not working in migrations.
         # https://github.com/jazzband/django-taggit/issues/101
         # https://github.com/jazzband/django-taggit/issues/454
-        taggable_manager = TaggableManager(
-            through=extras_models.TaggedItem, manager=_NautobotTaggableManager, ordering=["name"]
-        )
-        self.aggregate = apps.get_model("ipam", "Aggregate")
-        self.aggregate.tags = taggable_manager
+        self.aggregate.tags = TagsField()
         self.computed_field = apps.get_model("extras", "computedfield")
         self.content_type = apps.get_model("contenttypes", "ContentType")
         self.custom_field = apps.get_model("extras", "customfield")
@@ -51,7 +47,7 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
         self.object_change = apps.get_model("extras", "objectchange")
         self.object_permission = apps.get_model("users", "objectpermission")
         self.prefix = apps.get_model("ipam", "prefix")
-        self.prefix.tags = taggable_manager
+        self.prefix.tags = TagsField()
         self.relationship = apps.get_model("extras", "relationship")
         self.relationship_association = apps.get_model("extras", "relationshipassociation")
         self.rir = apps.get_model("ipam", "RIR")