nautobot 2.0.0a3__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/ipam/tests/test_ordering.py

@@ -34,7 +34,7 @@ class PrefixOrderingTestCase(OrderingTestBase):
 class IPAddressOrderingTestCase(OrderingTestBase):
     def test_address_vrf_ordering(self):
         """
-        This function tests IPAddress ordering (host, then prefix_length)
+        This function tests IPAddress ordering (host, then mask_length)
         """
-        addresses = sorted(IPAddress.objects.all(), key=attrgetter("address.network.packed", "prefix_length"))
+        addresses = sorted(IPAddress.objects.all(), key=attrgetter("address.network.packed", "mask_length"))
         self._compare(IPAddress.objects.all(), addresses)

nautobot/ipam/tests/test_querysets.py

@@ -5,44 +5,47 @@ import netaddr
 from django.db import connection
 
 from nautobot.core.testing import TestCase
+from nautobot.extras.models import Status
 from nautobot.ipam.models import Prefix, IPAddress, Namespace
 
 
-@skip
 class IPAddressQuerySet(TestCase):
     queryset = IPAddress.objects.all()
 
     @classmethod
     def setUpTestData(cls):
         cls.queryset.delete()
+        cls.prefix_status = Status.objects.get_for_model(Prefix).first()
+        cls.ipaddr_status = Status.objects.get_for_model(IPAddress).first()
         cls.namespace = Namespace.objects.first()
-        cls.prefix4 = Prefix.objects.create(prefix="10.0.0.0/8", namespace=cls.namespace)
-        cls.prefix6 = Prefix.objects.create(prefix="2001:db8::/64", namespace=cls.namespace)
-
+        cls.namespace2 = Namespace.objects.create(name="Namespace 2")
+        cls.prefix4 = Prefix.objects.create(prefix="10.0.0.0/8", namespace=cls.namespace, status=cls.prefix_status)
+        cls.prefix4_2 = Prefix.objects.create(prefix="10.0.0.0/8", namespace=cls.namespace2, status=cls.prefix_status)
+        cls.prefix6 = Prefix.objects.create(prefix="2001:db8::/64", namespace=cls.namespace, status=cls.prefix_status)
         cls.ips = {
             "10.0.0.1/24": IPAddress.objects.create(
-                address="10.0.0.1/24", namespace=cls.namespace, vrf=None, tenant=None
+                address="10.0.0.1/24", namespace=cls.namespace, tenant=None, status=cls.ipaddr_status
             ),
             "10.0.0.1/25": IPAddress.objects.create(
-                address="10.0.0.1/25", namespace=cls.namespace, vrf=None, tenant=None
+                address="10.0.0.1/25", namespace=cls.namespace2, tenant=None, status=cls.ipaddr_status
             ),
             "10.0.0.2/24": IPAddress.objects.create(
-                address="10.0.0.2/24", namespace=cls.namespace, vrf=None, tenant=None
+                address="10.0.0.2/24", namespace=cls.namespace, tenant=None, status=cls.ipaddr_status
             ),
             "10.0.0.3/24": IPAddress.objects.create(
-                address="10.0.0.3/24", namespace=cls.namespace, vrf=None, tenant=None
+                address="10.0.0.3/24", namespace=cls.namespace, tenant=None, status=cls.ipaddr_status
             ),
             "10.0.0.4/24": IPAddress.objects.create(
-                address="10.0.0.4/24", namespace=cls.namespace, vrf=None, tenant=None
+                address="10.0.0.4/24", namespace=cls.namespace, tenant=None, status=cls.ipaddr_status
             ),
             "2001:db8::1/64": IPAddress.objects.create(
-                address="2001:db8::1/64", namespace=cls.namespace, vrf=None, tenant=None
+                address="2001:db8::1/64", namespace=cls.namespace, tenant=None, status=cls.ipaddr_status
             ),
             "2001:db8::2/64": IPAddress.objects.create(
-                address="2001:db8::2/64", namespace=cls.namespace, vrf=None, tenant=None
+                address="2001:db8::2/64", namespace=cls.namespace, tenant=None, status=cls.ipaddr_status
             ),
             "2001:db8::3/64": IPAddress.objects.create(
-                address="2001:db8::3/64", namespace=cls.namespace, vrf=None, tenant=None
+                address="2001:db8::3/64", namespace=cls.namespace, tenant=None, status=cls.ipaddr_status
             ),
         }
 
