nautobot 2.0.4__py3-none-any.whl → 2.1.0b1__py3-none-any.whl

nautobot/ipam/models.py

@@ -257,6 +257,7 @@ class VRF(PrimaryModel):
         return instance.delete()
 
 
+@extras_features("graphql")
 class VRFDeviceAssignment(BaseModel):
     vrf = models.ForeignKey("ipam.VRF", on_delete=models.CASCADE, related_name="device_assignments")
     device = models.ForeignKey(
@@ -306,6 +307,7 @@ class VRFDeviceAssignment(BaseModel):
             raise ValidationError("A VRF must be associated with either a device or a virtual machine.")
 
 
+@extras_features("graphql")
 class VRFPrefixAssignment(BaseModel):
     vrf = models.ForeignKey("ipam.VRF", on_delete=models.CASCADE, related_name="+")
     prefix = models.ForeignKey("ipam.Prefix", on_delete=models.CASCADE, related_name="vrf_assignments")
@@ -1069,6 +1071,11 @@ class IPAddress(PrimaryModel):
         # TODO: Implement proper caching of `closest_parent` and ensure the cache is invalidated when
         #  `_namespace` changes. Currently, `_get_closest_parent` is called twice, in the `clean` and `save` methods.
         #  Caching would improve performance.
+
+        # Host and maxlength are required to get the closest_parent
+        empty_values = [None, b"", ""]
+        if self.host in empty_values or self.mask_length in empty_values:
+            return None
         try:
             closest_parent = (
                 Prefix.objects.filter(namespace=self._namespace)
@@ -1099,7 +1106,7 @@ class IPAddress(PrimaryModel):
 
         closest_parent = self._get_closest_parent()
         # Validate `parent` can be used as the parent for this ipaddress
-        if self.parent:
+        if self.parent and closest_parent:
             if self.parent != closest_parent:
                 raise ValidationError(
                     {
@@ -1121,7 +1128,10 @@ class IPAddress(PrimaryModel):
         if not self.dns_name.islower:
             self.dns_name = self.dns_name.lower()
 
-        self.parent = self._get_closest_parent()
+        # Host and mask_length are required to get closest parent
+        closest_parent = self._get_closest_parent()
+        if closest_parent is not None:
+            self.parent = closest_parent
         super().save(*args, **kwargs)
 
     @property
@@ -1181,6 +1191,7 @@ class IPAddress(PrimaryModel):
             return f"Multiple IPAddress objects specify this object (pk: {self.obj.pk}) as nat_inside. Please refer to nat_outside_list."
 
 
+@extras_features("graphql")
 class IPAddressToInterface(BaseModel):
     ip_address = models.ForeignKey("ipam.IPAddress", on_delete=models.CASCADE, related_name="+")
     interface = models.ForeignKey(

nautobot/ipam/navigation.py

@@ -5,7 +5,6 @@ from nautobot.core.apps import (
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
-    NavMenuImportButton,
     NavMenuTab,
 )
 
@@ -33,12 +32,6 @@ menu_items = (
                                     "ipam.add_ipaddress",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="ipam:ipaddress_import",
-                                permissions=[
-                                    "ipam.add_ipaddress",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -48,14 +41,7 @@ menu_items = (
                         permissions=[
                             "ipam.add_ipaddresstointerface",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="ipam:ipaddresstointerface_import",
-                                permissions=[
-                                    "ipam.add_ipaddresstointerface",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                 ),
             ),
@@ -77,12 +63,6 @@ menu_items = (
                                     "ipam.add_prefix",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="ipam:prefix_import",
-                                permissions=[
-                                    "ipam.add_prefix",
-                                ],
-                            ),
                         ),
                     ),
                 ),
@@ -105,12 +85,6 @@ menu_items = (
                                     "ipam.add_rir",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="ipam:rir_import",
-                                permissions=[
-                                    "ipam.add_rir",
-                                ],
-                            ),
                         ),
                     ),
                 ),
@@ -149,12 +123,6 @@ menu_items = (
                                     "ipam.add_vrf",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="ipam:vrf_import",
-                                permissions=[
-                                    "ipam.add_vrf",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -171,12 +139,6 @@ menu_items = (
                                     "ipam.add_routetarget",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="ipam:routetarget_import",
-                                permissions=[
-                                    "ipam.add_routetarget",
-                                ],
-                            ),
                         ),
                     ),
                 ),
@@ -199,12 +161,6 @@ menu_items = (
                                     "ipam.add_vlan",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="ipam:vlan_import",
-                                permissions=[
-                                    "ipam.add_vlan",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -221,12 +177,6 @@ menu_items = (
                                     "ipam.add_vlangroup",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="ipam:vlangroup_import",
-                                permissions=[
-                                    "ipam.add_vlangroup",
-                                ],
-                            ),
                         ),
                     ),
                 ),
