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

nautobot/virtualization/models.py

@@ -1,26 +1,19 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import models, transaction
-from django.urls import reverse
-from taggit.managers import TaggableManager
 
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.models import BaseManager
 from nautobot.core.models.fields import NaturalOrderingField
-from nautobot.core.models.generics import BaseModel, OrganizationalModel, PrimaryModel
+from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.models.ordering import naturalize_interface
 from nautobot.core.models.query_functions import CollateAsChar
-from nautobot.core.models.utils import serialize_object, serialize_object_v2
 from nautobot.dcim.models import BaseInterface, Device
 from nautobot.extras.models import (
     ConfigContextModel,
-    CustomFieldModel,
-    ObjectChange,
-    StatusModel,
-    TaggedItem,
+    RoleField,
+    StatusField,
 )
-from nautobot.extras.models.mixins import NotesMixin
-from nautobot.extras.models.roles import RoleModelMixin
 from nautobot.extras.querysets import ConfigContextModelQuerySet
 from nautobot.extras.utils import extras_features
 
@@ -51,23 +44,12 @@ class ClusterType(OrganizationalModel):
     name = models.CharField(max_length=100, unique=True)
     description = models.CharField(max_length=200, blank=True)
 
-    csv_headers = ["name", "description"]
-
     class Meta:
         ordering = ["name"]
 
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("virtualization:clustertype", args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.description,
-        )
-
 
 #
 # Cluster groups
@@ -86,23 +68,12 @@ class ClusterGroup(OrganizationalModel):
     name = models.CharField(max_length=100, unique=True)
     description = models.CharField(max_length=200, blank=True)
 
-    csv_headers = ["name", "description"]
-
     class Meta:
         ordering = ["name"]
 
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("virtualization:clustergroup", args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.description,
-        )
-
 
 #
 # Clusters
@@ -148,7 +119,6 @@ class Cluster(PrimaryModel):
     )
     comments = models.TextField(blank=True)
 
-    csv_headers = ["name", "cluster_type", "cluster_group", "location", "tenant", "comments"]
     clone_fields = [
         "cluster_type",
         "cluster_group",
@@ -162,9 +132,6 @@ class Cluster(PrimaryModel):
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("virtualization:cluster", args=[self.pk])
-
     def clean(self):
         super().clean()
 
@@ -193,16 +160,6 @@ class Cluster(PrimaryModel):
                     }
                 )
 
-    def to_csv(self):
-        return (
-            self.name,
-            self.cluster_type.name,
-            self.cluster_group.name if self.cluster_group else None,
-            self.location.name if self.location else None,
-            self.tenant.name if self.tenant else None,
-            self.comments,
-        )
-
 
 #
 # Virtual machines
@@ -218,7 +175,7 @@ class Cluster(PrimaryModel):
     "statuses",
     "webhooks",
 )
-class VirtualMachine(PrimaryModel, ConfigContextModel, StatusModel, RoleModelMixin):
+class VirtualMachine(PrimaryModel, ConfigContextModel):
     """
     A virtual machine which runs inside a Cluster.
     """
@@ -243,6 +200,8 @@ class VirtualMachine(PrimaryModel, ConfigContextModel, StatusModel, RoleModelMix
         null=True,
     )
     name = models.CharField(max_length=64, db_index=True)