@@ -249,8 +252,10 @@ class IPAddressQuerySet(TestCase):
             self.ips.values(),
         )
 
-        Prefix.objects.create(prefix="192.168.0.0/24", namespace=self.namespace)
-        extra_ip = IPAddress.objects.create(address="192.168.0.1/24", namespace=self.namespace, vrf=None, tenant=None)
+        Prefix.objects.create(prefix="192.168.0.0/24", namespace=self.namespace, status=self.prefix_status)
+        extra_ip = IPAddress.objects.create(
+            address="192.168.0.1/24", namespace=self.namespace, tenant=None, status=self.ipaddr_status
+        )
         self.assertQuerysetEqualAndNotEmpty(
             IPAddress.objects.filter(host__net_in=["192.168.0.0/31"]),
             [extra_ip],
@@ -450,6 +455,20 @@ class IPAddressQuerySet(TestCase):
             [instance for ip, instance in self.ips.items() if re.match(r"2001(.*)1", ip)],
         )
 
+    def test_get_closest_parent(self):
+        # create prefixes with /24 through /32 lengths
+        for i in range(24, 33):
+            Prefix.objects.create(prefix=f"10.0.0.0/{i}", namespace=self.namespace, status=self.prefix_status)
+
+        for ip in self.ips.values():
+            with self.subTest(ip=ip):
+                self.assertEqual(
+                    Prefix.objects.get_closest_parent(ip.host, namespace=self.namespace),
+                    Prefix.objects.filter(network__lte=ip.host, broadcast__gte=ip.host, namespace=self.namespace)
+                    .order_by("-prefix_length")
+                    .first(),
+                )
+
 
 @skip
 class PrefixQuerysetTestCase(TestCase):
@@ -462,19 +481,20 @@ class PrefixQuerysetTestCase(TestCase):
         cls.queryset.update(parent=None)
         cls.queryset.delete()
 
-        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.0.0/16"))
+        status = Status.objects.get_for_model(Prefix).first()
+        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.0.0/16"), status=status)
 
-        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.1.0/24"))
-        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.2.0/24"))
-        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.3.0/24"))
+        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.1.0/24"), status=status)
+        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.2.0/24"), status=status)
+        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.3.0/24"), status=status)
 
-        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.3.192/28"))
-        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.3.208/28"))
-        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.3.224/28"))
+        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.3.192/28"), status=status)
+        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.3.208/28"), status=status)
+        Prefix.objects.create(prefix=netaddr.IPNetwork("192.168.3.224/28"), status=status)
 
-        Prefix.objects.create(prefix=netaddr.IPNetwork("fd78:da4f:e596:c217::/64"))
-        Prefix.objects.create(prefix=netaddr.IPNetwork("fd78:da4f:e596:c217::/120"))
-        Prefix.objects.create(prefix=netaddr.IPNetwork("fd78:da4f:e596:c217::/122"))
+        Prefix.objects.create(prefix=netaddr.IPNetwork("fd78:da4f:e596:c217::/64"), status=status)
+        Prefix.objects.create(prefix=netaddr.IPNetwork("fd78:da4f:e596:c217::/120"), status=status)
+        Prefix.objects.create(prefix=netaddr.IPNetwork("fd78:da4f:e596:c217::/122"), status=status)
 
     def test_net_equals(self):
         self.assertEqual(self.queryset.net_equals(netaddr.IPNetwork("192.168.0.0/16")).count(), 1)

nautobot/ipam/tests/test_views.py

@@ -1,12 +1,11 @@
 import datetime
-from unittest import skip
 
 from netaddr import IPNetwork
 from django.contrib.contenttypes.models import ContentType
 from django.test import override_settings
 from django.utils.timezone import make_aware
 
-from nautobot.core.testing import ViewTestCases
+from nautobot.core.testing import post_data, ViewTestCases
 from nautobot.core.testing.utils import extract_page_body
 from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Manufacturer
 from nautobot.extras.choices import CustomFieldTypeChoices