@@ -242,14 +192,7 @@ menu_items = (
                         permissions=[
                             "ipam.view_service",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="ipam:service_import",
-                                permissions=[
-                                    "ipam.add_service",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                 ),
             ),

nautobot/ipam/tables.py

@@ -33,7 +33,7 @@ from .models import (
     VRFPrefixAssignment,
 )
 
-AVAILABLE_LABEL = mark_safe('<span class="label label-success">Available</span>')
+AVAILABLE_LABEL = mark_safe('<span class="label label-success">Available</span>')  # noqa: S308
 
 UTILIZATION_GRAPH = """
 {% load helpers %}

nautobot/ipam/templates/ipam/ipaddress.html

@@ -6,15 +6,6 @@
                     <li>{{ object.parent.namespace|hyperlinked_object }}</li>
 {% endblock extra_breadcrumbs %}
 
-{% block masthead %}
-<h1>
-<span class="hover_copy"><span id="copy_title">{{ object }}</span><button type="button" class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#copy_title">
-    <span class="mdi mdi-content-copy"></span>
-</button>
-</span>
-</h1>
-{% endblock masthead %}
-
 {% block extra_nav_tabs %}
         {% with interface_count=object.interfaces.count %}
             {% if interface_count %}

nautobot/ipam/templates/ipam/prefix.html

@@ -9,15 +9,6 @@
     <li>{{ object|hyperlinked_object }}</li>
 {% endblock breadcrumbs %}
 
-{% block masthead %}
-<h1>
-<span class="hover_copy"><span id="copy_title">{{ object }}</span><button type="button" class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#copy_title">
-    <span class="mdi mdi-content-copy"></span>
-</button>
-</span>
-</h1>
-{% endblock masthead %}
-
 {% block extra_buttons %}
         {% if perms.ipam.add_prefix and active_tab == 'prefixes' and first_available_prefix %}
         <a href="{% url 'ipam:prefix_add' %}?prefix={{ first_available_prefix }}&namespace={{ object.namespace.pk }}&location={{ object.location.pk }}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-success">

nautobot/ipam/tests/features/prefixes.feature

@@ -0,0 +1,134 @@
+Feature: Prefixes
+  In order to manage my network IPAM data,
+  As a Network Engineer
+  I want to record in Nautobot an appropriate set of Prefixes and related data.
+
+  Background:
+    Given I have appropriate Nautobot permissions:
+      | model          | permissions            |
+      | ipam.namespace | add,change,delete,view |
+      | ipam.prefix    | add,change,delete,view |
+    And I am logged in to Nautobot
+
+  Scenario: Creating a set of Prefixes in a custom Namespace
+    When I navigate to the "Add Namespace" view
+    And I make the following form entries:
+      | name | description       |
+      | CORP | Corporate network |
+    And I submit the form
+    Then a Namespace exists in Nautobot with the following properties:
+      | name | description       |
+      | CORP | Corporate network |
+    And Nautobot shows the "Namespace Detail" view for the Namespace with name "CORP"
+    # TODO: it would be nice to have the ability to create a Prefix directly from the Namespace detail view?
+
+    When I navigate to the "Add Prefix" view
+    And I make the following form entries:
+      | prefix     | namespace | type      | status |
+      | 10.0.0.0/8 | CORP      | Container | Active |
+    And I submit the form
+    Then a Prefix exists in Nautobot with the following properties:
+      | prefix     | namespace | type      | status | parent |
+      | 10.0.0.0/8 | CORP      | Container | Active | None   |
+    And Nautobot shows the "Prefix Detail" view for the Prefix with prefix "10.0.0.0/8" and namespace "CORP"
+    And the view shows a "Utilization" of "0%"
+
+    When I click the "Clone" button
+    Then Nautobot shows the "Add Prefix" view with the following presets:
+      | namespace | type      | status |
+      | CORP      | Container | Active |
+    When I make the following form entries:
+      | prefix        | type    |
+      | 10.0.100.0/24 | Network |
+    And I submit the form
+    Then a Prefix exists in Nautobot with the following properties:
+      | prefix        | namespace | type    | status | parent     |
+      | 10.0.100.0/24 | CORP      | Network | Active | 10.0.0.0/8 |
+    And Nautobot shows the "Prefix Detail" view for the Prefix with prefix "10.0.100.0/24" and namespace "CORP"
+    And the view shows a "Utilization" of "0%"
+    And the table "Parent Prefixes" includes rows with the following properties:
+      | prefix     | type      |
+      | 10.0.0.0/8 | Container |
+
+    When I click the "Clone" button
+    Then Nautobot shows the "Add Prefix" view with the following presets:
+      | namespace | type    | status |
+      | CORP      | Network | Active |
+    When I make the following form entries:
+      | prefix      | type      |
+      | 10.0.0.0/16 | Container |
+    And I submit the form
+    Then a Prefix exists in Nautobot with the following properties:
+      | prefix      | namespace | type      | status | parent     |
+      | 10.0.0.0/16 | CORP      | Container | Active | 10.0.0.0/8 |
+    And Nautobot shows the "Prefix Detail" view for the Prefix with prefix "10.0.0.0/16" and namespace "CORP"
+    And the table "Parent Prefixes" includes rows with the following properties:
+      | prefix     | type      |
+      | 10.0.0.0/8 | Container |
+    And the tab "Child Prefixes" includes a badge with the number "1"
+
+    When I click the "Child Prefixes" tab
+    Then Nautobot shows the "Child Prefixes" tab
+    And the table "Child Prefixes" includes rows with the following properties:
+      | prefix        | type    | status |
+      | 10.0.0.0/18   | —       | —      |
+      | 10.0.64.0/19  | —       | —      |
+      | 10.0.96.0/22  | —       | —      |
+      | 10.0.100.0/24 | Network | Active |
+
+    When I click the "10.0.96.0/22" link
+    Then Nautobot shows the "Add Prefix" view with the following presets:
+      | prefix        | namespace |
+      | 10.0.96.0/22  | CORP      |
+    When I make the following form entries:
+      | prefix       | type      | status |
+      | 10.0.96.0/20 | Container | Active |
+    And I submit the form
+    Then a Prefix exists in Nautobot with the following properties:
+      | prefix       | namespace | type      | status | parent      |
+      | 10.0.96.0/20 | CORP      | Container | Active | 10.0.0.0/16 |
+    And Nautobot shows the "Prefix Detail" view for the Prefix with prefix "10.0.96.0/20" and namespace "CORP"
+    And the view shows a "Utilization" of "6%"
+    And the table "Parent Prefixes" includes rows with the following properties:
+      | prefix      | type      | status |
+      | 10.0.0.0/8  | Container | Active |
+      | 10.0.0.0/16 | Container | Active |
+    And the tab "Child Prefixes" includes a badge with the number "1"
+
+    When I navigate to the "Prefix List" view
+    And specify a filter of "?namespace=CORP"
+    Then the table "Prefixes" includes rows with the following properties:
+      | prefix        | namespace | type      | status | children | utilization |
+      | 10.0.0.0/8    | CORP      | Container | Active | 3        | 0%          |
+      | 10.0.0.0/16   | CORP      | Container | Active | 2        | 6%          |
+      | 10.0.96.0/20  | CORP      | Container | Active | 1        | 6%          |
+      | 10.0.100.0/24 | CORP      | Network   | Active | 0        | 0%          |
+
+    When I click the "Import" button
+    Then Nautobot shows the "Prefix Bulk Import" view
+    When I enter the following into the "csv_data" field:
+      """
+      prefix,status__name,type,namespace__name
+      10.0.101.0/24,Reserved,network,CORP
+      10.0.102.0/24,Reserved,network,CORP
+      10.1.0.0/16,Reserved,container,CORP
+      """
+    And I submit the form
+    Then several Prefixes exist in Nautobot with the following properties:
+      | prefix        | namespace | type      | status   | parent       |
+      | 10.0.101.0/24 | CORP      | Network   | Reserved | 10.0.96.0/20 |
+      | 10.0.102.0/24 | CORP      | Network   | Reserved | 10.0.96.0/20 |
+      | 10.1.0.0/16   | CORP      | Container | Reserved | 10.0.0.0/8   |
+    And Nautobot shows the "Prefix Import Completed" view with 3 rows
+    When I click the "View All" button
+    Then Nautobot shows the "Prefix List" view
+    When I specify a filter of "?namespace=CORP"
+    Then the table "Prefixes" includes rows with the following properties:
+      | prefix        | namespace | type      | status   | children | utilization |
+      | 10.0.0.0/8    | CORP      | Container | Active   | 6        | 0%          |
+      | 10.0.0.0/16   | CORP      | Container | Active   | 4        | 6%          |
+      | 10.0.96.0/20  | CORP      | Container | Active   | 3        | 18%         |
+      | 10.0.100.0/24 | CORP      | Network   | Active   | 0        | 0%          |
+      | 10.0.101.0/24 | CORP      | Network   | Reserved | 0        | 0%          |
+      | 10.0.102.0/24 | CORP      | Network   | Reserved | 0        | 0%          |
+      | 10.1.0.0/16   | CORP      | Container | Reserved | 0        | 0%          |

nautobot/ipam/tests/test_filters.py

@@ -165,6 +165,7 @@ class PrefixTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
         ["rir", "rir__name"],
         ["role", "role__id"],
         ["role", "role__name"],
+        ["status", "status__id"],
         ["status", "status__name"],
         ["type"],
     )
@@ -796,8 +797,8 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
 
     def test_present_in_vrf(self):
         # clear out all the randomly generated route targets and vrfs before running this custom test
-        test_ip_addresses_pk_list = list(self.queryset.values_list("pk", flat=True)[:10])
-        test_ip_addresses = self.queryset[:10]
+        test_ip_addresses = self.queryset.filter(parent__namespace=self.namespace)
+        test_ip_addresses_pk_list = list(test_ip_addresses.values_list("pk", flat=True))
         # With advent of `IPAddress.parent`, IPAddresses can't just be bulk deleted without clearing their
         # `parent` first in an `update()` query which doesn't call `save()` or `fire `(pre|post)_save` signals.
         unwanted_ips = self.queryset.exclude(pk__in=test_ip_addresses_pk_list)
@@ -815,12 +816,6 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
             VRF.objects.create(name="VRF 2", rd="65000:200", namespace=self.namespace),
             VRF.objects.create(name="VRF 3", rd="65000:300", namespace=self.namespace),
         )
-        test_ip_addresses[0].parent.namespace = self.namespace
-        test_ip_addresses[0].validated_save()
-        test_ip_addresses[1].parent.namespace = self.namespace
-        test_ip_addresses[1].validated_save()
-        test_ip_addresses[2].parent.namespace = self.namespace
-        test_ip_addresses[2].validated_save()
         vrfs[0].import_targets.add(route_targets[0], route_targets[1], route_targets[2])
         vrfs[1].export_targets.add(route_targets[1])
         vrfs[2].export_targets.add(route_targets[2])
@@ -855,7 +850,7 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
 
     def test_status(self):
         statuses = list(Status.objects.get_for_model(IPAddress).filter(ip_addresses__isnull=False)[:2])
-        params = {"status": [statuses[0].name, statuses[1].name]}
+        params = {"status": [statuses[0].name, statuses[1].id]}
         self.assertQuerysetEqualAndNotEmpty(
             self.filterset(params, self.queryset).qs, self.queryset.filter(status__in=statuses)
         )
@@ -1114,7 +1109,7 @@ class VLANTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilter
 
     def test_status(self):
         statuses = list(Status.objects.get_for_model(VLAN).filter(vlans__isnull=False).distinct())[:2]
-        params = {"status": [statuses[0].name, statuses[1].name]}
+        params = {"status": [statuses[0].name, statuses[1].id]}
         self.assertQuerysetEqual(self.filterset(params, self.queryset).qs, self.queryset.filter(status__in=statuses))
 
     def test_search(self):

nautobot/ipam/tests/test_models.py

@@ -983,6 +983,13 @@ class TestIPAddress(ModelTestCases.BaseModelTestCase):
             ip.validated_save()
         self.assertEqual(err.exception.message_dict["parent"][0], "Either a parent or a namespace must be provided.")
 
+    def test_varbinary_ip_fields_with_empty_values_do_not_violate_not_null_constrains(self):
+        # Assert that an error is triggered when the host is not provided.
+        # Initially, VarbinaryIPField fields with None values are stored as the binary representation of b'',
+        # thereby bypassing the Not Null Constraint check.
+        with self.assertRaises(IntegrityError):
+            IPAddress.objects.create(mask_length=32, status=self.status)
+
 
 class TestRIR(ModelTestCases.BaseModelTestCase):
     model = RIR

nautobot/ipam/tests/test_views.py

@@ -50,12 +50,14 @@ class NamespaceTestCase(
     ViewTestCases.DeleteObjectViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
     ViewTestCases.BulkImportObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase,
 ):
     model = Namespace
 
     @classmethod
     def setUpTestData(cls):
-        locations = Location.objects.all()[:4]
+        locations = Location.objects.get_for_model(Namespace)
 
         cls.form_data = {"name": "Namespace X", "location": locations[0].pk, "description": "A new Namespace"}
 
@@ -66,6 +68,11 @@ class NamespaceTestCase(
             "Namespace 6,",
         )
 
+        cls.bulk_edit_data = {
+            "description": "New description",
+            "location": locations[1].pk,
+        }
+
 
 class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = VRF