nautobot 2.4.11__py3-none-any.whl → 2.4.13__py3-none-any.whl

nautobot/ipam/models.py

@@ -170,6 +170,9 @@ class VRF(PrimaryModel):
             #       where multiple different-RD VRFs with the same name may already exist.
             # ["namespace", "name"],
         ]
+        index_together = [
+            ["namespace", "name", "rd"],
+        ]
         verbose_name = "VRF"
         verbose_name_plural = "VRFs"
 
@@ -409,7 +412,12 @@ class VRFPrefixAssignment(BaseModel):
         super().clean()
 
         if self.prefix.namespace != self.vrf.namespace:
-            raise ValidationError({"prefix": "Prefix must be in same namespace as VRF"})
+            raise ValidationError(
+                {
+                    "prefix": f"Prefix (namespace {self.prefix.namespace}) must be in same namespace as "
+                    "VRF (namespace {self.vrf.namespace})"
+                }
+            )
 
 
 @extras_features(
@@ -589,6 +597,7 @@ class Prefix(PrimaryModel):
         index_together = [
             ["network", "broadcast", "prefix_length"],
             ["namespace", "network", "broadcast", "prefix_length"],
+            ["namespace", "ip_version", "network", "prefix_length"],
         ]
         unique_together = ["namespace", "network", "prefix_length"]
         verbose_name_plural = "prefixes"
@@ -1250,6 +1259,9 @@ class IPAddress(PrimaryModel):
         verbose_name = "IP address"
         verbose_name_plural = "IP addresses"
         unique_together = ["parent", "host"]
+        index_together = [
+            ["ip_version", "host", "mask_length"],
+        ]
 
     def __init__(self, *args, address=None, namespace=None, **kwargs):
         super().__init__(*args, **kwargs)

nautobot/ipam/tests/test_api.py

@@ -316,9 +316,7 @@ class VRFPrefixAssignmentTest(APIViewTestCases.APIViewTestCase):
             response, "The fields vrf, prefix must make a unique set.", status_code=status.HTTP_400_BAD_REQUEST
         )
         response = self.client.post(self._get_list_url(), wrong_namespace_create_data, format="json", **self.header)
-        self.assertContains(
-            response, "Prefix must be in same namespace as VRF", status_code=status.HTTP_400_BAD_REQUEST
-        )
+        self.assertContains(response, "must be in same namespace as", status_code=status.HTTP_400_BAD_REQUEST)
         response = self.client.post(self._get_list_url(), missing_field_create_data, format="json", **self.header)
         self.assertContains(response, "This field may not be null.", status_code=status.HTTP_400_BAD_REQUEST)
 

nautobot/ipam/utils/testing.py

@@ -5,6 +5,8 @@ import random
 from django.apps import apps
 from netaddr import IPNetwork
 
+from nautobot.ipam.models import get_default_namespace
+
 # Calculate the probabilities to use for the maybe_subdivide() function defined below.
 
 # Frequency of IPv4 (leaf, network) Prefixes by each given mask length in a "realistic" data set.
@@ -113,40 +115,73 @@ def create_prefixes_and_ips(initial_subnet: str, apps=apps, seed="Nautobot"):  #
     status_active, _ = Status.objects.get_or_create(name="Active", defaults={"slug": "active"})
 
     for i in range(1, 11):
-        Tenant.objects.create(name=f"{initial_subnet} Tenant {i}")
-        VRF.objects.create(name=f"{initial_subnet} VRF {i}", enforce_unique=False)  # TODO should some enforce_unique?
+        Tenant.objects.get_or_create(name=f"{initial_subnet} Tenant {i}")
+        if hasattr(VRF, "enforce_unique"):
+            VRF.objects.get_or_create(
+                name=f"{initial_subnet} VRF {i}",
+                enforce_unique=False,  # TODO should some enforce_unique?
+            )
+        else:
+            VRF.objects.get_or_create(name=f"{initial_subnet} VRF {i}")
 
     all_tenants = list(Tenant.objects.all())
