nautobot 2.3.7__py3-none-any.whl → 2.3.9__py3-none-any.whl

nautobot/ipam/tests/test_models.py

@@ -555,8 +555,9 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
             IPAddress.objects.create(address="10.0.2.1/24", status=self.status, namespace=self.namespace),
             IPAddress.objects.create(address="10.0.3.1/24", status=self.status, namespace=self.namespace),
         )
+        self.assertQuerysetEqualAndNotEmpty(parent_prefix.ip_addresses.all(), parent_prefix.get_child_ips())
+        self.assertQuerysetEqualAndNotEmpty(parent_prefix.ip_addresses.all(), parent_prefix.get_all_ips())
         child_ip_pks = {p.pk for p in parent_prefix.ip_addresses.all()}
-
         # Global container should return all children
         self.assertSetEqual(child_ip_pks, {ips[0].pk, ips[1].pk, ips[2].pk, ips[3].pk})
 
@@ -566,6 +567,8 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
             IPAddress.objects.create(address="20.0.4.0/31", status=self.status, namespace=self.namespace),
             IPAddress.objects.create(address="20.0.4.1/31", status=self.status, namespace=self.namespace),
         )
+        self.assertQuerysetEqualAndNotEmpty(parent_prefix_31.ip_addresses.all(), parent_prefix_31.get_child_ips())
+        self.assertQuerysetEqualAndNotEmpty(parent_prefix_31.ip_addresses.all(), parent_prefix_31.get_all_ips())
         child_ip_pks = {p.pk for p in parent_prefix_31.ip_addresses.all()}
         self.assertSetEqual(child_ip_pks, {ips_31[0].pk, ips_31[1].pk})
 
@@ -660,10 +663,22 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
         slash25 = Prefix.objects.create(prefix="10.0.0.128/25", status=self.status, namespace=self.namespace)
         self.assertEqual(prefix.get_utilization(), (192, 256))
 
-        # Create 32 IPAddresses within the Prefix
+        # Create 32 IPAddresses within the /26 Prefix
         for i in range(1, 33):
             IPAddress.objects.create(address=f"10.0.0.{i}/32", status=self.status, namespace=self.namespace)
 
+        # Assert differing behavior of get_all_ips() versus get_child_ips() for the /24 and /26 prefixes
+        self.assertQuerysetEqual(prefix.get_child_ips(), IPAddress.objects.none())
+        self.assertQuerysetEqualAndNotEmpty(
+            prefix.get_all_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/24")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            slash26.get_child_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/24")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            slash26.get_all_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/24")
+        )
+
         # The parent prefix utilization does not change because the ip addresses are parented to the child /26 prefix.
         self.assertEqual(prefix.get_utilization(), (192, 256))
 
@@ -674,6 +689,17 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
         IPAddress.objects.create(address="10.0.0.0/32", status=self.status, namespace=self.namespace)
         IPAddress.objects.create(address="10.0.0.63/32", status=self.status, namespace=self.namespace)
 
+        self.assertQuerysetEqual(prefix.get_child_ips(), IPAddress.objects.none())
+        self.assertQuerysetEqualAndNotEmpty(
+            prefix.get_all_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/24")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            slash26.get_child_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/24")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            slash26.get_all_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/24")
+        )
+
         # The /26 denominator will change to 64
         self.assertEqual(slash26.get_utilization(), (34, 64))
 
@@ -688,30 +714,60 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
         pool.save()
         self.assertEqual(slash25.get_utilization(), (4, 126))
 
+        # Further distinguishing between get_child_ips() and get_all_ips():
+        IPAddress.objects.create(address="10.0.0.64/32", status=self.status, namespace=self.namespace)
+        self.assertQuerysetEqualAndNotEmpty(
+            prefix.get_child_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.64/26")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            prefix.get_all_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/24")
+        )
+
+        slash27 = Prefix.objects.create(prefix="10.0.0.0/27", status=self.status, namespace=self.namespace)
+        self.assertEqual(slash27.get_utilization(), (32, 32))
+        self.assertQuerysetEqualAndNotEmpty(
+            prefix.get_child_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.64/26")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            prefix.get_all_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/24")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            slash26.get_child_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.32/27")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            slash26.get_all_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/26")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            slash27.get_child_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/27")
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            slash27.get_all_ips(), IPAddress.objects.filter(host__net_host_contained="10.0.0.0/27")
+        )
+
         # IPv4 Non-container Prefix /31, network and broadcast addresses count toward utilization
