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

nautobot/extras/tests/test_changelog.py

@@ -84,11 +84,10 @@ class ChangeLogViewTest(ModelViewTestCase):
         self.assertEqual(oc.user_id, self.user.pk)
 
     def test_update_object(self):
-        location_status = Status.objects.get_for_model(Location).first()
         location = Location(
             name="Test Location 1",
             slug="test-location-1",
-            status=location_status,
+            status=self.location_status,
             location_type=self.location_type,
         )
         location.save()
@@ -98,7 +97,7 @@ class ChangeLogViewTest(ModelViewTestCase):
             "location_type": self.location_type.pk,
             "name": "Test Location X",
             "slug": "test-location-x",
-            "status": location_status.pk,
+            "status": self.location_status.pk,
             "cf_my_field": "DEF",
             "cf_my_field_select": "Foo",
             "tags": [self.tags[2].pk],
@@ -136,6 +135,7 @@ class ChangeLogViewTest(ModelViewTestCase):
             name="Test Location 1",
             slug="test-location-1",
             location_type=self.location_type,
+            status=self.location_status,
             _custom_field_data={"my_field": "ABC", "my_field_select": "Bar"},
         )
         location.save()

nautobot/extras/tests/test_context_managers.py

@@ -7,7 +7,7 @@ from nautobot.core.utils.lookup import get_changes_for_model
 from nautobot.dcim.models import Location, LocationType
 from nautobot.extras.choices import ObjectChangeActionChoices, ObjectChangeEventContextChoices
 from nautobot.extras.context_managers import web_request_context
-from nautobot.extras.models import Webhook
+from nautobot.extras.models import Status, Webhook
 
 
 # Use the proper swappable User model
@@ -45,7 +45,8 @@ class WebRequestContextTestCase(TestCase):
     def test_change_log_created(self):
         with web_request_context(self.user):
             location_type = LocationType.objects.get(name="Campus")
-            location = Location(name="Test Location 1", location_type=location_type)
+            location_status = Status.objects.get_for_model(Location).first()
+            location = Location(name="Test Location 1", location_type=location_type, status=location_status)
             location.save()
 
         location = Location.objects.get(name="Test Location 1")
@@ -57,7 +58,8 @@ class WebRequestContextTestCase(TestCase):
     def test_change_log_context(self):
         with web_request_context(self.user, context_detail="test_change_log_context"):
             location_type = LocationType.objects.get(name="Campus")
-            location = Location(name="Test Location 1", location_type=location_type)
+            location_status = Status.objects.get_for_model(Location).first()
+            location = Location(name="Test Location 1", location_type=location_type, status=location_status)
             location.save()
 
         location = Location.objects.get(name="Test Location 1")

nautobot/extras/tests/test_customfields.py

@@ -13,7 +13,6 @@ from nautobot.core.testing import APITestCase, TestCase, TransactionTestCase
 from nautobot.core.testing.models import ModelTestCases
 from nautobot.core.testing.utils import post_data
 from nautobot.dcim.filters import LocationFilterSet
-from nautobot.dcim.forms import LocationCSVForm
 from nautobot.dcim.models import Device, Location, LocationType, Rack
 from nautobot.dcim.tables import LocationTable
 from nautobot.extras.choices import CustomFieldTypeChoices, CustomFieldFilterLogicChoices
@@ -903,6 +902,61 @@ class CustomFieldDataAPITest(APITestCase):
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
         self.assertIn("Value must be a string", str(response.content))
 
