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

nautobot/dcim/tests/test_forms.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from nautobot.dcim.forms import CableCSVForm, DeviceForm, InterfaceCreateForm, InterfaceCSVForm
+from nautobot.dcim.forms import DeviceForm, InterfaceCreateForm
 from nautobot.dcim.choices import DeviceFaceChoices, InterfaceTypeChoices
 
 from nautobot.dcim.models import (
@@ -11,7 +11,6 @@ from nautobot.dcim.models import (
     LocationType,
     Platform,
     Rack,
-    VirtualChassis,
 )
 from nautobot.extras.models import Role, SecretsGroup, Status
 from nautobot.virtualization.models import Cluster, ClusterGroup, ClusterType
@@ -28,7 +27,8 @@ class DeviceTestCase(TestCase):
     @classmethod
     def setUpTestData(cls):
         cls.location = Location.objects.filter(location_type=LocationType.objects.get(name="Campus")).first()
-        cls.rack = Rack.objects.create(name="Rack 1", location=cls.location)
+        rack_status = Status.objects.get_for_model(Rack).first()
+        cls.rack = Rack.objects.create(name="Rack 1", location=cls.location, status=rack_status)
 
         # Platforms that have a manufacturer.
         mfr_platforms = Platform.objects.filter(manufacturer__isnull=False)
@@ -158,11 +158,13 @@ class LabelTestCase(TestCase):
         location = Location.objects.filter(location_type=LocationType.objects.get(name="Campus")).first()
         device_type = DeviceType.objects.first()
         device_role = Role.objects.get_for_model(Device).first()
+        device_status = Status.objects.get_for_model(Device).first()
         cls.device = Device.objects.create(
             name="Device 2",
             device_type=device_type,
             role=device_role,
             location=location,
+            status=device_status,
         )
 
     def test_interface_label_count_valid(self):
@@ -191,205 +193,3 @@ class LabelTestCase(TestCase):
 
         self.assertFalse(form.is_valid())
         self.assertIn("label_pattern", form.errors)
-
-
-class TestCableCSVForm(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        location = Location.objects.filter(location_type=LocationType.objects.get(name="Campus")).first()
-        device_type = DeviceType.objects.first()
-        device_role = Role.objects.get_for_model(Device).first()
-        cls.device_1 = Device.objects.create(
-            name="Device 1",
-            device_type=device_type,
-            role=device_role,
-            location=location,
-        )
-        cls.device_2 = Device.objects.create(
-            name="Device 2",
-            device_type=device_type,
-            role=device_role,
-            location=location,
-        )
-        cls.interface_1 = Interface.objects.create(
-            device=cls.device_1,
-            name="Interface 1",
-            type=InterfaceTypeChoices.TYPE_LAG,
-        )
-        cls.interface_2 = Interface.objects.create(
-            device=cls.device_2,
-            name="Interface 2",
-            type=InterfaceTypeChoices.TYPE_LAG,
-        )
-
-    def test_add_error_method_converts_error_fields_to_equivalent_in_CableCSVForm(self):
-        """Test invalid input (cabling to LAG interfaces) is correctly reported in the form."""
-        data = {
-            "side_a_device": self.device_1.name,
-            "side_a_type": "dcim.interface",
-            "side_a_name": self.interface_1.name,
-            "side_b_device": self.device_2.name,
-            "side_b_type": "dcim.interface",
-            "side_b_name": self.interface_2.name,
-            "status": "connected",
-        }
-        headers = {
-            "side_a_device": None,
-            "side_a_type": None,
-            "side_a_name": None,
-            "side_b_device": None,
-            "side_b_type": None,
-            "side_b_name": None,
-            "status": None,
-        }
-        form = CableCSVForm(data, headers=headers)
-        self.assertFalse(form.is_valid())
-        self.assertIn("side_a_name", form.errors)
-        self.assertNotIn("termination_a_id", form.errors)
-
-
-class TestInterfaceCSVForm(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        location = Location.objects.filter(location_type=LocationType.objects.get(name="Campus")).first()
-        device_type = DeviceType.objects.first()
-        device_role = Role.objects.get_for_model(Device).first()
-
-        cls.devices = (
-            Device.objects.create(
-                name="Device 1",
-                device_type=device_type,
-                role=device_role,
-                location=location,
-            ),
-            Device.objects.create(
-                name="Device 2",
-                device_type=device_type,
-                role=device_role,
-                location=location,
-            ),
-            Device.objects.create(
-                name="Device 3",
-                device_type=device_type,
-                role=device_role,
-                location=location,
-            ),
-        )
-
-        virtualchassis = VirtualChassis.objects.create(
-            name="Virtual Chassis 1", master=cls.devices[0], domain="domain-1"
-        )
-        Device.objects.filter(id=cls.devices[0].id).update(virtual_chassis=virtualchassis, vc_position=1)
-        Device.objects.filter(id=cls.devices[1].id).update(virtual_chassis=virtualchassis, vc_position=2)
-        cls.status = Status.objects.get_for_model(Interface).first()
-
-        cls.interfaces = (
-            Interface.objects.create(
-                device=cls.devices[0],
-                name="Interface 1",
-                type=InterfaceTypeChoices.TYPE_1GE_SFP,
-            ),
-            Interface.objects.create(
-                device=cls.devices[1],
-                name="Interface 2",
-                type=InterfaceTypeChoices.TYPE_1GE_FIXED,
-            ),
-            Interface.objects.create(
-                device=cls.devices[1],
-                name="Interface 3",
-                type=InterfaceTypeChoices.TYPE_LAG,
-            ),
-            Interface.objects.create(
-                device=cls.devices[2],
-                name="Interface 4",
-                type=InterfaceTypeChoices.TYPE_LAG,
-            ),
-            Interface.objects.create(
-                device=cls.devices[2],
-                name="Interface 5",
-                type=InterfaceTypeChoices.TYPE_1GE_FIXED,
-            ),
-        )
-        cls.headers_1 = {
-            "device": None,
-            "name": None,
-            "status": None,
-            "parent_interface": None,
-            "bridge": None,
-            "type": None,
-        }
-        cls.headers_2 = {
-            "device": None,
-            "name": None,
-            "status": None,
-            "lag": None,
-            "bridge": None,
-            "type": None,
-        }
-
-    def test_interface_belonging_to_common_device_or_vc_allowed(self):
-        """Test parent, bridge, and LAG interfaces belonging to common device or VC is valid"""
-        data_1 = {
-            "device": self.devices[0].name,
-            "name": "interface test",
-            "status": self.status.name,
-            "parent_interface": self.interfaces[0].name,
-            "bridge": self.interfaces[2].name,
-            "type": InterfaceTypeChoices.TYPE_VIRTUAL,
-        }
-
-        form = InterfaceCSVForm(data_1, headers=self.headers_1)
-        self.assertTrue(form.is_valid())
-        form.save()
-
-        interface = Interface.objects.get(name="interface test", device=self.devices[0])
-        self.assertEqual(interface.parent_interface, self.interfaces[0])
-        self.assertEqual(interface.bridge, self.interfaces[2])
-
-        # Assert LAG
-        data_2 = {
-            "device": self.devices[0].name,
-            "name": "interface lagged",
-            "status": self.status.name,
-            "lag": self.interfaces[2].name,
-            "bridge": self.interfaces[1].name,
-            "type": InterfaceTypeChoices.TYPE_100ME_FIXED,
-        }
-
-        form = InterfaceCSVForm(data_2, headers=self.headers_2)
-        self.assertTrue(form.is_valid())
-        form.save()
-
-        interface = Interface.objects.get(name="interface lagged", device=self.devices[0])
-        self.assertEqual(interface.lag, self.interfaces[2])
-        self.assertEqual(interface.bridge, self.interfaces[1])
-
-    def test_interface_not_belonging_to_common_device_or_vc_not_allowed(self):
-        """Test parent, bridge, and LAG interfaces not belonging to common device or VC is invalid"""
-        data = {
-            "device": self.devices[0].name,
-            "name": "interface test",
-            "status": self.status.name,
-            "parent_interface": self.interfaces[4].name,
-            "bridge": self.interfaces[4].name,
-            "type": InterfaceTypeChoices.TYPE_VIRTUAL,
-        }
-
-        form = InterfaceCSVForm(data, headers=self.headers_1)
-        self.assertFalse(form.is_valid())
-        self.assertTrue(form.has_error("parent_interface"))
-        self.assertTrue(form.has_error("bridge"))
-
-        # Assert LAG
-        data = {
-            "device": self.devices[0].name,
-            "name": "interface lagged",
-            "status": self.status.name,
-            "lag": self.interfaces[3].name,
-            "bridge": self.interfaces[1].name,
-            "type": InterfaceTypeChoices.TYPE_VIRTUAL,
-        }
-
-        form = InterfaceCSVForm(data, headers=self.headers_2)
-        self.assertFalse(form.is_valid())
-        self.assertTrue(form.has_error("lag"))

nautobot/dcim/tests/test_graphql.py

@@ -4,7 +4,7 @@ from django.test import override_settings
 from nautobot.core.graphql import execute_query
 from nautobot.core.testing import create_test_user, TestCase
 from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Manufacturer
-from nautobot.extras.models import DynamicGroup, Role
+from nautobot.extras.models import DynamicGroup, Role, Status
 
 
 class GraphQLTestCase(TestCase):
@@ -14,8 +14,13 @@ class GraphQLTestCase(TestCase):
         self.device_role = Role.objects.get_for_model(Device).first()
         self.manufacturer = Manufacturer.objects.first()
         self.device_type = DeviceType.objects.create(model="Model", manufacturer=self.manufacturer)
+        device_status = Status.objects.get_for_model(Device).first()
         self.device = Device.objects.create(
-            location=self.location, role=self.device_role, device_type=self.device_type, name="Device"
+            location=self.location,
+            role=self.device_role,
+            device_type=self.device_type,
+            name="Device",
+            status=device_status,
         )
         self.dynamic_group = DynamicGroup.objects.create(
             name="Dynamic_Group", content_type=ContentType.objects.get_for_model(Device)

nautobot/dcim/tests/test_migrations.py

@@ -2,12 +2,10 @@ import uuid
 from unittest import skip, skipIf
 
 from django.db import connection
-from taggit.managers import TaggableManager
 
-from nautobot.core.models.generics import _NautobotTaggableManager
+from nautobot.core.models.fields import TagsField
 from nautobot.core.testing.migrations import NautobotDataMigrationTest
 from nautobot.circuits.choices import CircuitTerminationSideChoices
-from nautobot.extras import models as extras_models
 from nautobot.extras.choices import CustomFieldTypeChoices, ObjectChangeActionChoices, RelationshipTypeChoices
 
 
@@ -20,17 +18,14 @@ class SiteAndRegionDataMigrationToLocation(NautobotDataMigrationTest):
     def populateDataBeforeMigration(self, installed_apps):
         """Populate Site/Site-related and Region/Region-related Data before migrating them to Locations"""
         # Needed models
-        taggable_manager = TaggableManager(
-            through=extras_models.TaggedItem, manager=_NautobotTaggableManager, ordering=["name"]
-        )
         apps = installed_apps
         self.content_type = apps.get_model("contenttypes", "ContentType")
         self.region = apps.get_model("dcim", "region")
         self.site = apps.get_model("dcim", "site")
-        self.site.tags = taggable_manager
+        self.site.tags = TagsField()
         self.location_type = apps.get_model("dcim", "locationtype")
         self.location = apps.get_model("dcim", "location")
-        self.location.tags = taggable_manager
+        self.location.tags = TagsField()
         self.provider = apps.get_model("circuits", "provider")
         self.circuit_type = apps.get_model("circuits", "circuittype")
         self.circuit = apps.get_model("circuits", "circuit")
@@ -473,7 +468,7 @@ class SiteAndRegionDataMigrationToLocation(NautobotDataMigrationTest):
             related_object_id=regions[0].id,
         )
         o2m = self.relationship.objects.create(
-            name="Site to Location o2m",
+            label="Site to Location o2m",
             slug="site-to-location-o2m",
             source_type=self.site_ct,
             destination_type=self.location_ct,
@@ -494,7 +489,7 @@ class SiteAndRegionDataMigrationToLocation(NautobotDataMigrationTest):
             destination_type_id=self.location_ct.id,
         )
         m2m = self.relationship.objects.create(
-            name="Region to Site m2m",
+            label="Region to Site m2m",
             slug="region-to-site-m2m",
             source_type=self.region_ct,
             destination_type=self.site_ct,
@@ -515,7 +510,7 @@ class SiteAndRegionDataMigrationToLocation(NautobotDataMigrationTest):
             destination_type_id=self.site_ct.id,
         )
         o2o = self.relationship.objects.create(
-            name="Region to Location o2o",
+            label="Region to Location o2o",
             slug="region-to-location-o2o",
             source_type=self.region_ct,
             destination_type=self.location_ct,