nautobot 2.3.15b1__py3-none-any.whl → 2.3.16__py3-none-any.whl

nautobot/ipam/tests/test_api.py

@@ -2,6 +2,7 @@ from concurrent.futures.thread import ThreadPoolExecutor
 import json
 from random import shuffle
 from unittest import skip
+import uuid
 
 from django.contrib.contenttypes.models import ContentType
 from django.db import connection
@@ -506,7 +507,8 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             url, {"prefix_length": "hello", "status": self.status.pk}, format="json", **self.header
         )
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
-        self.assertIn("prefix_length", response.data[0])
+        self.assertIn("prefix_length", response.data)
+        self.assertEqual(response.data["prefix_length"], "This field must be an integer.")
 
     def test_create_multiple_available_prefixes(self):
         """
@@ -1482,6 +1484,15 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
             f"Invalid VLAN Group requested: {some_other_vlan_group}. Only VLAN Group {self.vlan_group} is permitted.",
             response.data["detail"],
         )
+        invalid_id = uuid.uuid4()
+        data[0]["vlan_group"] = invalid_id  # Invalid UUID
+        response = self.client.post(url, data, format="json", **self.header)
+        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
+        self.assertIn("detail", response.data)
+        self.assertEqual(
+            f"VLAN Group with pk {invalid_id} does not exist.",
+            response.data["detail"],
+        )
 
     def test_create_available_vlans_with_permissions_constraint(self):
         url = reverse("ipam-api:vlangroup-available-vlans", kwargs={"pk": self.vlan_group.pk})

nautobot/ipam/tests/test_forms.py

@@ -1,5 +1,8 @@
 """Test IPAM forms."""
 
+from __future__ import annotations  # python 3.8
+
+from django.forms import Form
 from django.test import TestCase
 
 from nautobot.core.testing.forms import FormTestCases
@@ -9,62 +12,63 @@ from nautobot.ipam.choices import IPAddressTypeChoices
 from nautobot.ipam.models import IPAddress, Namespace, Prefix
 
 
-class BaseNetworkFormTest:
-    form_class = None
-    field_name = None
-    object_name = None
-    extra_data = {}
-
-    def setUp(self):
-        super().setUp()
-        self.namespace = Namespace.objects.create(name="IPAM Form Test")
-        self.status = Status.objects.get(name="Active")
-        self.prefix_status = Status.objects.get_for_model(Prefix).first()
-        self.ip_status = Status.objects.get_for_model(IPAddress).first()
-        self.parent = Prefix.objects.create(
-            prefix="192.168.1.0/24", namespace=self.namespace, status=self.prefix_status
-        )
-        self.parent2 = Prefix.objects.create(
-            prefix="192.168.0.0/16", namespace=self.namespace, status=self.prefix_status
-        )
-        self.parent6 = Prefix.objects.create(
-            prefix="2001:0db8::/40", namespace=self.namespace, status=self.prefix_status
-        )
+class NetworkFormTestCases:
+    class BaseNetworkFormTest(TestCase):
+        form_class: type[Form]
+        field_name: str
+        object_name: str
+        extra_data = {}
+
+        def setUp(self):
+            super().setUp()
+            self.namespace = Namespace.objects.create(name="IPAM Form Test")
+            self.status = Status.objects.get(name="Active")
+            self.prefix_status = Status.objects.get_for_model(Prefix).first()
+            self.ip_status = Status.objects.get_for_model(IPAddress).first()
+            self.parent = Prefix.objects.create(
+                prefix="192.168.1.0/24", namespace=self.namespace, status=self.prefix_status
+            )
+            self.parent2 = Prefix.objects.create(
+                prefix="192.168.0.0/16", namespace=self.namespace, status=self.prefix_status
+            )
+            self.parent6 = Prefix.objects.create(
+                prefix="2001:0db8::/40", namespace=self.namespace, status=self.prefix_status
+            )
 
-    def test_valid_ip_address(self):
-        data = {self.field_name: "192.168.2.0/24", "namespace": self.namespace, "status": self.status}
-        data.update(self.extra_data)
-        form = self.form_class(data)
+        def test_valid_ip_address(self):
+            data = {self.field_name: "192.168.2.0/24", "namespace": self.namespace, "status": self.status}
+            data.update(self.extra_data)
+            form = self.form_class(data)
 
-        self.assertTrue(form.is_valid())
-        self.assertTrue(form.save())
+            self.assertTrue(form.is_valid())
+            self.assertTrue(form.save())
 
-    def test_address_invalid_ipv4(self):
-        data = {self.field_name: "192.168.0.1/64", "namespace": self.namespace, "status": self.status}
-        data.update(self.extra_data)
-        form = self.form_class(data)
+        def test_address_invalid_ipv4(self):
+            data = {self.field_name: "192.168.0.1/64", "namespace": self.namespace, "status": self.status}
+            data.update(self.extra_data)
+            form = self.form_class(data)
 
-        self.assertFalse(form.is_valid())
-        self.assertEqual("Please specify a valid IPv4 or IPv6 address.", form.errors[self.field_name][0])
+            self.assertFalse(form.is_valid())
+            self.assertEqual("Please specify a valid IPv4 or IPv6 address.", form.errors[self.field_name][0])
 
-    def test_address_zero_mask(self):
-        data = {self.field_name: "192.168.0.1/0", "namespace": self.namespace, "status": self.status}
-        data.update(self.extra_data)
-        form = self.form_class(data)
+        def test_address_zero_mask(self):
+            data = {self.field_name: "192.168.0.1/0", "namespace": self.namespace, "status": self.status}
+            data.update(self.extra_data)
+            form = self.form_class(data)
 
-        # With the advent of `Prefix.parent`, it's now possible to create a /0 .
-        self.assertTrue(form.is_valid())
+            # With the advent of `Prefix.parent`, it's now possible to create a /0 .
+            self.assertTrue(form.is_valid())
 
-    def test_address_missing_mask(self):
-        data = {self.field_name: "192.168.0.1", "namespace": self.namespace, "status": self.status}
-        data.update(self.extra_data)
-        form = self.form_class(data)
+        def test_address_missing_mask(self):
+            data = {self.field_name: "192.168.0.1", "namespace": self.namespace, "status": self.status}
+            data.update(self.extra_data)
+            form = self.form_class(data)
 
-        self.assertFalse(form.is_valid())
-        self.assertEqual("CIDR mask (e.g. /24) is required.", form.errors[self.field_name][0])
+            self.assertFalse(form.is_valid())
+            self.assertEqual("CIDR mask (e.g. /24) is required.", form.errors[self.field_name][0])
 
 
-class PrefixFormTest(BaseNetworkFormTest, FormTestCases.BaseFormTestCase):
+class PrefixFormTest(NetworkFormTestCases.BaseNetworkFormTest, FormTestCases.BaseFormTestCase):
     form_class = forms.PrefixForm
     field_name = "prefix"
     object_name = "prefix"
@@ -79,7 +83,7 @@ class PrefixFormTest(BaseNetworkFormTest, FormTestCases.BaseFormTestCase):
         }
 
 
-class IPAddressFormTest(BaseNetworkFormTest, TestCase):
+class IPAddressFormTest(NetworkFormTestCases.BaseNetworkFormTest):
     form_class = forms.IPAddressForm
     field_name = "address"
     object_name = "IP address"

nautobot/ipam/tests/test_migrations.py

@@ -29,29 +29,29 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
             request_id=uuid.uuid4(),
         )
 
-    def populateDataBeforeMigration(self, apps):
+    def populateDataBeforeMigration(self, installed_apps):
         """Populate Aggregate data before migrating to Prefixes"""
 
-        self.aggregate = apps.get_model("ipam", "Aggregate")
+        self.aggregate = installed_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
         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")
-        self.custom_link = apps.get_model("extras", "customlink")
-        self.dynamic_group = apps.get_model("extras", "DynamicGroup")
-        self.note = apps.get_model("extras", "note")
-        self.object_change = apps.get_model("extras", "objectchange")
-        self.object_permission = apps.get_model("users", "objectpermission")
-        self.prefix = apps.get_model("ipam", "prefix")
+        self.computed_field = installed_apps.get_model("extras", "computedfield")
+        self.content_type = installed_apps.get_model("contenttypes", "ContentType")
+        self.custom_field = installed_apps.get_model("extras", "customfield")
+        self.custom_link = installed_apps.get_model("extras", "customlink")
+        self.dynamic_group = installed_apps.get_model("extras", "DynamicGroup")
+        self.note = installed_apps.get_model("extras", "note")
+        self.object_change = installed_apps.get_model("extras", "objectchange")
+        self.object_permission = installed_apps.get_model("users", "objectpermission")
+        self.prefix = installed_apps.get_model("ipam", "prefix")
         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")
-        self.status = apps.get_model("extras", "status")
-        self.tag = apps.get_model("extras", "tag")
+        self.relationship = installed_apps.get_model("extras", "relationship")
+        self.relationship_association = installed_apps.get_model("extras", "relationshipassociation")
+        self.rir = installed_apps.get_model("ipam", "RIR")
+        self.status = installed_apps.get_model("extras", "status")
+        self.tag = installed_apps.get_model("extras", "tag")
 
         self.aggregate_ct = self.content_type.objects.get_for_model(self.aggregate)
         self.prefix_ct = self.content_type.objects.get_for_model(self.prefix)
@@ -114,8 +114,8 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
         self.aggregate1.tags.add("AggregateTagA", "AggregateTagB")
         self.aggregate2.tags.add("AggregateTagA")
         self.aggregate3.tags.add("AggregateTagB")
-        self.aggregate5.tags.add("AggregateTagA", "AggregateTagB")
-        self.aggregate6.tags.add("AggregateTagB")
+        self.aggregate5.tags.add("AggregateTagA", "AggregateTagB")  # pylint: disable=no-member
+        self.aggregate6.tags.add("AggregateTagB")  # pylint: disable=no-member
 
         # notes
         self.note.objects.create(
@@ -141,7 +141,7 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
         self.note.objects.create(
             note="Aggregate5 test note",
             assigned_object_type=self.aggregate_ct,
-            assigned_object_id=self.aggregate5.id,
+            assigned_object_id=self.aggregate5.id,  # pylint: disable=no-member
         )
 
         # object permissions
@@ -157,8 +157,8 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
         # object changes
         self._create_objectchange(self.prefix1, "Pre-migration object change for prefix1")
         self._create_objectchange(self.prefix4, "Pre-migration object change for prefix4")
-        self._create_objectchange(self.prefix5, "Pre-migration object change for prefix5")
-        self._create_objectchange(self.aggregate5, "Pre-migration object change for aggregate5")
+        self._create_objectchange(self.prefix5, "Pre-migration object change for prefix5")  # pylint: disable=no-member
+        self._create_objectchange(self.aggregate5, "Pre-migration object change for aggregate5")  # pylint: disable=no-member
 
         # custom fields
         prefix_cf1 = self.custom_field.objects.create(name="prefixcf1")
@@ -179,24 +179,24 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
 
         self.aggregate3._custom_field_data["aggregatecf1"] = "testdata aggregatecf1 aggregate3"
 
-        self.prefix5._custom_field_data["prefixcf1"] = "testdata prefixcf1 prefix5"
-        self.prefix5._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 prefix5"
+        self.prefix5._custom_field_data["prefixcf1"] = "testdata prefixcf1 prefix5"  # pylint: disable=no-member
+        self.prefix5._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 prefix5"  # pylint: disable=no-member
 
-        self.aggregate5._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 aggregate5"
-        self.aggregate5._custom_field_data["aggregatecf1"] = "testdata aggregatecf1 aggregate5"
+        self.aggregate5._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 aggregate5"  # pylint: disable=no-member
+        self.aggregate5._custom_field_data["aggregatecf1"] = "testdata aggregatecf1 aggregate5"  # pylint: disable=no-member
 
-        self.aggregate6._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 aggregate6"
+        self.aggregate6._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 aggregate6"  # pylint: disable=no-member
 
         self.prefix1.save()
         self.prefix2.save()
         self.prefix3.save()
         self.prefix4.save()
-        self.prefix5.save()
+        self.prefix5.save()  # pylint: disable=no-member
         self.aggregate1.save()
         self.aggregate2.save()
         self.aggregate3.save()
-        self.aggregate5.save()
-        self.aggregate6.save()
+        self.aggregate5.save()  # pylint: disable=no-member
+        self.aggregate6.save()  # pylint: disable=no-member
 
     @skipIf(
         connection.vendor != "postgresql",
@@ -390,7 +390,7 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
                 2,
             )
 
-        for prefix in (self.prefix2, self.prefix3, self.prefix5):
+        for prefix in (self.prefix2, self.prefix3, self.prefix5):  # pylint: disable=no-member
             self.assertEqual(
                 self.object_change.objects.filter(changed_object_id=prefix.id).count(),
                 1,

nautobot/ipam/tests/test_querysets.py

@@ -478,6 +478,20 @@ class IPAddressQuerySet(TestCase):
             [instance for ip, instance in self.ips.items() if re.match(r"2001(.*)1", ip)],
         )
 
+    def test_get_or_create(self):
+        # https://github.com/nautobot/nautobot/issues/6676
+        ip_obj, created = IPAddress.objects.update_or_create(
+            defaults={
+                "status": self.ipaddr_status,
+            },
+            host="10.0.0.1",
+            mask_length="24",
+            namespace=self.namespace,
+        )
+        self.assertFalse(created)
+        self.assertEqual(str(ip_obj.address), "10.0.0.1/24")
+        self.assertEqual(ip_obj.parent.namespace, self.namespace)
+
 
 class PrefixQuerysetTestCase(TestCase):
     queryset = Prefix.objects.all()

nautobot/project-static/docs/404.html

@@ -12,7 +12,7 @@
       
       
       <link rel="icon" href="/projects/core/en/stable/assets/favicon.ico">
-      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.48">
+      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.49">
     
     
       
@@ -8650,7 +8650,7 @@
     <script id="__config" type="application/json">{"base": "/projects/core/en/stable/", "features": ["content.code.copy", "content.tabs.link", "navigation.footer", "navigation.tabs", "navigation.tabs.sticky", "navigation.tracking", "search.highlight", "search.share", "search.suggest"], "search": "/projects/core/en/stable/assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}}</script>
     
     
-      <script src="/projects/core/en/stable/assets/javascripts/bundle.83f73b43.min.js"></script>
+      <script src="/projects/core/en/stable/assets/javascripts/bundle.88dd0f4e.min.js"></script>
       
         <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
       

nautobot/project-static/docs/apps/index.html

@@ -18,7 +18,7 @@
       
       
       <link rel="icon" href="../assets/favicon.ico">
-      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.48">
+      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.49">
     
     
       
@@ -8817,7 +8817,7 @@
     <script id="__config" type="application/json">{"base": "..", "features": ["content.code.copy", "content.tabs.link", "navigation.footer", "navigation.tabs", "navigation.tabs.sticky", "navigation.tracking", "search.highlight", "search.share", "search.suggest"], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}}</script>
     
     
-      <script src="../assets/javascripts/bundle.83f73b43.min.js"></script>
+      <script src="../assets/javascripts/bundle.88dd0f4e.min.js"></script>
       
         <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
       

nautobot/project-static/docs/apps/nautobot-apps.html

@@ -16,7 +16,7 @@
       
       
       <link rel="icon" href="../assets/favicon.ico">
-      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.48">
+      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.49">
     
     
       
@@ -8751,7 +8751,7 @@
     <script id="__config" type="application/json">{"base": "..", "features": ["content.code.copy", "content.tabs.link", "navigation.footer", "navigation.tabs", "navigation.tabs.sticky", "navigation.tracking", "search.highlight", "search.share", "search.suggest"], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}}</script>
     
     
-      <script src="../assets/javascripts/bundle.83f73b43.min.js"></script>
+      <script src="../assets/javascripts/bundle.88dd0f4e.min.js"></script>
       
         <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>