+    def test_create_without_required_field(self):
+        self.cf_text.default = None
+        self.cf_text.required = True
+        self.cf_text.save()
+
+        data = {
+            "name": "Location N",
+            "slug": "location-n",
+            "location_type": self.lt.pk,
+            "status": self.statuses[0].pk,
+        }
+        url = reverse("dcim-api:location-list")
+        self.add_permissions("dcim.add_location")
+        response = self.client.post(url, data, format="json", **self.header)
+        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("Required field cannot be empty", str(response.content))
+
+        # Try in CSV format too
+        csvdata = "\n".join(
+            [
+                "name,slug,location_type,status",
+                f"Location N,location-n,{self.lt.natural_key_slug},{self.statuses[0].name}",
+            ]
+        )
+        response = self.client.post(url, csvdata, content_type="text/csv", **self.header)
+        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("Required field cannot be empty", str(response.content))
+
+    def test_create_invalid_select_choice(self):
+        data = {
+            "name": "Location N",
+            "slug": "location-n",
+            "location_type": self.lt.pk,
+            "status": self.statuses[0].pk,
+            "custom_fields": {
+                "choice_cf": "Frobozz",
+            },
+        }
+        url = reverse("dcim-api:location-list")
+        self.add_permissions("dcim.add_location")
+        response = self.client.post(url, data, format="json", **self.header)
+        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("Invalid choice", str(response.content))
+
+        # Try in CSV format too
+        csvdata = "\n".join(
+            [
+                "name,slug,location_type,status,cf_choice_cf",
+                f"Location N,location-n,{self.lt.natural_key_slug},{self.statuses[0].name},Frobozz",
+            ]
+        )
+        response = self.client.post(url, csvdata, content_type="text/csv", **self.header)
+        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("Invalid choice", str(response.content))
+
 
 class CustomFieldImportTest(TestCase):
     """
@@ -1005,7 +1059,10 @@ class CustomFieldImportTest(TestCase):
         self.assertEqual(response.status_code, 200)
 
         # Validate data for location 1
-        location1 = Location.objects.get(name="Location 1")
+        try:
+            location1 = Location.objects.get(name="Location 1")
+        except Location.DoesNotExist:
+            self.fail(str(response.content))
         if "example_plugin" in settings.PLUGINS:
             self.assertEqual(len(location1.cf), 8)
         else:
@@ -1040,34 +1097,6 @@ class CustomFieldImportTest(TestCase):
         location3 = Location.objects.get(name="Location 3")
         self.assertFalse(any(location3.cf.values()))
 
-    def test_import_missing_required(self):
-        """
-        Attempt to import an object missing a required custom field.
-        """
-        # Set one of our CustomFields to required
-        CustomField.objects.filter(label="Text").update(required=True)
-        lt = LocationType.objects.get(name="Campus")
-        form_data = {
-            "name": "Location 1",
-            "slug": "location-1",
-            "location_type": lt.pk,
-        }
-
-        form = LocationCSVForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn("cf_text", form.errors)
-
-    def test_import_invalid_choice(self):
-        """
-        Attempt to import an object with an invalid choice selection.
-        """
-        lt = LocationType.objects.get(name="Campus")
-        form_data = {"name": "Location 1", "slug": "location-1", "location_type": lt.name, "cf_select": "Choice X"}
-
-        form = LocationCSVForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn("cf_select", form.errors)
-
 
 class CustomFieldModelTest(TestCase):
     """
@@ -1085,47 +1114,46 @@ class CustomFieldModelTest(TestCase):
         cf2.content_types.set([ContentType.objects.get_for_model(Rack)])
         cls.lt = LocationType.objects.get(name="Campus")
 
