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

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/tests/test_api.py

@@ -2,7 +2,6 @@ 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
@@ -507,8 +506,7 @@ 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)
-        self.assertEqual(response.data["prefix_length"], "This field must be an integer.")
+        self.assertIn("prefix_length", response.data[0])
 
     def test_create_multiple_available_prefixes(self):
         """
@@ -573,126 +571,6 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         self.assertIn("prefixcf", response.data[0]["custom_fields"])
         self.assertEqual("value 1", response.data[0]["custom_fields"]["prefixcf"])
 
-    def test_create_available_prefixes_with_permissions_constraint(self):
-        # Prepare prefix and permissions
-        prefix = Prefix.objects.create(
-            prefix="10.2.3.0/24",
-            type=choices.PrefixTypeChoices.TYPE_POOL,
-            namespace=self.namespace,
-            status=self.status,
-            description="This is the Prefix created for whole network.",
-        )
-        url = reverse("ipam-api:prefix-available-prefixes", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix")
-        self.add_permissions(
-            "ipam.add_prefix", constraints={"description__startswith": "This is the Prefix created for"}
-        )
-
-        # Test invalid request
-        data = {
-            "prefix_length": 26,
-            "status": self.status.pk,
-        }
-        invalid_data_list = [
-            data,
-            {**data, "description": ""},
-            {**data, "description": "Some description"},
-            {**data, "description": "Some description. This is the IP created for"},
-        ]
-
-        for invalid_data in invalid_data_list:
-            with self.subTest(case=invalid_data):
-                response = self.client.post(url, invalid_data, format="json", **self.header)
-                self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
-                self.assertIn("detail", response.data)
-                self.assertEqual(response.data["detail"], "You do not have permission to perform this action.")
-
-                # Verify that no prefixes were created (the entire prefix is still available)
-                response = self.client.get(url, **self.header)
-                self.assertHttpStatus(response, status.HTTP_200_OK)
-                self.assertEqual(len(response.data), 1)
-                self.assertEqual(response.data[0]["prefix"], prefix.cidr_str)
-
-        # Test valid request
-        valid_data = {
-            "prefix_length": 26,
-            "status": self.status.pk,
-            "description": "This is the Prefix created for my local network",
-        }
-        response = self.client.post(url, valid_data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(response.data["prefix"], "10.2.3.0/26")
-
-        # Verify that prefix is created
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 2)
-        self.assertEqual(response.data[0]["prefix"], "10.2.3.64/26")
-        self.assertEqual(response.data[1]["prefix"], "10.2.3.128/25")
-
-    def test_create_multiple_available_prefixes_with_permissions_constraint(self):
-        # Prepare prefix and permissions
-        prefix = Prefix.objects.create(
-            prefix="10.2.3.0/24",
-            type=choices.PrefixTypeChoices.TYPE_POOL,
-            namespace=self.namespace,
-            status=self.status,
-            description="This is the Prefix created for whole network.",
-        )
-        url = reverse("ipam-api:prefix-available-prefixes", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix")
-        self.add_permissions(
-            "ipam.add_prefix", constraints={"description__startswith": "This is the Prefix created for"}
-        )
-
-        # Test invalid request
-        data = [
-            {
-                "prefix_length": 26,
-                "status": self.status.pk,
-                "description": "This is the Prefix created for my local network",
-            },
-            {
-                "prefix_length": 26,
-                "status": self.status.pk,
-            },
-        ]
-        response = self.client.post(url, data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
-        self.assertIn("detail", response.data)
-        self.assertEqual(response.data["detail"], "You do not have permission to perform this action.")
-
-        # Verify that no prefixes were created (the entire prefix is still available)
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        self.assertEqual(response.data[0]["prefix"], prefix.cidr_str)
-
-        # Test valid request
-        data = [
-            {
-                "prefix_length": 26,
-                "status": self.status.pk,
-                "description": "This is the Prefix created for my local network",
-            },
-            {
-                "prefix_length": 26,
-                "status": self.status.pk,
-                "description": "This is the Prefix created for my guest house network",
-            },
-        ]
-        response = self.client.post(url, data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(len(response.data), 2)
-        self.assertEqual(response.data[0]["prefix"], "10.2.3.0/26")
-        self.assertEqual(response.data[1]["prefix"], "10.2.3.64/26")
-
-        # Verify that prefixes were created
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        self.assertEqual(response.data[0]["prefix"], "10.2.3.128/25")
-
     def test_list_available_ips(self):
         """
         Test retrieval of all available IP addresses within a parent prefix.