@@ -14,6 +13,7 @@ from nautobot.extras.models import CustomField, Role, Status, Tag
 from nautobot.ipam.choices import ServiceProtocolChoices
 from nautobot.ipam.models import (
     IPAddress,
+    Namespace,
     Prefix,
     RIR,
     RouteTarget,
@@ -23,18 +23,20 @@ from nautobot.ipam.models import (
     VRF,
 )
 from nautobot.tenancy.models import Tenant
+from nautobot.users.models import ObjectPermission
 
 
-@skip("Needs to be updated for Namespaces")
 class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = VRF
 
     @classmethod
     def setUpTestData(cls):
         tenants = Tenant.objects.all()[:2]
+        namespace = Namespace.objects.get(name="Global")
 
         cls.form_data = {
             "name": "VRF X",
+            "namespace": namespace.pk,
             "rd": "65000:999",
             "tenant": tenants[0].pk,
             "description": "A new VRF",
@@ -42,10 +44,10 @@ class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
         cls.csv_data = (
-            "name",
-            "VRF 4",
-            "VRF 5",
-            "VRF 6",
+            "name,rd,namespace",
+            f"VRF 4,abc123,{namespace.name}",
+            f"VRF 5,xyz246,{namespace.name}",
+            f"VRF 6,,{namespace.name}",
         )
 
         cls.bulk_edit_data = {
@@ -105,13 +107,13 @@ class RIRTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
         RIR.objects.create(name="RIR XYZ")
 
 
-@skip("Needs to be updated for Namespaces")
 class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.ListObjectsViewTestCase):
     model = Prefix
 
     @classmethod
     def setUpTestData(cls):
         rir = RIR.objects.first()
+        namespace = Namespace.objects.get(name="Global")
 
         locations = Location.objects.filter(location_type=LocationType.objects.get(name="Campus"))[:2]
         vrfs = VRF.objects.all()[:2]
@@ -122,6 +124,7 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
 
         cls.form_data = {
             "prefix": IPNetwork("192.0.2.0/24"),
+            "namespace": namespace.pk,
             "location": locations[1].pk,
             "vrf": vrfs[1].pk,
             "tenant": None,
@@ -136,10 +139,10 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
         }
 
         cls.csv_data = (
-            "vrf,prefix,status,rir",
-            f"{vrfs[0].name},10.4.0.0/16,{statuses[0].name},{rir.name}",
-            f"{vrfs[0].name},10.5.0.0/16,{statuses[0].name},{rir.name}",
-            f"{vrfs[0].name},10.6.0.0/16,{statuses[1].name},{rir.name}",
+            "vrf,prefix,status,rir,namespace",
+            f"{vrfs[0].name},10.4.0.0/16,{statuses[0].name},{rir.name},{namespace.name}",
+            f"{vrfs[0].name},10.5.0.0/16,{statuses[0].name},{rir.name},{namespace.name}",
+            f"{vrfs[0].name},10.6.0.0/16,{statuses[1].name},{rir.name},{namespace.name}",
         )
 
         cls.bulk_edit_data = {
@@ -176,20 +179,21 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
             self.assertNotIn(prefix.get_absolute_url(), content, msg=content)
 
 
-@skip("Needs to be updated for Namespaces")
 class IPAddressTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = IPAddress
 
     @classmethod
     def setUpTestData(cls):
-        vrfs = VRF.objects.all()[:2]
-
+        namespace = Namespace.objects.get(name="Global")
         statuses = Status.objects.get_for_model(IPAddress)
-
         roles = Role.objects.get_for_model(IPAddress)
+        parent, _ = Prefix.objects.get_or_create(
+            prefix="192.0.2.0/24",
+            defaults={"namespace": namespace, "status": statuses[0], "type": "network"},
+        )
 
         cls.form_data = {
-            "vrf": vrfs[1].pk,
+            "namespace": namespace.pk,
             "address": IPNetwork("192.0.2.99/24"),
             "tenant": None,
             "status": statuses[1].pk,
@@ -201,14 +205,13 @@ class IPAddressTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
         cls.csv_data = (
-            "vrf,address,status",
-            f"{vrfs[0].name},192.0.2.4/24,{statuses[0].name}",
-            f"{vrfs[0].name},192.0.2.5/24,{statuses[0].name}",
-            f"{vrfs[0].name},192.0.2.6/24,{statuses[0].name}",
+            "address,status,parent",
+            f"192.0.2.4/24,{statuses[0].name},{parent.natural_key_slug}",
+            f"192.0.2.5/24,{statuses[0].name},{parent.natural_key_slug}",
+            f"192.0.2.6/24,{statuses[0].name},{parent.natural_key_slug}",
         )
 
         cls.bulk_edit_data = {
-            "vrf": vrfs[1].pk,
             "tenant": None,
             "status": statuses[1].pk,
             "role": roles[1].pk,
@@ -216,6 +219,47 @@ class IPAddressTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "description": "New description",
         }
 
+    def test_edit_object_with_permission(self):
+        instance = self._get_queryset().first()
+        form_data = self.form_data.copy()
+        form_data["address"] = instance.address  # Host address is not modifiable
+        self.form_data = form_data
+        super().test_edit_object_with_permission()
+
+    # TODO Revise these tests by borrowing the pattern that already exists in nautobot.core.testing.api
+    # where by default the same data is used for both create and edit tests, but you have the option to override one or the other if needed.
+    def test_edit_object_with_constrained_permission(self):
+        instance = self._get_queryset().first()
+        form_data = self.form_data.copy()
+        form_data["address"] = instance.address  # Host address is not modifiable
+        self.form_data = form_data
+        super().test_edit_object_with_constrained_permission()
+
+    def test_host_non_modifiable_once_set(self):
+        """`host` field of the IPAddress should not be modifiable once the IPAddress is created."""
+        ip_address_1 = self._get_queryset().first()
+        ip_address_2 = self._get_queryset().last()
+
+        # Assign model-level permission
+        obj_perm = ObjectPermission(name="Test permission", actions=["change"])
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+        # Try GET with model-level permission
+        self.assertHttpStatus(self.client.get(self._get_url("edit", ip_address_1)), 200)
+
+        # Try POST with model-level permission, with a different address from that of ip_address_1
+        # a.k.a Try to modify the host field of ip_address_1
+        self.form_data["address"] = ip_address_2.address
+        request = {
+            "path": self._get_url("edit", ip_address_1),
+            "data": post_data(self.form_data),
+        }
+        response = self.client.post(**request)
+        self.assertEqual(200, response.status_code)
+        self.assertIn("Host address cannot be changed once created", str(response.content))
+
 
 class VLANGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
     model = VLANGroup
@@ -343,7 +387,10 @@ class ServiceTestCase(
         manufacturer = Manufacturer.objects.first()
         devicetype = DeviceType.objects.create(manufacturer=manufacturer, model="Device Type 1")
         devicerole = Role.objects.get_for_model(Device).first()
-        device = Device.objects.create(name="Device 1", location=location, device_type=devicetype, role=devicerole)
+        devicestatus = Status.objects.get_for_model(Device).first()
+        device = Device.objects.create(
+            name="Device 1", location=location, device_type=devicetype, role=devicerole, status=devicestatus
+        )
 
         Service.objects.bulk_create(
             [
@@ -381,9 +428,9 @@ class ServiceTestCase(
 
         cls.csv_data = (
             "device,name,protocol,ports,description",
-            "Device 1,Service 1,tcp,1,First service",
-            "Device 1,Service 2,tcp,2,Second service",
-            "Device 1,Service 3,udp,3,Third service",
+            f"{device.natural_key_slug},Service 1,tcp,1,First service",
+            f"{device.natural_key_slug},Service 2,tcp,2,Second service",
+            f'{device.natural_key_slug},Service 3,udp,"3,4,5",Third service',
         )
 
         cls.bulk_edit_data = {

nautobot/ipam/urls.py

@@ -106,6 +106,22 @@ urlpatterns = [
         name="rir_notes",
         kwargs={"model": RIR},
     ),
+    # Namespaces
+    path(
+        "namespaces/<uuid:pk>/ip-addresses/",
+        views.NamespaceIPAddressesView.as_view(),
+        name="namespace_ipaddresses",
+    ),
+    path(
+        "namespaces/<uuid:pk>/prefixes/",
+        views.NamespacePrefixesView.as_view(),
+        name="namespace_prefixes",
+    ),
+    path(
+        "namespaces/<uuid:pk>/vrfs/",
+        views.NamespaceVRFsView.as_view(),
+        name="namespace_vrfs",
+    ),
     # Prefixes
     path("prefixes/", views.PrefixListView.as_view(), name="prefix_list"),
     path("prefixes/add/", views.PrefixEditView.as_view(), name="prefix_add"),

nautobot/ipam/{utils.py → utils/__init__.py}

@@ -1,7 +1,7 @@
 import netaddr
 
-from .constants import VLAN_VID_MAX, VLAN_VID_MIN
-from .models import Prefix, VLAN
+from nautobot.ipam.constants import VLAN_VID_MAX, VLAN_VID_MIN
+from nautobot.ipam.models import Prefix, VLAN
 
 
 def add_available_prefixes(parent, prefix_list):