-        prefix = Prefix.objects.create(prefix="10.0.1.0/31", status=self.status, namespace=self.namespace)
+        slash31 = Prefix.objects.create(prefix="10.0.1.0/31", status=self.status, namespace=self.namespace)
         IPAddress.objects.create(address="10.0.1.0/32", status=self.status, namespace=self.namespace)
         IPAddress.objects.create(address="10.0.1.1/32", status=self.status, namespace=self.namespace)
-        self.assertEqual(prefix.get_utilization(), (2, 2))
+        self.assertEqual(slash31.get_utilization(), (2, 2))
 
         # IPv6 Non-container Prefix, first and last addresses count toward utilization
-        prefix = Prefix.objects.create(prefix="aaab::/124", status=self.status, namespace=self.namespace)
+        slash124_1 = Prefix.objects.create(prefix="aaab::/124", status=self.status, namespace=self.namespace)
         IPAddress.objects.create(address="aaab::1/128", status=self.status, namespace=self.namespace)
         IPAddress.objects.create(address="aaab::2/128", status=self.status, namespace=self.namespace)
-        self.assertEqual(prefix.get_utilization(), (2, 16))
+        self.assertEqual(slash124_1.get_utilization(), (2, 16))
 
-        prefix = Prefix.objects.create(prefix="aaaa::/124", status=self.status, namespace=self.namespace)
+        slash124_2 = Prefix.objects.create(prefix="aaaa::/124", status=self.status, namespace=self.namespace)
         IPAddress.objects.create(address="aaaa::0/128", status=self.status, namespace=self.namespace)
         IPAddress.objects.create(address="aaaa::f/128", status=self.status, namespace=self.namespace)
-        self.assertEqual(prefix.get_utilization(), (2, 16))
+        self.assertEqual(slash124_2.get_utilization(), (2, 16))
 
         # single address prefixes
-        prefix = Prefix.objects.create(prefix="cccc::1/128", status=self.status, namespace=self.namespace)
+        slash128 = Prefix.objects.create(prefix="cccc::1/128", status=self.status, namespace=self.namespace)
         IPAddress.objects.create(address="cccc::1/128", status=self.status, namespace=self.namespace)
-        self.assertEqual(prefix.get_utilization(), (1, 1))
-        prefix = Prefix.objects.create(prefix="1.1.1.1/32", status=self.status, namespace=self.namespace)
+        self.assertEqual(slash128.get_utilization(), (1, 1))
+        slash32 = Prefix.objects.create(prefix="1.1.1.1/32", status=self.status, namespace=self.namespace)
         IPAddress.objects.create(address="1.1.1.1/32", status=self.status, namespace=self.namespace)