-    def setUp(self):
-        self.location_status = Status.objects.get_for_model(Location).first()
-        self.location1 = Location.objects.create(name="NYC", location_type=self.lt)
-        self.computed_field_one = ComputedField.objects.create(
+        cls.location_status = Status.objects.get_for_model(Location).first()
+        cls.location1 = Location.objects.create(name="NYC", location_type=cls.lt, status=cls.location_status)
+        cls.computed_field_one = ComputedField.objects.create(
             content_type=ContentType.objects.get_for_model(Location),
-            slug="computed_field_one",
+            key="computed_field_one",
             label="Computed Field One",
             template="{{ obj.name }} is the name of this location.",
             fallback_value="An error occurred while rendering this template.",
             weight=100,
         )
         # Field whose template will raise a TemplateError
-        self.bad_computed_field = ComputedField.objects.create(
+        cls.bad_computed_field = ComputedField.objects.create(
             content_type=ContentType.objects.get_for_model(Location),
-            slug="bad_computed_field",
+            key="bad_computed_field",
             label="Bad Computed Field",
             template="{{ something_that_throws_an_err | not_a_real_filter }} bad data",
             fallback_value="This template has errored",
             weight=100,
         )
         # Field whose template will raise a TypeError
-        self.worse_computed_field = ComputedField.objects.create(
+        cls.worse_computed_field = ComputedField.objects.create(
             content_type=ContentType.objects.get_for_model(Location),
-            slug="worse_computed_field",
+            key="worse_computed_field",
             label="Worse Computed Field",
             template="{{ obj.images | list }}",
             fallback_value="Another template error",
             weight=200,
         )
-        self.non_location_computed_field = ComputedField.objects.create(
+        cls.non_location_computed_field = ComputedField.objects.create(
             content_type=ContentType.objects.get_for_model(Device),
-            slug="device_computed_field",
+            key="device_computed_field",
             label="Device Computed Field",
             template="Hello, world.",
             fallback_value="This template has errored",
             weight=100,
         )
         # Field whose template will return None, with fallback_value defaulting to empty string
-        self.bad_attribute_computed_field = ComputedField.objects.create(
+        cls.bad_attribute_computed_field = ComputedField.objects.create(
             content_type=ContentType.objects.get_for_model(Location),
-            slug="bad_attribute_computed_field",
+            key="bad_attribute_computed_field",
             label="Bad Attribute Computed Field",
             template="{{ obj.location }}",
             weight=200,
@@ -1216,7 +1244,7 @@ class CustomFieldModelTest(TestCase):
         self.assertDictEqual(self.location1.get_computed_fields(label_as_key=True), expected_renderings)
 
     def test_get_computed_fields_only_returns_fields_for_content_type(self):
-        self.assertTrue(self.non_location_computed_field.slug not in self.location1.get_computed_fields())
+        self.assertTrue(self.non_location_computed_field.key not in self.location1.get_computed_fields())
 
     def test_check_if_key_is_graphql_safe(self):
         """
@@ -1341,10 +1369,12 @@ class CustomFieldFilterTest(TestCase):
         CustomFieldChoice.objects.create(custom_field=cf, value="Foo")
         CustomFieldChoice.objects.create(custom_field=cf, value="Bar")
         cls.location_type = LocationType.objects.get(name="Campus")
+        location_status = Status.objects.get_for_model(Location).first()
         Location.objects.create(
             name="Location 1",
             slug="location-1",
             location_type=cls.location_type,
+            status=location_status,
             _custom_field_data={
                 "cf1": 100,
                 "cf2": True,
@@ -1361,6 +1391,7 @@ class CustomFieldFilterTest(TestCase):
             name="Location 2",
             slug="location-2",
             location_type=cls.location_type,
+            status=location_status,
             _custom_field_data={
                 "cf1": 200,
                 "cf2": False,
@@ -1377,10 +1408,15 @@ class CustomFieldFilterTest(TestCase):
             name="Location 3",
             slug="location-3",
             location_type=cls.location_type,
+            status=location_status,
             _custom_field_data={"cf9": ["Foo", "Bar"]},
         )
         Location.objects.create(
-            name="Location 4", slug="location-4", location_type=cls.location_type, _custom_field_data={}
+            name="Location 4",
+            slug="location-4",
+            location_type=cls.location_type,
+            status=location_status,
+            _custom_field_data={},
         )
 
     def test_filter_integer(self):
@@ -1803,7 +1839,8 @@ class CustomFieldChoiceTest(ModelTestCases.BaseModelTestCase):
 class CustomFieldBackgroundTasks(TransactionTestCase):
     def test_provision_field_task(self):
         location_type = LocationType.objects.create(name="Root Type 1")
-        location = Location(name="Location 1", slug="location-1", location_type=location_type)
+        location_status = Status.objects.get_for_model(Location).first()
+        location = Location(name="Location 1", slug="location-1", location_type=location_type, status=location_status)
         location.save()
 
         obj_type = ContentType.objects.get_for_model(Location)
@@ -1822,14 +1859,15 @@ class CustomFieldBackgroundTasks(TransactionTestCase):
             type=CustomFieldTypeChoices.TYPE_TEXT,
         )
         cf.save()
-        logging.disable(logging.ERROR)
         cf.content_types.set([obj_type])
         location_type = LocationType.objects.create(name="Root Type 2")
+        location_status = Status.objects.get_for_model(Location).first()
         location = Location(
             name="Location 1",
             slug="location-1",
-            _custom_field_data={"cf1": "foo"},
             location_type=location_type,
+            status=location_status,
+            _custom_field_data={"cf1": "foo"},
         )
         location.save()
 
@@ -1838,7 +1876,6 @@ class CustomFieldBackgroundTasks(TransactionTestCase):
         location.refresh_from_db()
 
         self.assertTrue("cf1" not in location.cf)
-        logging.disable(logging.NOTSET)
 
     def test_update_custom_field_choice_data_task(self):
         obj_type = ContentType.objects.get_for_model(Location)
@@ -1852,8 +1889,13 @@ class CustomFieldBackgroundTasks(TransactionTestCase):
         choice = CustomFieldChoice(custom_field=cf, value="Foo")
         choice.save()
         location_type = LocationType.objects.create(name="Root Type 3")
+        location_status = Status.objects.get_for_model(Location).first()
         location = Location(
-            name="Location 1", slug="location-1", _custom_field_data={"cf1": "Foo"}, location_type=location_type
+            name="Location 1",
+            slug="location-1",
+            location_type=location_type,
+            status=location_status,
+            _custom_field_data={"cf1": "Foo"},
         )
         location.save()