-    all_vrfs = list(VRF.objects.all())
+    if hasattr(VRF, "namespace"):
+        all_vrfs = list(VRF.objects.filter(namespace=get_default_namespace()))
+    else:
+        all_vrfs = list(VRF.objects.all())
+
+    create_prefixes(initial_subnet, all_tenants, all_vrfs, status_active, Prefix)
+    create_ips(initial_subnet, all_tenants, all_vrfs, status_active, IPAddress)
 
+
+def create_prefixes(initial_subnet, all_tenants, all_vrfs, status_active, Prefix):
     print(f"Creating Prefixes to subdivide {initial_subnet}")
     unique_prefix_count = 0
     duplicate_prefix_count = 0
     for subnet in maybe_subdivide(IPNetwork(initial_subnet)):
         if random.random() < 0.95:  # noqa: S311  # suspicious-non-cryptographic-random-usage
             # 95% chance to create any given Prefix
-            Prefix.objects.create(
-                network=str(subnet.network),
-                broadcast=str(subnet.broadcast if subnet.broadcast else subnet[-1]),
-                prefix_length=subnet.prefixlen,
-                status=status_active,
-                tenant=maybe_random_instance(all_tenants),
-                vrf=maybe_random_instance(all_vrfs),
-            )
-            unique_prefix_count += 1
-            while random.random() < 0.1:  # noqa: S311  # suspicious-non-cryptographic-random-usage
-                # 10% repeating chance to create a duplicate(s) of this Prefix
-                Prefix.objects.create(
+            vrf = maybe_random_instance(all_vrfs)
+            if hasattr(Prefix, "vrf"):
+                Prefix.objects.get_or_create(
                     network=str(subnet.network),
                     broadcast=str(subnet.broadcast if subnet.broadcast else subnet[-1]),
                     prefix_length=subnet.prefixlen,
                     status=status_active,
                     tenant=maybe_random_instance(all_tenants),
-                    vrf=maybe_random_instance(all_vrfs),
+                    vrf=vrf,
                 )
-                duplicate_prefix_count += 1
+            else:
+                prefix, _ = Prefix.objects.get_or_create(
+                    network=str(subnet.network),
+                    broadcast=str(subnet.broadcast if subnet.broadcast else subnet[-1]),
+                    prefix_length=subnet.prefixlen,
+                    status=status_active,
+                    tenant=maybe_random_instance(all_tenants),
+                )
+                if vrf is not None:
+                    vrf.add_prefix(prefix)
+
+            unique_prefix_count += 1
+            if hasattr(Prefix, "vrf"):
+                while random.random() < 0.1:  # noqa: S311  # suspicious-non-cryptographic-random-usage
+                    # 10% repeating chance to create a duplicate(s) of this Prefix
+                    Prefix.objects.create(
+                        network=str(subnet.network),
+                        broadcast=str(subnet.broadcast if subnet.broadcast else subnet[-1]),
+                        prefix_length=subnet.prefixlen,
+                        status=status_active,
+                        tenant=maybe_random_instance(all_tenants),
+                        vrf=maybe_random_instance(all_vrfs),
+                    )
+                    duplicate_prefix_count += 1
+            else:
+                # TODO: create prefixes in different namespaces?
+                pass
     print(f"Created {unique_prefix_count} unique Prefixes and {duplicate_prefix_count} duplicates")
 
+
+def create_ips(initial_subnet, all_tenants, all_vrfs, status_active, IPAddress):
     print(f"Creating IPAddresses within {initial_subnet}")
     unique_ip_count = 0
     duplicate_ip_count = 0
@@ -154,17 +189,7 @@ def create_prefixes_and_ips(initial_subnet: str, apps=apps, seed="Nautobot"):  #
         if random.random() < 0.05:  # noqa: S311  # suspicious-non-cryptographic-random-usage
             # 5% chance to create any given IP address
             network = IPNetwork(ip)
-            IPAddress.objects.create(
-                host=str(network.ip),
-                broadcast=str(network.broadcast if network.broadcast else network[-1]),
-                prefix_length=network.prefixlen,
-                status=status_active,
-                tenant=maybe_random_instance(all_tenants),
-                vrf=maybe_random_instance(all_vrfs),
-            )
-            unique_ip_count += 1
-            while random.random() < 0.1:  # noqa: S311  # suspicious-non-cryptographic-random-usage
-                # 10% repeating chance to create a duplicate(s) of this IP
+            if hasattr(IPAddress, "prefix_length"):
                 IPAddress.objects.create(
                     host=str(network.ip),
                     broadcast=str(network.broadcast if network.broadcast else network[-1]),
@@ -173,5 +198,27 @@ def create_prefixes_and_ips(initial_subnet: str, apps=apps, seed="Nautobot"):  #
                     tenant=maybe_random_instance(all_tenants),
                     vrf=maybe_random_instance(all_vrfs),
                 )
-                duplicate_ip_count += 1
+            else:
+                IPAddress.objects.create(
+                    host=str(network.ip),
+                    mask_length=network.prefixlen,
+                    status=status_active,
+                    tenant=maybe_random_instance(all_tenants),
+                )
+            unique_ip_count += 1
+            if hasattr(IPAddress, "prefix_length"):
+                while random.random() < 0.1:  # noqa: S311  # suspicious-non-cryptographic-random-usage
+                    # 10% repeating chance to create a duplicate(s) of this IP
+                    IPAddress.objects.create(
+                        host=str(network.ip),
+                        broadcast=str(network.broadcast if network.broadcast else network[-1]),
+                        prefix_length=network.prefixlen,
+                        status=status_active,
+                        tenant=maybe_random_instance(all_tenants),
+                        vrf=maybe_random_instance(all_vrfs),
+                    )
+                    duplicate_ip_count += 1
+            else:
+                # TODO: create duplicate IPs in other namespaces?
+                pass
     print(f"Created {unique_ip_count} unique IPAddresses and {duplicate_ip_count} duplicates")

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.6.14">
+      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.15">
     
     
       
@@ -10148,7 +10148,7 @@
       <script id="__config" type="application/json">{"base": "/projects/core/en/stable/", "features": ["content.code.annotate", "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.d50fe291.min.js", "tags": null, "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"}, "version": null}</script>
     
     
-      <script src="/projects/core/en/stable/assets/javascripts/bundle.13a4f30d.min.js"></script>
+      <script src="/projects/core/en/stable/assets/javascripts/bundle.56ea9cef.min.js"></script>
       
     
   </body>

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.6.14">
+      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.15">
     
     
       
@@ -10316,7 +10316,7 @@
       <script id="__config" type="application/json">{"base": "..", "features": ["content.code.annotate", "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.d50fe291.min.js", "tags": null, "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"}, "version": null}</script>
     
     
-      <script src="../assets/javascripts/bundle.13a4f30d.min.js"></script>
+      <script src="../assets/javascripts/bundle.56ea9cef.min.js"></script>
       
     
   <script id="init-glightbox">const lightbox = GLightbox({"touchNavigation": true, "loop": false, "zoomable": true, "draggable": true, "openEffect": "zoom", "closeEffect": "zoom", "slideEffect": "slide"});

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.6.14">
+      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.15">
     
     
       
@@ -10249,7 +10249,7 @@
       <script id="__config" type="application/json">{"base": "..", "features": ["content.code.annotate", "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.d50fe291.min.js", "tags": null, "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"}, "version": null}</script>
     
     
-      <script src="../assets/javascripts/bundle.13a4f30d.min.js"></script>
+      <script src="../assets/javascripts/bundle.56ea9cef.min.js"></script>
       
     
   <script id="init-glightbox">const lightbox = GLightbox({"touchNavigation": true, "loop": false, "zoomable": true, "draggable": true, "openEffect": "zoom", "closeEffect": "zoom", "slideEffect": "slide"});