-        self.assertEqual(prefix.get_utilization(), (1, 1))
+        self.assertEqual(slash32.get_utilization(), (1, 1))
 
         # Large Prefix
         large_prefix = Prefix.objects.create(

nautobot/ipam/views.py

@@ -270,6 +270,15 @@ class VRFView(generic.ObjectView):
         vrf_table.exclude = ("vrf",)
         # context["vrf_table"] = vrf_table
 
+        paginate = {
+            "paginator_class": EnhancedPaginator,
+            "per_page": get_paginate_count(request),
+        }
+        RequestConfig(request, paginate).configure(prefix_table)
+        RequestConfig(request, paginate).configure(vrf_table)
+        RequestConfig(request, paginate).configure(import_targets_table)
+        RequestConfig(request, paginate).configure(export_targets_table)
+
         context.update(
             {
                 "device_table": vrf_table,
@@ -337,6 +346,13 @@ class RouteTargetView(generic.ObjectView):
         importing_vrfs_table = tables.VRFTable(instance.importing_vrfs.select_related("tenant"), orderable=False)
         exporting_vrfs_table = tables.VRFTable(instance.exporting_vrfs.select_related("tenant"), orderable=False)
 
+        paginate = {
+            "paginator_class": EnhancedPaginator,
+            "per_page": get_paginate_count(request),
+        }
+        RequestConfig(request, paginate).configure(importing_vrfs_table)
+        RequestConfig(request, paginate).configure(exporting_vrfs_table)
+
         return {
             "importing_vrfs_table": importing_vrfs_table,
             "exporting_vrfs_table": exporting_vrfs_table,
@@ -460,6 +476,14 @@ class PrefixView(generic.ObjectView):
         cloud_network_table = CloudNetworkTable(cloud_networks, orderable=False)
         cloud_network_table.exclude = ("actions", "assigned_prefix_count", "circuit_count", "cloud_service_count")
 
+        paginate = {
+            "paginator_class": EnhancedPaginator,
+            "per_page": get_paginate_count(request),
+        }
+        RequestConfig(request, paginate).configure(parent_prefix_table)
+        RequestConfig(request, paginate).configure(vrf_table)
+        RequestConfig(request, paginate).configure(cloud_network_table)
+
         return {
             "vrf_table": vrf_table,
             "parent_prefix_table": parent_prefix_table,
@@ -778,6 +802,7 @@ class IPAddressView(generic.ObjectView):
             "paginator_class": EnhancedPaginator,
             "per_page": get_paginate_count(request),
         }
+        RequestConfig(request, paginate).configure(parent_prefixes_table)
         RequestConfig(request, paginate).configure(related_ips_table)
 
         return {
@@ -1158,6 +1183,12 @@ class IPAddressInterfacesView(generic.ObjectView):
         if request.user.has_perm("dcim.change_interface") or request.user.has_perm("dcim.delete_interface"):
             interface_table.columns.show("pk")
 
+        paginate = {
+            "paginator_class": EnhancedPaginator,
+            "per_page": get_paginate_count(request),
+        }
+        RequestConfig(request, paginate).configure(interface_table)
+
         return {
             "interface_table": interface_table,
             "active_tab": "interfaces",
@@ -1178,6 +1209,12 @@ class IPAddressVMInterfacesView(generic.ObjectView):
         ):
             vm_interface_table.columns.show("pk")
 
+        paginate = {
+            "paginator_class": EnhancedPaginator,
+            "per_page": get_paginate_count(request),
+        }
+        RequestConfig(request, paginate).configure(vm_interface_table)
+
         return {
             "vm_interface_table": vm_interface_table,
             "active_tab": "vm_interfaces",
@@ -1316,6 +1353,12 @@ class VLANView(generic.ObjectView):
         prefix_table = tables.PrefixTable(list(prefixes), hide_hierarchy_ui=True)
         prefix_table.exclude = ("vlan",)
 
+        paginate = {
+            "paginator_class": EnhancedPaginator,
+            "per_page": get_paginate_count(request),
+        }
+        RequestConfig(request, paginate).configure(prefix_table)
+
         return {"prefix_table": prefix_table, **super().get_extra_context(request, instance)}
 
 

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.39">
+      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.41">
     
     
       
@@ -20,7 +20,7 @@
       
     
     
-      <link rel="stylesheet" href="/projects/core/en/stable/assets/stylesheets/main.8c3ca2c6.min.css">
+      <link rel="stylesheet" href="/projects/core/en/stable/assets/stylesheets/main.0253249f.min.css">
       
         
         <link rel="stylesheet" href="/projects/core/en/stable/assets/stylesheets/palette.06af60db.min.css">
@@ -6364,6 +6364,27 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="/projects/core/en/stable/development/apps/api/platform-features/table-extensions.html" class="md-nav__link">
+        
+  
+  <span class="md-ellipsis">
+    Table Extensions
+  </span>
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="/projects/core/en/stable/development/apps/api/platform-features/uniquely-identify-objects.html" class="md-nav__link">
         
@@ -8629,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.525ec568.min.js"></script>
+      <script src="/projects/core/en/stable/assets/javascripts/bundle.83f73b43.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.39">
+      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.41">
     
     
       
@@ -26,7 +26,7 @@
       
     
     
-      <link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
+      <link rel="stylesheet" href="../assets/stylesheets/main.0253249f.min.css">
       
         
         <link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
@@ -6386,6 +6386,27 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="../development/apps/api/platform-features/table-extensions.html" class="md-nav__link">
+        
+  
+  <span class="md-ellipsis">
+    Table Extensions
+  </span>
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="../development/apps/api/platform-features/uniquely-identify-objects.html" class="md-nav__link">
         
@@ -8796,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.525ec568.min.js"></script>
+      <script src="../assets/javascripts/bundle.83f73b43.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.39">
+      <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.41">
     
     
       
@@ -24,7 +24,7 @@
       
     
     
-      <link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
+      <link rel="stylesheet" href="../assets/stylesheets/main.0253249f.min.css">
       
         
         <link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
@@ -6384,6 +6384,27 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="../development/apps/api/platform-features/table-extensions.html" class="md-nav__link">
+        
+  
+  <span class="md-ellipsis">
+    Table Extensions
+  </span>
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="../development/apps/api/platform-features/uniquely-identify-objects.html" class="md-nav__link">
         
@@ -8730,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.525ec568.min.js"></script>
+      <script src="../assets/javascripts/bundle.83f73b43.min.js"></script>
       
         <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>