@@ -716,76 +594,9 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         response = self.client.get(url, **self.header)
         self.assertEqual(len(response.data), 6)  # 8 - 2 because prefix.type = network
 
-    def test_list_available_ips_calculate_child_ips(self):
-        """
-        Test retrieval of all available IP addresses when child IP's exists.
-        """
-        ip_status = Status.objects.get_for_model(IPAddress).first()
-        prefix = Prefix.objects.create(
-            prefix="192.0.3.0/29",
-            type=choices.PrefixTypeChoices.TYPE_POOL,
-            namespace=self.namespace,
-            status=self.status,
-        )
-        Prefix.objects.create(
-            prefix="192.0.3.0/30",
-            type=choices.PrefixTypeChoices.TYPE_POOL,
-            namespace=self.namespace,
-            status=self.status,
-        )
-        IPAddress.objects.create(
-            address="192.0.3.1/30",
-            status=ip_status,
-            namespace=self.namespace,
-        )
-
-        url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.view_ipaddress")
-
-        # Retrieve all available IPs
-        response = self.client.get(url, **self.header)
-        self.assertEqual(len(response.data), 7)  # 7 because prefix.type = pool got 8 IP's minus one children IP
-
-    def test_create_single_available_ip_calculate_child_ips(self):
-        """
-        Test creating a single IP when child IP's exists.
-        """
-        ip_status = Status.objects.get_for_model(IPAddress).first()
-        prefix = Prefix.objects.create(
-            prefix="192.0.4.0/31",
-            namespace=self.namespace,
-            type=choices.PrefixTypeChoices.TYPE_NETWORK,
-            status=self.status,
-        )
-        Prefix.objects.create(
-            prefix="192.0.4.0/32",
-            type=choices.PrefixTypeChoices.TYPE_POOL,
-            namespace=self.namespace,
-            status=self.status,
-        )
-        IPAddress.objects.create(
-            address="192.0.4.0/32",
-            status=ip_status,
-            namespace=self.namespace,
-        )
-        url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.add_ipaddress", "extras.view_status")
-
-        data = {
-            "status": self.status.pk,
-        }
-
-        response = self.client.post(url, data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(str(response.data["parent"]["url"]), self.absolute_api_url(prefix))
-
-        response = self.client.post(url, data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-        self.assertIn("detail", response.data)
-
     def test_create_single_available_ip(self):
         """
-        Test creating single IP will return 204 No content when pool is fully filled.
+        Test retrieval of the first available IP address within a parent prefix.
         """
         prefix = Prefix.objects.create(
             prefix="192.0.2.0/29",
@@ -853,116 +664,6 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         self.assertIn("ipcf", response.data[0]["custom_fields"])
         self.assertEqual("1", response.data[0]["custom_fields"]["ipcf"])
 
-    def test_create_available_ips_with_permissions_constraint(self):
-        # Prepare prefix and permissions
-        prefix = Prefix.objects.create(
-            prefix="192.168.0.0/30",
-            type=choices.PrefixTypeChoices.TYPE_NETWORK,
-            namespace=self.namespace,
-            status=self.status,
-            description="This is the Prefix created for whole network.",
-        )
-        url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.view_ipaddress")
-        self.add_permissions(
-            "ipam.add_ipaddress", constraints={"description__startswith": "This is the IP created for"}
-        )
-
-        # Test invalid request
-        data = {
-            "status": self.status.pk,
-        }
-        invalid_data_list = [
-            data,
-            {**data, "description": ""},
-            {**data, "description": "Some description"},
-            {**data, "description": "Some description. This is the IP created for"},
-        ]
-
-        for invalid_data in invalid_data_list:
-            with self.subTest(case=invalid_data):
-                response = self.client.post(url, invalid_data, format="json", **self.header)
-                self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
-                self.assertIn("detail", response.data)
-                self.assertEqual(response.data["detail"], "You do not have permission to perform this action.")
-
-                # Verify that no IPs were created (the entire prefix pool is still available)
-                response = self.client.get(url, **self.header)
-                self.assertHttpStatus(response, status.HTTP_200_OK)
-                self.assertEqual(len(response.data), 2)
-
-        # Test valid request
-        valid_data = {
-            "status": self.status.pk,
-            "description": "This is the IP created for my private laptop",
-        }
-        response = self.client.post(url, valid_data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(response.data["address"], "192.168.0.1/30")
-
-        # Verify that IP is created
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        self.assertEqual(response.data[0]["address"], "192.168.0.2/30")
-
-    def test_create_multiple_available_ips_with_permissions_constraint(self):
-        # Prepare prefix and permissions
-        prefix = Prefix.objects.create(
-            prefix="192.168.0.0/30",
-            type=choices.PrefixTypeChoices.TYPE_NETWORK,
-            namespace=self.namespace,
-            status=self.status,
-            description="This is a Prefix created for whole network.",
-        )
-        url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.view_ipaddress")
-        self.add_permissions(
-            "ipam.add_ipaddress", constraints={"description__startswith": "This is the IP created for"}
-        )
-
-        # Test invalid request
-        data = [
-            {
-                "status": self.status.pk,
-            },
-            {
-                "status": self.status.pk,
-                "description": "This is an IP created for my private laptop",
-            },
-        ]
-        response = self.client.post(url, data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
-        self.assertIn("detail", response.data)
-        self.assertEqual(response.data["detail"], "You do not have permission to perform this action.")
-
-        # Verify that no IPs were created (the entire prefix pool is still available)
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 2)
-
-        # Test valid request
-        valid_data = [
-            {
-                "status": self.status.pk,
-                "description": "This is the IP created for my private laptop",
-            },
-            {
-                "status": self.status.pk,
-                "description": "This is the IP created for my gaming laptop",
-            },
-        ]
-        response = self.client.post(url, valid_data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(len(response.data), 2)
-        self.assertEqual(response.data[0]["address"], "192.168.0.1/30")
-        self.assertEqual(response.data[1]["address"], "192.168.0.2/30")
-
-        # Verify that IPs are created
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 0)
-
 
 class PrefixLocationAssignmentTest(APIViewTestCases.APIViewTestCase):
     model = PrefixLocationAssignment
@@ -1321,7 +1022,7 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
         Test retrieval of all available VLAN IDs within a VLANGroup.
         """
         url = reverse("ipam-api:vlangroup-available-vlans", kwargs={"pk": self.vlan_group.pk})
-        self.add_permissions("ipam.view_vlangroup", "ipam.view_vlan")
+        self.add_permissions("ipam.view_vlangroup")
 
         # Retrieve all available VLAN IDs
         response = self.client.get(url, **self.header)
@@ -1338,7 +1039,6 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
         url = reverse("ipam-api:vlangroup-available-vlans", kwargs={"pk": self.vlan_group.pk})
         self.add_permissions(
             "ipam.view_vlangroup",
-            "ipam.view_vlan",
             "ipam.add_vlan",
         )
 
@@ -1380,7 +1080,6 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
         url = reverse("ipam-api:vlangroup-available-vlans", kwargs={"pk": self.vlan_group.pk})
         self.add_permissions(
             "ipam.view_vlangroup",
-            "ipam.view_vlan",
             "ipam.add_vlan",
         )
 
@@ -1427,7 +1126,6 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
         url = reverse("ipam-api:vlangroup-available-vlans", kwargs={"pk": self.vlan_group.pk})
         self.add_permissions(
             "ipam.view_vlangroup",
-            "ipam.view_vlan",
             "ipam.add_vlan",
         )
 
@@ -1457,7 +1155,6 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
         url = reverse("ipam-api:vlangroup-available-vlans", kwargs={"pk": self.vlan_group.pk})
         self.add_permissions(
             "ipam.view_vlangroup",
-            "ipam.view_vlan",
             "ipam.add_vlan",
         )
 
@@ -1484,114 +1181,6 @@ 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})
-        self.add_permissions(
-            "ipam.view_vlangroup",
-            "ipam.view_vlan",
-        )
-        self.add_permissions("ipam.add_vlan", constraints={"description__startswith": "This is the VLAN created for"})
-
-        data = {"name": "VLAN_6", "status": self.default_status.pk, "vid": 6}
-        invalid_data_list = [
-            data,
-            {**data, "description": ""},
-            {**data, "description": "Some description"},
-            {**data, "description": "Some description. This is the VLAN created for"},
-        ]
-
-        # Test invalid request
-        for invalid_data in invalid_data_list:
-            with self.subTest(case=invalid_data):
-                response = self.client.post(url, data, format="json", **self.header)
-                self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
-                self.assertIn("detail", response.data)
-                self.assertEqual(response.data["detail"], "You do not have permission to perform this action.")
-
-                # Verify that no VLANs were created (number of VLANs is the same as on the beginning of the test)
-                response = self.client.get(url, **self.header)
-                self.assertHttpStatus(response, status.HTTP_200_OK)
-                self.assertEqual(len(response.data["results"]), len(self.unused_vids))
-
-        # Test valid request
-        valid_data = {
-            "name": "VLAN_6",
-            "status": self.default_status.pk,
-            "vid": 6,
-            "description": "This is the VLAN created for home automation.",
-        }
-        response = self.client.post(url, valid_data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(response.data["results"]["name"], valid_data["name"])
-
-        # Verify that VLAN is created
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(
-            len(response.data["results"]), len(self.unused_vids) - 1
-        )  # initial unsued vids minus one created
-
-    def test_create_multiple_available_vlans_with_permissions_constraint(self):
-        url = reverse("ipam-api:vlangroup-available-vlans", kwargs={"pk": self.vlan_group.pk})
-        self.add_permissions(
-            "ipam.view_vlangroup",
-            "ipam.view_vlan",
-        )
-        self.add_permissions("ipam.add_vlan", constraints={"description__startswith": "This is the VLAN created for"})
-
-        # Test invalid request
-        data = [
-            {"name": "VLAN_6", "status": self.default_status.pk},
-            {"name": "VLAN_7", "status": self.default_status.pk},
-            {"name": "VLAN_8", "status": self.default_status.pk},
-        ]
-        response = self.client.post(url, data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
-        self.assertIn("detail", response.data)
-        self.assertEqual(response.data["detail"], "You do not have permission to perform this action.")
-
-        # Verify that no VLANs were created (number of VLANs is the same as on the beginning of the test)
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data["results"]), len(self.unused_vids))
-
-        # Test valid request
-        valid_data = [
-            {
-                "name": "VLAN_6",
-                "status": self.default_status.pk,
-                "description": "This is the VLAN created for home automation.",
-            },
-            {
-                "name": "VLAN_7",
-                "status": self.default_status.pk,
-                "description": "This is the VLAN created for IP cameras.",
-            },
-            {"name": "VLAN_8", "status": self.default_status.pk, "description": "This is the VLAN created for guests."},
-        ]
-        response = self.client.post(url, valid_data, format="json", **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(len(response.data["results"]), 3)
-        for i, vlan_data in enumerate(data):
-            self.assertEqual(response.data["results"][i]["name"], vlan_data["name"])
-
-        # Verify that VLANs are created
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(
-            len(response.data["results"]), len(self.unused_vids) - 3
-        )  # initial unsued vids minus three created
 
 
 class VLANTest(APIViewTestCases.APIViewTestCase):
@@ -1714,24 +1303,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,
             },
         ]