nautobot 2.3.16__py3-none-any.whl → 2.4.0__py3-none-any.whl

nautobot/ipam/templates/ipam/prefix.html

@@ -68,15 +68,7 @@
                             {{ object.get_type_display }}
                         </td>
                     </tr>
-                    <tr>
-                        <td>Tenant</td>
-                        <td>
-                            {% if object.tenant and object.tenant.tenant_group %}
-                                {{ object.tenant.tenant_group|hyperlinked_object }} /
-                            {% endif %}
-                            {{ object.tenant|hyperlinked_object }}
-                        </td>
-                    </tr>
+                    {% include 'inc/tenant_table_row.html' %}
                     <tr>
                         <td>Locations</td>
                         <td>

nautobot/ipam/templates/ipam/prefix_edit.html

@@ -29,12 +29,6 @@
             {% render_field form.vlan %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock %}

nautobot/ipam/templates/ipam/routetarget.html

@@ -1,29 +1 @@
 {% extends 'generic/object_detail.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Route Target</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Name</td>
-                    <td>{{ object.name }}</td>
-                </tr>
-                <tr>
-                    <td>Tenant</td>
-                    <td>{{ object.tenant|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    {% include 'utilities/obj_table.html' with table=importing_vrfs_table table_template='panel_table.html' heading="Importing VRFs" %}
-    {% include 'utilities/obj_table.html' with table=exporting_vrfs_table table_template='panel_table.html' heading="Exporting VRFs" %}
-{% endblock content_right_page %}

nautobot/ipam/templates/ipam/vlan.html

@@ -44,15 +44,7 @@
                         <td>Name</td>
                         <td>{{ object.name }}</td>
                     </tr>
-                    <tr>
-                        <td>Tenant</td>
-                        <td>
-                            {% if object.tenant and object.tenant.tenant_group %}
-                                {{ object.tenant.tenant_group|hyperlinked_object }} /
-                            {% endif %}
-                            {{ object.tenant|hyperlinked_object }}
-                        </td>
-                    </tr>
+                    {% include 'inc/tenant_table_row.html' %}
                     <tr>
                         <td>Status</td>
                         <td>

nautobot/ipam/templates/ipam/vlan_edit.html

@@ -19,12 +19,6 @@
             {% render_field form.vlan_group %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock %}

nautobot/ipam/templates/ipam/vrf.html

@@ -1,48 +1 @@
 {% extends 'generic/object_detail.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>VRF</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Namespace</td>
-                    <td>{{ object.namespace|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Route Distinguisher</td>
-                    <td>{{ object.rd }}</td>
-                </tr>
-                <tr>
-                    <td>Tenant</td>
-                    <td>{{ object.tenant|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Status</td>
-                    <td>{{ object.status|hyperlinked_object_with_color }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Prefixes</td>
-                    <td>
-                        <a href="{% url 'ipam:prefix_list' %}?vrfs={{ object.pk }}">{{ prefix_count }}</a>
-                    </td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    {% include 'utilities/obj_table.html' with table=import_targets_table table_template='panel_table.html' heading="Import Route Targets" %}
-    {% include 'utilities/obj_table.html' with table=export_targets_table table_template='panel_table.html' heading="Export Route Targets" %}
-{% endblock content_right_page %}
-
-{% block content_full_width_page %}
-	{% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading="Assigned Prefixes" %}
-	{% include 'utilities/obj_table.html' with table=device_table table_template='panel_table.html' heading="Assigned Devices" %}
-{% endblock content_full_width_page %}

nautobot/ipam/templates/ipam/vrf_edit.html

@@ -37,12 +37,6 @@
             {% render_field form.export_targets %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock %}

nautobot/ipam/tests/test_api.py

@@ -349,6 +349,8 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         cls.create_data = [
             {
                 "prefix": "192.168.4.0/24",
+                "network": "192.168.4.0",  # not required, but possible to specify
+                "broadcast": "192.168.4.255",  # not required, but possible to specify
                 "status": cls.status.pk,
                 "rir": rir.pk,
                 "type": choices.PrefixTypeChoices.TYPE_POOL,
@@ -1714,24 +1716,24 @@ class VLANLocationAssignmentTest(APIViewTestCases.APIViewTestCase):
         # make sure there are 4 locations without vlans 1 and 2 for the create_data below
         for i in range(4):
             cls.locations[i].vlans.set([])
-        locations_without_vlans = cls.locations.exclude(vlans__in=[cls.vlans[0], cls.vlans[1]])
+        locations_without_vlans = cls.locations.filter(vlans__isnull=True)
 
         cls.create_data = [
             {
                 "vlan": cls.vlans[0].pk,
-                "location": locations_without_vlans[1].pk,
+                "location": locations_without_vlans[0].pk,
             },
             {
                 "vlan": cls.vlans[0].pk,
-                "location": locations_without_vlans[2].pk,
+                "location": locations_without_vlans[1].pk,
             },
             {
                 "vlan": cls.vlans[1].pk,
-                "location": locations_without_vlans[3].pk,
+                "location": locations_without_vlans[2].pk,
             },
             {
                 "vlan": cls.vlans[1].pk,
-                "location": locations_without_vlans[4].pk,
+                "location": locations_without_vlans[3].pk,
             },
         ]
 

nautobot/ipam/tests/test_filters.py

@@ -65,45 +65,20 @@ class VRFTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilterT
     tenancy_related_name = "vrfs"
     # skip testing "rd" attribute for generic q filter test as it's not trivially modifiable
     exclude_q_filter_predicates = ["rd"]
+    generic_filter_tests = (
+        ("export_targets", "export_targets__id"),
+        ("export_targets", "export_targets__name"),
+        ("import_targets", "import_targets__id"),
+        ("import_targets", "import_targets__name"),
+        ("name",),
+        ("rd",),
+    )
 
     @classmethod
     def setUpTestData(cls):
         instance = cls.queryset.first()
         instance.tags.set(Tag.objects.all()[:2])
 
-    def test_name(self):
-        names = list(self.queryset.values_list("name", flat=True))[:2]
-        params = {"name": names}
-        self.assertQuerysetEqual(self.filterset(params, self.queryset).qs, self.queryset.filter(name__in=names))
-
-    def test_rd(self):
-        vrfs = self.queryset.filter(rd__isnull=False)[:2]
-        params = {"rd": [vrfs[0].rd, vrfs[1].rd]}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-
-    def test_import_targets(self):
-        route_targets = list(RouteTarget.objects.filter(importing_vrfs__isnull=False).distinct())[:2]
-        params = {"import_targets": [route_targets[0].pk, route_targets[1].name]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(import_targets__in=route_targets).distinct(),
-            ordered=False,
-        )
-
-    def test_export_targets(self):
-        route_targets = list(RouteTarget.objects.filter(exporting_vrfs__isnull=False).distinct())[:2]
-        params = {"export_targets": [route_targets[0].pk, route_targets[1].name]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(export_targets__in=route_targets).distinct(),
-            ordered=False,
-        )
-
-    def test_search(self):
-        value = self.queryset.values_list("pk", flat=True)[0]
-        params = {"q": value}
-        self.assertEqual(self.filterset(params, self.queryset).qs.values_list("pk", flat=True)[0], value)
-
 
 class RouteTargetTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilterTestCaseMixin):
     queryset = RouteTarget.objects.all()
@@ -111,44 +86,27 @@ class RouteTargetTestCase(FilterTestCases.FilterTestCase, FilterTestCases.Tenanc
     tenancy_related_name = "route_targets"
     # skip testing "name" attribute for generic q filter test as it's not trivially modifiable
     exclude_q_filter_predicates = ["name"]
+    generic_filter_tests = (
+        ("exporting_vrfs", "exporting_vrfs__id"),
+        ("exporting_vrfs", "exporting_vrfs__rd"),
+        ("importing_vrfs", "importing_vrfs__id"),
+        ("importing_vrfs", "importing_vrfs__rd"),
+        ("name",),
+    )
 
     @classmethod
     def setUpTestData(cls):
         instance = cls.queryset.first()
         instance.tags.set(Tag.objects.all()[:2])
 
-    def test_name(self):
-        params = {"name": [self.queryset[0].name, self.queryset[1].name, self.queryset[2].name]}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
-
-    def test_importing_vrfs(self):
-        vrfs = list(VRF.objects.filter(import_targets__isnull=False, rd__isnull=False).distinct())[:2]
-        params = {"importing_vrfs": [vrfs[0].pk, vrfs[1].rd]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs, self.queryset.filter(importing_vrfs__in=vrfs).distinct()
-        )
 
-    def test_exporting_vrfs(self):
-        vrfs = list(VRF.objects.filter(export_targets__isnull=False, rd__isnull=False).distinct())[:2]
-        params = {"exporting_vrfs": [vrfs[0].pk, vrfs[1].rd]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs, self.queryset.filter(exporting_vrfs__in=vrfs).distinct()
-        )
-
-    def test_search(self):
-        value = self.queryset.values_list("pk", flat=True)[0]
-        params = {"q": value}
-        self.assertEqual(self.filterset(params, self.queryset).qs.values_list("pk", flat=True)[0], value)
-
-
-class RIRTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class RIRTestCase(FilterTestCases.FilterTestCase):
     queryset = RIR.objects.all()
     filterset = RIRFilterSet
-
-    def test_description(self):
-        descriptions = self.queryset.exclude(description="").values_list("description", flat=True)[:2]
-        params = {"description": list(descriptions)}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+    generic_filter_tests = (
+        ("description",),
+        ("name",),
+    )
 
     def test_is_private(self):
         params = {"is_private": "true"}
@@ -224,8 +182,8 @@ class PrefixTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
 class PrefixLocationAssignmentTestCase(FilterTestCases.FilterTestCase):
     queryset = PrefixLocationAssignment.objects.all()
     filterset = PrefixLocationAssignmentFilterSet
-
     # NOTE: No generic logic in place yet to test TreeNodeMultipleChoiceFilter
+    generic_filter_tests = ()
     # generic_filter_tests = (
     #     ["location", "location__name"],
     #     ["location", "location__id"],
@@ -1022,9 +980,16 @@ class IPAddressToInterfaceTestCase(FilterTestCases.FilterTestCase):
                 )
 
 
-class VLANGroupTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class VLANGroupTestCase(FilterTestCases.FilterTestCase):
     queryset = VLANGroup.objects.all()
     filterset = VLANGroupFilterSet
+    generic_filter_tests = (
+        ("description",),
+        # NOTE: No generic logic in place yet to test TreeNodeMultipleChoiceFilter
+        # ("location", "location__id"),
+        # ("location", "location__name"),
+        ("name",),
+    )
 
     @classmethod
     def setUpTestData(cls):
@@ -1044,26 +1009,21 @@ class VLANGroupTestCase(FilterTestCases.NameOnlyFilterTestCase):
         VLANGroup.objects.create(name="VLAN Group 3", location=cls.locations[2], description="C")
         VLANGroup.objects.create(name="VLAN Group 4", location=None)
 
-    def test_description(self):
-        descriptions = list(VLANGroup.objects.exclude(description="").values_list("description", flat=True)[:2])
-        params = {"description": descriptions}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-
-    def test_location(self):
-        params = {"location": [self.locations[0].pk, self.locations[1].pk]}
-        self.assertQuerysetEqual(
-            self.filterset(params, self.queryset).qs, self.queryset.filter(location__in=params["location"])
-        )
-        params = {"location": [self.locations[0].name, self.locations[1].name]}
-        self.assertQuerysetEqual(
-            self.filterset(params, self.queryset).qs, self.queryset.filter(location__name__in=params["location"])
-        )
-
 
 class VLANTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilterTestCaseMixin):
     queryset = VLAN.objects.all()
     filterset = VLANFilterSet
     tenancy_related_name = "vlans"
+    generic_filter_tests = (
+        ("name",),
+        ("role", "role__id"),
+        ("role", "role__name"),
+        ("status", "status__id"),
+        ("status", "status__name"),
+        ("vid",),
+        ("vlan_group", "vlan_group__id"),
+        ("vlan_group", "vlan_group__name"),
+    )
 
     @classmethod
     def setUpTestData(cls):
@@ -1149,16 +1109,6 @@ class VLANTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilter
         vlans[0].tags.set(Tag.objects.all()[:2])
         vlans[1].tags.set(Tag.objects.all()[:2])
 
-    def test_name(self):
-        names = list(VLAN.objects.all().values_list("name", flat=True)[:2])
-        params = {"name": names}
-        self.assertQuerysetEqual(self.filterset(params, self.queryset).qs, self.queryset.filter(name__in=names))
-
-    def test_vid(self):
-        vids = list(VLAN.objects.all().values_list("vid", flat=True)[:3])
-        params = {"vid": vids}
-        self.assertQuerysetEqual(self.filterset(params, self.queryset).qs, self.queryset.filter(vid__in=vids))
-
     def test_location(self):
         params = {"location": [self.locations[0].pk, self.locations[1].pk]}
         self.assertQuerysetEqual(
@@ -1181,31 +1131,6 @@ class VLANTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilter
             self.queryset.filter(locations__name__in=params["locations"]).distinct(),
         )
 
-    def test_vlan_group(self):
-        groups = list(VLANGroup.objects.filter(vlans__isnull=False).distinct())[:2]
-        filter_params = [{"vlan_group": [groups[0].pk, groups[1].pk]}, {"vlan_group": [groups[0].pk, groups[1].name]}]
-        for params in filter_params:
-            self.assertQuerysetEqualAndNotEmpty(
-                self.filterset(params, self.queryset).qs, self.queryset.filter(vlan_group__in=groups)
-            )
-
-    def test_role(self):
-        roles = Role.objects.get_for_model(VLAN)[:2]
-        params = {"role": [roles[0].pk, roles[1].name]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs, self.queryset.filter(role__in=[roles[0], roles[1]])
-        )
-
-    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].id]}
-        self.assertQuerysetEqual(self.filterset(params, self.queryset).qs, self.queryset.filter(status__in=statuses))
-
-    def test_search(self):
-        value = self.queryset.values_list("pk", flat=True)[0]
-        params = {"q": value}
-        self.assertEqual(self.filterset(params, self.queryset).qs.values_list("pk", flat=True)[0], value)
-
     def test_available_on_device(self):
         manufacturer = Manufacturer.objects.first()
         devicetype = DeviceType.objects.create(manufacturer=manufacturer, model="Device Type 1")
@@ -1361,8 +1286,3 @@ class ServiceTestCase(FilterTestCases.FilterTestCase):
     def test_ports(self):
         params = {"ports": "1001"}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
-
-    def test_search(self):
-        value = self.queryset.values_list("pk", flat=True)[0]
-        params = {"q": value}
-        self.assertEqual(self.filterset(params, self.queryset).qs.values_list("pk", flat=True)[0], value)

nautobot/ipam/tests/test_forms.py

@@ -1,7 +1,5 @@
 """Test IPAM forms."""
 
-from __future__ import annotations  # python 3.8
-
 from django.forms import Form
 from django.test import TestCase
 

nautobot/ipam/tests/test_models.py

@@ -416,10 +416,13 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
 
     def test_parent_exists_after_model_clean(self):
         prefix = Prefix(
-            prefix="101.102.0.2/26", status=self.status, namespace=self.namespace, type=PrefixTypeChoices.TYPE_CONTAINER
+            prefix="101.102.0.128/26",
+            status=self.status,
+            namespace=self.namespace,
+            type=PrefixTypeChoices.TYPE_CONTAINER,
         )
         prefix.clean()
-        self.assertEqual(prefix.parent, self.child1)
+        self.assertEqual(prefix.parent, self.root)
 
     def test_reparent_subnets_and_reparent_ips_call(self):
         """Assert reparent_subnets and reparent_ips are only called if there is an update to either of network, namespace or prefix_length"""
@@ -510,51 +513,68 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
         """Test the various ways of creating a Prefix all result in correctly populated fields."""
         with self.subTest("Creation with a prefix and status"):
             prefix = Prefix(prefix="192.0.3.0/24", status=self.status)
-            prefix.save()
-            self.assertEqual(prefix.network, "192.0.3.0")
-            self.assertEqual(prefix.broadcast, "192.0.3.255")
-            self.assertEqual(prefix.prefix_length, 24)
-            self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
-            # parent field is tested exhaustively below
-            self.assertEqual(prefix.ip_version, 4)
-            self.assertEqual(prefix.namespace, get_default_namespace())  # default value
+            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
+                method()
+                self.assertEqual(prefix.network, "192.0.3.0")
+                self.assertEqual(prefix.broadcast, "192.0.3.255")
+                self.assertEqual(prefix.prefix_length, 24)
+                self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
+                # parent field is tested exhaustively below
+                self.assertEqual(prefix.ip_version, 4)
+                self.assertEqual(prefix.namespace, get_default_namespace())  # default value
+
+        with self.subTest("Creation with a network and prefix_length"):
+            prefix = Prefix(network="192.0.4.0", prefix_length=24, status=self.status)
+            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
+                method()
+                self.assertEqual(prefix.network, "192.0.4.0")
+                self.assertEqual(prefix.broadcast, "192.0.4.255")
+                self.assertEqual(prefix.prefix_length, 24)
+                self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
+                # parent field is tested exhaustively below
+                self.assertEqual(prefix.ip_version, 4)
+                self.assertEqual(prefix.namespace, get_default_namespace())  # default value
+                self.assertEqual(prefix.prefix, netaddr.IPNetwork("192.0.4.0/24"))
 
         with self.subTest("Creation with a network, broadcast, and prefix_length"):
-            prefix = Prefix(network="192.0.4.0", broadcast="192.0.4.255", prefix_length=24, status=self.status)
-            prefix.save()
-            self.assertEqual(prefix.network, "192.0.4.0")
-            self.assertEqual(prefix.broadcast, "192.0.4.255")
-            self.assertEqual(prefix.prefix_length, 24)
-            self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
-            # parent field is tested exhaustively below
-            self.assertEqual(prefix.ip_version, 4)
-            self.assertEqual(prefix.namespace, get_default_namespace())  # default value
-            self.assertEqual(prefix.prefix, netaddr.IPNetwork("192.0.4.0/24"))
-
-        with self.subTest("Creation with conflicting values - prefix takes precedence"):
+            prefix = Prefix(network="192.0.5.0", broadcast="192.0.5.255", prefix_length=24, status=self.status)
+            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
+                method()
+                self.assertEqual(prefix.network, "192.0.5.0")
+                self.assertEqual(prefix.broadcast, "192.0.5.255")
+                self.assertEqual(prefix.prefix_length, 24)
+                self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
+                # parent field is tested exhaustively below
+                self.assertEqual(prefix.ip_version, 4)
+                self.assertEqual(prefix.namespace, get_default_namespace())  # default value
+                self.assertEqual(prefix.prefix, netaddr.IPNetwork("192.0.5.0/24"))
+
+        with self.subTest("With conflicting values - prefix overrules network/broadcast/prefix_length/ip_version"):
             prefix = Prefix(
-                prefix="192.0.5.0/24",
+                prefix="192.0.6.0/24",
                 status=self.status,
                 network="1.1.1.1",
                 broadcast="2.2.2.2",
                 prefix_length=27,
                 ip_version=6,
             )
-            prefix.save()
-            self.assertEqual(prefix.network, "192.0.5.0")
-            self.assertEqual(prefix.broadcast, "192.0.5.255")
-            self.assertEqual(prefix.prefix_length, 24)
-            self.assertEqual(prefix.ip_version, 4)
-
-        with self.subTest("Creation with conflicting values - network and prefix_length take precedence"):
+            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
+                method()
+                self.assertEqual(prefix.network, "192.0.6.0")
+                self.assertEqual(prefix.broadcast, "192.0.6.255")
+                self.assertEqual(prefix.prefix_length, 24)
+                self.assertEqual(prefix.ip_version, 4)
+
+        with self.subTest("With conflicting values - network/prefix_length overrule broadcast/ip_version"):
             prefix = Prefix(
-                status=self.status, network="192.0.6.0", prefix_length=24, broadcast="192.0.6.127", ip_version=6
+                status=self.status, network="192.0.7.0", prefix_length=24, broadcast="192.0.7.127", ip_version=6
             )
-            prefix.save()
-            self.assertEqual(prefix.network, "192.0.6.0")
-            self.assertEqual(prefix.broadcast, "192.0.6.255")
-            self.assertEqual(prefix.prefix_length, 24)
-            self.assertEqual(prefix.ip_version, 4)
+            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
+                method()
+                self.assertEqual(prefix.network, "192.0.7.0")
+                self.assertEqual(prefix.broadcast, "192.0.7.255")
+                self.assertEqual(prefix.prefix_length, 24)
+                self.assertEqual(prefix.ip_version, 4)
 
     def test_tree_methods(self):
         """Test the various tree methods work as expected."""

nautobot/ipam/tests/test_views.py

@@ -1054,6 +1054,9 @@ class VLANGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
     def get_deletable_object(self):
         return VLANGroup.objects.create(name="TEST DELETE ME")
 
+    def get_deletable_object_pks(self):
+        return [VLANGroup.objects.create(name="TEST DELETE ME").pk]
+
 
 class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = VLAN