+    status = StatusField(blank=False, null=False)
+    role = RoleField(blank=True, null=True)
     primary_ip4 = models.OneToOneField(
         to="ipam.IPAddress",
         on_delete=models.SET_NULL,
@@ -266,18 +225,6 @@ class VirtualMachine(PrimaryModel, ConfigContextModel, StatusModel, RoleModelMix
 
     objects = BaseManager.from_queryset(ConfigContextModelQuerySet)()
 
-    csv_headers = [
-        "name",
-        "status",
-        "role",
-        "cluster",
-        "tenant",
-        "platform",
-        "vcpus",
-        "memory",
-        "disk",
-        "comments",
-    ]
     clone_fields = [
         "cluster",
         "tenant",
@@ -305,9 +252,6 @@ class VirtualMachine(PrimaryModel, ConfigContextModel, StatusModel, RoleModelMix
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("virtualization:virtualmachine", args=[self.pk])
-
     def validate_unique(self, exclude=None):
         # Check for a duplicate name on a VM assigned to the same Cluster and no Tenant. This is necessary
         # because Django does not consider two NULL fields to be equal, and thus will not trigger a violation
@@ -321,37 +265,33 @@ class VirtualMachine(PrimaryModel, ConfigContextModel, StatusModel, RoleModelMix
 
     def clean(self):
         super().clean()
+        from nautobot.ipam.models import IPAddressToInterface
 
         # Validate primary IP addresses
-        interfaces = self.interfaces.all()
+        vm_interfaces = VMInterface.objects.filter(virtual_machine=self)
         for field in ["primary_ip4", "primary_ip6"]:
             ip = getattr(self, field)
             if ip is not None:
-                if ip.assigned_object in interfaces:
+                if field == "primary_ip4":
+                    if ip.family != 4:
+                        raise ValidationError({f"{field}": f"{ip} is not an IPv4 address."})
+                else:
+                    if ip.family != 6:
+                        raise ValidationError({f"{field}": f"{ip} is not an IPv6 address."})
+                if IPAddressToInterface.objects.filter(ip_address=ip, vm_interface__in=vm_interfaces).exists():
                     pass
-                elif ip.nat_inside is not None and ip.nat_inside.assigned_object in interfaces:
+                elif (
+                    ip.nat_inside is not None
+                    and IPAddressToInterface.objects.filter(
+                        ip_address=ip.nat_inside, vm_interface__in=vm_interfaces
+                    ).exists()
+                ):
                     pass
                 else:
                     raise ValidationError(
-                        {
-                            field: f"The specified IP address ({ip}) is not assigned to this VM.",
-                        }
+                        {f"{field}": f"The specified IP address ({ip}) is not assigned to this virtual machine."}
                     )
 
-    def to_csv(self):
-        return (
-            self.name,
-            self.get_status_display(),
-            self.role.name if self.role else None,
-            self.cluster.name,
-            self.tenant.name if self.tenant else None,
-            self.platform.name if self.platform else None,
-            self.vcpus,
-            self.memory,
-            self.disk,
-            self.comments,
-        )
-
     @property
     def primary_ip(self):
         if get_settings_or_config("PREFER_IPV4") and self.primary_ip4:
@@ -385,7 +325,7 @@ class VirtualMachine(PrimaryModel, ConfigContextModel, StatusModel, RoleModelMix
     "statuses",
     "webhooks",
 )
-class VMInterface(BaseModel, BaseInterface, CustomFieldModel, NotesMixin):
+class VMInterface(PrimaryModel, BaseInterface):
     virtual_machine = models.ForeignKey(
         to="virtualization.VirtualMachine",
         on_delete=models.CASCADE,
@@ -424,20 +364,6 @@ class VMInterface(BaseModel, BaseInterface, CustomFieldModel, NotesMixin):
         blank=True,
         verbose_name="IP Addresses",
     )
-    tags = TaggableManager(through=TaggedItem, related_name="vminterface")
-
-    csv_headers = [
-        "virtual_machine",
-        "name",
-        "enabled",
-        "mac_address",
-        "mtu",
-        "description",
-        "mode",
-        "status",
-        "parent_interface",
-        "bridge",
-    ]
 
     class Meta:
         verbose_name = "VM interface"
@@ -447,33 +373,15 @@ class VMInterface(BaseModel, BaseInterface, CustomFieldModel, NotesMixin):
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("virtualization:vminterface", kwargs={"pk": self.pk})
-
-    def to_csv(self):
-        return (
-            self.virtual_machine.name,
-            self.name,
-            self.enabled,
-            self.mac_address,
-            self.mtu,
-            self.description,
-            self.get_mode_display(),
-            self.get_status_display(),
-            self.parent_interface.name if self.parent_interface else None,
-            self.bridge.name if self.bridge else None,
-        )
-
-    def to_objectchange(self, action):
+    def to_objectchange(self, action, **kwargs):
         # Annotate the parent VirtualMachine
-        return ObjectChange(
-            changed_object=self,
-            object_repr=str(self),
-            action=action,
-            object_data=serialize_object(self),
-            object_data_v2=serialize_object_v2(self),
-            related_object=self.virtual_machine,
-        )
+        try:
+            virtual_machine = self.virtual_machine
+        except VirtualMachine.DoesNotExist:
+            # The parent VirtualMachine has already been deleted
+            virtual_machine = None
+
+        return super().to_objectchange(action, related_object=virtual_machine, **kwargs)
 
     def add_ip_addresses(
         self,

nautobot/virtualization/navigation.py

@@ -1,124 +1,43 @@
-from nautobot.core.apps import NavMenuAddButton, NavMenuGroup, NavMenuItem, NavMenuImportButton, NavMenuTab
+from nautobot.core.apps import NavMenuGroup, NavMenuItem, NavMenuTab
 
 
 menu_items = (
     NavMenuTab(
-        name="Virtualization",
-        weight=400,
+        name="Inventory",
         groups=(
             NavMenuGroup(
-                name="Virtual Machines",
-                weight=100,
+                name="Virtualization",
+                weight=600,
                 items=(
                     NavMenuItem(
-                        link="virtualization:virtualmachine_list",
                         name="Virtual Machines",
                         weight=100,
-                        permissions=[
-                            "virtualization.view_virtualmachine",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="virtualization:virtualmachine_add",
-                                permissions=[
-                                    "virtualization.add_virtualmachine",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="virtualization:virtualmachine_import",
-                                permissions=[
-                                    "virtualization.add_virtualmachine",
-                                ],
-                            ),
-                        ),
+                        link="virtualization:virtualmachine_list",
+                        permissions=["virtualization.view_virtualmachine"],
                     ),
                     NavMenuItem(
-                        link="virtualization:vminterface_list",
-                        name="Interfaces",
+                        name="VM Interfaces",
                         weight=200,
-                        permissions=[
-                            "virtualization.view_vminterface",
-                        ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="virtualization:vminterface_import",
-                                permissions=[
-                                    "virtualization.add_vminterface",
-                                ],
-                            ),
-                        ),
+                        link="virtualization:vminterface_list",
+                        permissions=["virtualization.view_vminterface"],
                     ),
-                ),
-            ),
-            NavMenuGroup(
-                name="Clusters",
-                weight=200,
-                items=(
                     NavMenuItem(
-                        link="virtualization:cluster_list",
                         name="Clusters",
-                        weight=100,
-                        permissions=[
-                            "virtualization.view_cluster",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="virtualization:cluster_add",
-                                permissions=[
-                                    "virtualization.add_cluster",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="virtualization:cluster_import",
-                                permissions=[
-                                    "virtualization.add_cluster",
-                                ],
-                            ),
-                        ),
+                        weight=300,
+                        link="virtualization:cluster_list",
+                        permissions=["virtualization.view_cluster"],
                     ),
                     NavMenuItem(
-                        link="virtualization:clustertype_list",
                         name="Cluster Types",
-                        weight=200,
-                        permissions=[
-                            "virtualization.view_clustertype",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="virtualization:clustertype_add",
-                                permissions=[
-                                    "virtualization.add_clustertype",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="virtualization:clustertype_import",
-                                permissions=[
-                                    "virtualization.add_clustertype",
-                                ],
-                            ),
-                        ),
+                        weight=400,
+                        link="virtualization:clustertype_list",
+                        permissions=["virtualization.view_clustertype"],
                     ),
                     NavMenuItem(
-                        link="virtualization:clustergroup_list",
                         name="Cluster Groups",
-                        weight=300,
-                        permissions=[
-                            "virtualization.view_clustergroup",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="virtualization:clustergroup_add",
-                                permissions=[
-                                    "virtualization.add_clustergroup",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="virtualization:clustergroup_import",
-                                permissions=[
-                                    "virtualization.add_clustergroup",
-                                ],
-                            ),
-                        ),
+                        weight=500,
+                        link="virtualization:clustergroup_list",
+                        permissions=["virtualization.view_clustergroup"],
                     ),
                 ),
             ),

nautobot/virtualization/templates/virtualization/virtualmachine.html

@@ -74,7 +74,7 @@
                                     {% for nat in object.primary_ip4.nat_outside_list.all %}
                                         <li>{{ nat|hyperlinked_object }}</li>
                                     {% endfor %}
-                                </ul>    
+                                </ul>
                             {% endif %}
                         {% else %}
                             <span class="text-muted">&mdash;</span>
@@ -118,6 +118,7 @@
 {% endblock content_left_page %}
 
 {% block content_right_page %}
+        {% include 'panel_table.html' with table=vrf_table heading="Assigned VRFs" %}
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Cluster</strong>

nautobot/virtualization/templates/virtualization/virtualmachine_edit.html

@@ -16,6 +16,12 @@
             {% render_field form.cluster %}
         </div>
     </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>VRF Assignment</strong></div>
+        <div class="panel-body">
+            {% render_field form.vrfs %}
+        </div>
+    </div>
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Management</strong></div>
         <div class="panel-body">

nautobot/virtualization/tests/test_api.py

@@ -25,7 +25,6 @@ class AppTest(APITestCase):
 
 class ClusterTypeTest(APIViewTestCases.APIViewTestCase):
     model = ClusterType
-    brief_fields = ["cluster_count", "display", "id", "name", "url"]
     create_data = [
         {
             "name": "Cluster Type 4",
@@ -53,7 +52,6 @@ class ClusterTypeTest(APIViewTestCases.APIViewTestCase):
 
 class ClusterGroupTest(APIViewTestCases.APIViewTestCase):
     model = ClusterGroup
-    brief_fields = ["cluster_count", "display", "id", "name", "url"]
     create_data = [
         {
             "name": "Cluster Group 4",
@@ -81,7 +79,6 @@ class ClusterGroupTest(APIViewTestCases.APIViewTestCase):
 
 class ClusterTest(APIViewTestCases.APIViewTestCase):
     model = Cluster
-    brief_fields = ["display", "id", "name", "url", "virtualmachine_count"]
     bulk_update_data = {
         "comments": "New comment",
     }
@@ -123,7 +120,6 @@ class ClusterTest(APIViewTestCases.APIViewTestCase):
 
 class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
     model = VirtualMachine
-    brief_fields = ["display", "id", "name", "url"]
     choices_fields = []
 
     @classmethod
@@ -188,9 +184,9 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
             "status": cls.statuses[1].pk,
         }
 
-    def test_config_context_included_by_default_in_list_view(self):
+    def test_config_context_excluded_by_default_in_list_view(self):
         """
-        Check that config context data is included by default in the virtual machines list.
+        Check that config context data is excluded by default in the virtual machines list.
         """
         virtualmachine = VirtualMachine.objects.first()
         reverse_url = reverse("virtualization-api:virtualmachine-list")
@@ -198,17 +194,18 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
         self.add_permissions("virtualization.view_virtualmachine")
 
         response = self.client.get(url, **self.header)
-        self.assertEqual(response.data["results"][0].get("config_context", {}).get("A"), 1)
+        self.assertNotIn("config_context", response.data["results"][0])
 
-    def test_config_context_excluded(self):
+    def test_config_context_included(self):
         """
-        Check that config context data can be excluded by passing ?exclude=config_context.
+        Check that config context data can be included by passing ?include=config_context.
         """
-        url = reverse("virtualization-api:virtualmachine-list") + "?exclude=config_context"
+        url = reverse("virtualization-api:virtualmachine-list") + "?include=config_context"
         self.add_permissions("virtualization.view_virtualmachine")
 
         response = self.client.get(url, **self.header)
-        self.assertFalse("config_context" in response.data["results"][0])
+        self.assertIn("config_context", response.data["results"][0])
+        self.assertEqual(response.data["results"][0]["config_context"], {"A": 1})
 
     def test_unique_name_per_cluster_constraint(self):
         """
@@ -245,7 +242,7 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
             **self.header,
         )
         self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(response.data["local_config_context_schema"]["id"], str(schema.pk))
+        self.assertEqual(str(response.data["local_config_context_schema"]), self.absolute_api_url(schema))
 
     def test_local_config_context_schema_schema_validation_fails(self):
         """
@@ -272,7 +269,6 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
 
 class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
     model = VMInterface
-    brief_fields = ["display", "id", "name", "url", "virtual_machine"]
     bulk_update_data = {
         "description": "New description",
     }
@@ -282,26 +278,28 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
     def setUpTestData(cls):
         clustertype = ClusterType.objects.create(name="Test Cluster Type 1")
         cluster = Cluster.objects.create(name="Test Cluster 1", cluster_type=clustertype)
-        virtualmachine = VirtualMachine.objects.create(cluster=cluster, name="Test VM 1")
-        interface_status = Status.objects.get_for_model(VMInterface).first()
+        vm_status = Status.objects.get_for_model(VirtualMachine).first()
+        virtualmachine = VirtualMachine.objects.create(cluster=cluster, name="Test VM 1", status=vm_status)
+        cls.interface_status = Status.objects.get_for_model(VMInterface).first()
 
         interfaces = (
-            VMInterface.objects.create(virtual_machine=virtualmachine, name="Interface 1"),
-            VMInterface.objects.create(virtual_machine=virtualmachine, name="Interface 2"),
-            VMInterface.objects.create(virtual_machine=virtualmachine, name="Interface 3"),
+            VMInterface.objects.create(virtual_machine=virtualmachine, name="Interface 1", status=cls.interface_status),
+            VMInterface.objects.create(virtual_machine=virtualmachine, name="Interface 2", status=cls.interface_status),
+            VMInterface.objects.create(virtual_machine=virtualmachine, name="Interface 3", status=cls.interface_status),
         )
 
+        vlan_status = Status.objects.get_for_model(VLAN).first()
         vlans = (
-            VLAN.objects.create(name="VLAN 1", vid=1),
-            VLAN.objects.create(name="VLAN 2", vid=2),
-            VLAN.objects.create(name="VLAN 3", vid=3),
+            VLAN.objects.create(name="VLAN 1", vid=1, status=vlan_status),
+            VLAN.objects.create(name="VLAN 2", vid=2, status=vlan_status),
+            VLAN.objects.create(name="VLAN 3", vid=3, status=vlan_status),
         )
 
         cls.create_data = [
             {
                 "virtual_machine": virtualmachine.pk,
                 "name": "Interface 4",
-                "status": interface_status.pk,
+                "status": cls.interface_status.pk,
                 "mode": InterfaceModeChoices.MODE_TAGGED,
                 "tagged_vlans": [vlans[0].pk, vlans[1].pk],
                 "untagged_vlan": vlans[2].pk,
@@ -309,7 +307,7 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
             {
                 "virtual_machine": virtualmachine.pk,
                 "name": "Interface 5",
-                "status": interface_status.pk,
+                "status": cls.interface_status.pk,
                 "mode": InterfaceModeChoices.MODE_TAGGED,
                 "bridge": interfaces[0].pk,
                 "tagged_vlans": [vlans[0].pk, vlans[1].pk],
@@ -318,7 +316,7 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
             {
                 "virtual_machine": virtualmachine.pk,
                 "name": "Interface 6",
-                "status": interface_status.pk,
+                "status": cls.interface_status.pk,
                 "mode": InterfaceModeChoices.MODE_TAGGED,
                 "parent_interface": interfaces[1].pk,
                 "tagged_vlans": [vlans[0].pk, vlans[1].pk],
@@ -329,7 +327,7 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
         cls.untagged_vlan_data = {
             "virtual_machine": virtualmachine.pk,
             "name": "expected-to-fail",
-            "status": interface_status.pk,
+            "status": cls.interface_status.pk,
             "untagged_vlan": vlans[0].pk,
         }
 
@@ -357,7 +355,7 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
             payload = {
                 "virtual_machine": virtualmachine.pk,
                 "name": "Tagged Interface",
-                "status": Status.objects.get_for_model(VMInterface).first().pk,
+                "status": self.interface_status.pk,
                 "tagged_vlans": [vlan.pk],
             }
             response = self.client.post(self._get_list_url(), data=payload, format="json", **self.header)
@@ -372,6 +370,7 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
                 virtual_machine=virtualmachine,
                 name="VMInterface 1",
                 mode=InterfaceModeChoices.MODE_TAGGED,
+                status=self.interface_status,
             )
             interface.tagged_vlans.add(vlan)
             payload = {"mode": None, "tagged_vlans": [vlan.pk]}