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

nautobot/virtualization/api/views.py

@@ -73,28 +73,9 @@ class VirtualMachineViewSet(ConfigContextQuerySetMixin, NautobotModelViewSet):
         "role",
         "tenant",
     ).prefetch_related("tags")
+    serializer_class = serializers.VirtualMachineSerializer
     filterset_class = filters.VirtualMachineFilterSet
 
-    def get_serializer_class(self):
-        """
-        Select the specific serializer based on the request context.
-
-        If the `brief` query param equates to True, return the NestedVirtualMachineSerializer
-
-        If the `exclude` query param includes `config_context` as a value, return the VirtualMachineSerializer
-
-        Else, return the VirtualMachineWithConfigContextSerializer
-        """
-
-        request = self.get_serializer_context()["request"]
-        if request is not None and request.query_params.get("brief", False):
-            return serializers.NestedVirtualMachineSerializer
-
-        elif request is not None and "config_context" in request.query_params.get("exclude", []):
-            return serializers.VirtualMachineSerializer
-
-        return serializers.VirtualMachineWithConfigContextSerializer
-
 
 class VMInterfaceViewSet(ModelViewSet, NotesViewSetMixin):
     queryset = VMInterface.objects.select_related(
@@ -105,5 +86,3 @@ class VMInterfaceViewSet(ModelViewSet, NotesViewSetMixin):
     ).prefetch_related("tags", "tagged_vlans")
     serializer_class = serializers.VMInterfaceSerializer
     filterset_class = filters.VMInterfaceFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["virtual_machine"]

nautobot/virtualization/forms.py

@@ -8,8 +8,6 @@ from nautobot.core.forms import (
     BulkRenameForm,
     CommentField,
     ConfirmationForm,
-    CSVChoiceField,
-    CSVModelChoiceField,
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
     ExpandableNameField,
@@ -24,14 +22,12 @@ from nautobot.dcim.constants import INTERFACE_MTU_MAX, INTERFACE_MTU_MIN
 from nautobot.dcim.forms import InterfaceCommonForm, INTERFACE_MODE_HELP_TEXT
 from nautobot.dcim.form_mixins import (
     LocatableModelBulkEditFormMixin,
-    LocatableModelCSVFormMixin,
     LocatableModelFilterFormMixin,
     LocatableModelFormMixin,
 )
 from nautobot.dcim.models import Device, Location, Platform, Rack
 from nautobot.extras.forms import (
     CustomFieldModelBulkEditFormMixin,
-    CustomFieldModelCSVForm,
     NautobotBulkEditForm,
     NautobotModelForm,
     NautobotFilterForm,
@@ -39,15 +35,13 @@ from nautobot.extras.forms import (
     LocalContextModelForm,
     LocalContextModelBulkEditForm,
     RoleModelBulkEditFormMixin,
-    RoleModelCSVFormMixin,
     RoleModelFilterFormMixin,
     StatusModelBulkEditFormMixin,
-    StatusModelCSVFormMixin,
     StatusModelFilterFormMixin,
     TagsBulkEditFormMixin,
 )
 from nautobot.extras.models import Status
-from nautobot.ipam.models import IPAddress, IPAddressToInterface, VLAN
+from nautobot.ipam.models import IPAddress, IPAddressToInterface, VLAN, VRF
 from nautobot.tenancy.forms import TenancyFilterForm, TenancyForm
 from nautobot.tenancy.models import Tenant
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
@@ -67,12 +61,6 @@ class ClusterTypeForm(NautobotModelForm):
         ]
 
 
-class ClusterTypeCSVForm(CustomFieldModelCSVForm):
-    class Meta:
-        model = ClusterType
-        fields = ClusterType.csv_headers
-
-
 #
 # Cluster groups
 #
@@ -87,12 +75,6 @@ class ClusterGroupForm(NautobotModelForm):
         ]
 
 
-class ClusterGroupCSVForm(CustomFieldModelCSVForm):
-    class Meta:
-        model = ClusterGroup
-        fields = ClusterGroup.csv_headers
-
-
 #
 # Clusters
 #
@@ -116,30 +98,6 @@ class ClusterForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
         )
 
 
-class ClusterCSVForm(LocatableModelCSVFormMixin, CustomFieldModelCSVForm):
-    cluster_type = CSVModelChoiceField(
-        queryset=ClusterType.objects.all(),
-        to_field_name="name",
-        help_text="Type of cluster",
-    )
-    cluster_group = CSVModelChoiceField(
-        queryset=ClusterGroup.objects.all(),
-        to_field_name="name",
-        required=False,
-        help_text="Assigned cluster group",
-    )
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
-        to_field_name="name",
-        required=False,
-        help_text="Assigned tenant",
-    )
-
-    class Meta:
-        model = Cluster
-        fields = Cluster.csv_headers
-
-
 class ClusterBulkEditForm(
     TagsBulkEditFormMixin,
     LocatableModelBulkEditFormMixin,
@@ -249,6 +207,11 @@ class VirtualMachineForm(NautobotModelForm, TenancyForm, LocalContextModelForm):
         queryset=Cluster.objects.all(), query_params={"cluster_group_id": "$cluster_group"}
     )
     platform = DynamicModelChoiceField(queryset=Platform.objects.all(), required=False)
+    vrfs = DynamicModelMultipleChoiceField(
+        queryset=VRF.objects.all(),
+        required=False,
+        label="VRFs",
+    )
 
     class Meta:
         model = VirtualMachine
@@ -260,6 +223,7 @@ class VirtualMachineForm(NautobotModelForm, TenancyForm, LocalContextModelForm):
             "role",
             "tenant_group",
             "tenant",
+            "vrfs",
             "platform",
             "primary_ip4",
             "primary_ip6",
@@ -321,6 +285,8 @@ class VirtualMachineForm(NautobotModelForm, TenancyForm, LocalContextModelForm):
                     ip_choices.append(("NAT IPs", nat_ips))
                 self.fields[f"primary_ip{ip_version}"].choices = ip_choices
 
+            self.initial["vrfs"] = self.instance.vrfs.values_list("id", flat=True)
+
         else:
             # An object that doesn't exist yet can't have any IPs assigned to it
             self.fields["primary_ip4"].choices = []
@@ -328,29 +294,10 @@ class VirtualMachineForm(NautobotModelForm, TenancyForm, LocalContextModelForm):
             self.fields["primary_ip6"].choices = []
             self.fields["primary_ip6"].widget.attrs["readonly"] = True
 
-
-class VirtualMachineCSVForm(StatusModelCSVFormMixin, RoleModelCSVFormMixin, CustomFieldModelCSVForm):
-    cluster = CSVModelChoiceField(
-        queryset=Cluster.objects.all(),
-        to_field_name="name",
-        help_text="Assigned cluster",
-    )
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Assigned tenant",
-    )
-    platform = CSVModelChoiceField(
-        queryset=Platform.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Assigned platform",
-    )
-
-    class Meta:
-        model = VirtualMachine
-        fields = VirtualMachine.csv_headers
+    def save(self, *args, **kwargs):
+        instance = super().save(*args, **kwargs)
+        instance.vrfs.set(self.cleaned_data["vrfs"])
+        return instance
 
 
 class VirtualMachineBulkEditForm(
@@ -453,7 +400,6 @@ class VMInterfaceForm(NautobotModelForm, InterfaceCommonForm):
         queryset=VLAN.objects.all(),
         required=False,
         label="Untagged VLAN",
-        brief_mode=False,
         query_params={
             "location_id": "null",
         },
@@ -462,7 +408,6 @@ class VMInterfaceForm(NautobotModelForm, InterfaceCommonForm):
         queryset=VLAN.objects.all(),
         required=False,
         label="Tagged VLANs",
-        brief_mode=False,
         query_params={
             "location_id": "null",
         },
@@ -471,7 +416,6 @@ class VMInterfaceForm(NautobotModelForm, InterfaceCommonForm):
         queryset=IPAddress.objects.all(),
         required=False,
         label="IP Addresses",
-        brief_mode=False,
     )
 
     class Meta:
@@ -555,7 +499,6 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm):
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
-        brief_mode=False,
         query_params={
             "location_id": "null",
         },
@@ -563,7 +506,6 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm):
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
-        brief_mode=False,
         query_params={
             "location_id": "null",
         },
@@ -594,32 +536,6 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm):
             self.fields["tagged_vlans"].widget.add_query_param("location_id", location.pk)
 
 
-class VMInterfaceCSVForm(CustomFieldModelCSVForm, StatusModelCSVFormMixin):
-    virtual_machine = CSVModelChoiceField(queryset=VirtualMachine.objects.all(), to_field_name="name")
-    parent_interface = CSVModelChoiceField(
-        queryset=VMInterface.objects.all(), required=False, to_field_name="name", help_text="Parent interface"
-    )
-    bridge = CSVModelChoiceField(
-        queryset=VMInterface.objects.all(), required=False, to_field_name="name", help_text="Bridge interface"
-    )
-    mode = CSVChoiceField(
-        choices=InterfaceModeChoices,
-        required=False,
-        help_text="IEEE 802.1Q operational mode (for L2 interfaces)",
-    )
-
-    class Meta:
-        model = VMInterface
-        fields = VMInterface.csv_headers
-
-    def clean_enabled(self):
-        # Make sure enabled is True when it's not included in the uploaded data
-        if "enabled" not in self.data:
-            return True
-        else:
-            return self.cleaned_data["enabled"]
-
-
 class VMInterfaceBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=VMInterface.objects.all(), widget=forms.MultipleHiddenInput())
     virtual_machine = forms.ModelChoiceField(
@@ -651,7 +567,6 @@ class VMInterfaceBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFormMixi
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
-        brief_mode=False,
         query_params={
             "location_id": "null",
         },
@@ -659,7 +574,6 @@ class VMInterfaceBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFormMixi
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
-        brief_mode=False,
         query_params={
             "location_id": "null",
         },

nautobot/virtualization/migrations/0012_alter_virtualmachine_role_add_new_role.py

@@ -7,7 +7,7 @@ import nautobot.extras.models.roles
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("extras", "0061_collect_roles_from_related_apps_roles"),
+        ("extras", "0062_collect_roles_from_related_apps_roles"),
         ("virtualization", "0011_alter_vminterface_mac_address"),
     ]
 

nautobot/virtualization/migrations/0013_migrate_virtualmachine_role_data.py

@@ -5,23 +5,30 @@ from nautobot.extras.utils import migrate_role_data
 
 
 def migrate_data_from_legacy_role_to_new_role(apps, schema):
-    """Copy record from role to temp_role"""
-
+    """Migrate DeviceRole data from legacy_role to new_role."""
     model = apps.get_model("virtualization", "VirtualMachine")
-    role_model = apps.get_model("extras", "Role")
-    migrate_role_data(model=model, role_model=role_model)
+    from_role_model = apps.get_model("dcim", "DeviceRole")
+    to_role_model = apps.get_model("extras", "Role")
+    migrate_role_data(
+        model_to_migrate=model,
+        from_role_field_name="legacy_role",
+        from_role_model=from_role_model,
+        to_role_field_name="new_role",
+        to_role_model=to_role_model,
+    )
 
 
 def reverse_role_data_migrate(apps, schema):
-    """Reverse changes made to new_role"""
-
+    """Migrate DeviceRole data from new_role to legacy_role."""
     model = apps.get_model("virtualization", "VirtualMachine")
-    device_role_model = apps.get_model("dcim", "DeviceRole")
+    from_role_model = apps.get_model("extras", "Role")
+    to_role_model = apps.get_model("dcim", "DeviceRole")
     migrate_role_data(
-        model=model,
-        role_model=device_role_model,
-        legacy_role="new_role",
-        new_role="legacy_role",
+        model_to_migrate=model,
+        from_role_field_name="new_role",
+        from_role_model=from_role_model,
+        to_role_field_name="legacy_role",
+        to_role_model=to_role_model,
     )
 
 

nautobot/virtualization/migrations/0015_rename_foreignkey_fields.py

@@ -8,7 +8,7 @@ import nautobot.extras.utils
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("extras", "0065_rename_configcontext_role"),
+        ("extras", "0066_rename_configcontext_role"),
         ("contenttypes", "0002_remove_content_type_name"),
         ("virtualization", "0014_rename_virtualmachine_roles"),
     ]

nautobot/virtualization/migrations/0018_related_name_changes.py

@@ -11,7 +11,7 @@ import nautobot.extras.utils
 class Migration(migrations.Migration):
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
-        ("extras", "0067_created_datetime"),
+        ("extras", "0068_created_datetime"),
         ("virtualization", "0017_created_datetime"),
     ]
 

nautobot/virtualization/migrations/0021_tagsfield_and_vminterface_to_primarymodel.py

@@ -0,0 +1,39 @@
+# Generated by Django 3.2.18 on 2023-04-21 13:59
+
+from django.db import migrations, models
+import nautobot.core.models.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0079_tagsfield"),
+        ("virtualization", "0020_remove_clustergroup_clustertype_slug"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="vminterface",
+            name="created",
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="vminterface",
+            name="last_updated",
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="cluster",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="virtualmachine",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="vminterface",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+    ]

nautobot/virtualization/migrations/0022_vminterface_timestamps_data_migration.py

@@ -0,0 +1,17 @@
+from django.db import migrations
+
+
+def zero_out_vminterface_timestamps(apps, schema_editor):
+    """Set initial created/last_updated fields of existing VMInterfaces to None, rather than the time of migration."""
+    VMInterface = apps.get_model("virtualization.vminterface")
+    VMInterface.objects.all().update(created=None, last_updated=None)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("virtualization", "0021_tagsfield_and_vminterface_to_primarymodel"),
+    ]
+
+    operations = [
+        migrations.RunPython(zero_out_vminterface_timestamps, migrations.RunPython.noop),
+    ]

nautobot/virtualization/migrations/{0021_ipam__namespaces.py → 0023_ipam__namespaces.py}

@@ -6,8 +6,8 @@ import django.db.models.deletion
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("ipam", "0028_ipam__namespaces"),
-        ("virtualization", "0020_remove_clustergroup_clustertype_slug"),
+        ("ipam", "0030_ipam__namespaces"),
+        ("virtualization", "0022_vminterface_timestamps_data_migration"),
     ]
 
     operations = [

nautobot/virtualization/migrations/0024_fixup_null_statuses.py

@@ -0,0 +1,25 @@
+from django.db import migrations
+
+from nautobot.extras.utils import fixup_null_statuses
+
+
+def migrate_null_statuses(apps, schema):
+    status_model = apps.get_model("extras", "Status")
+    ContentType = apps.get_model("contenttypes", "ContentType")
+    for model_name in (
+        "VirtualMachine",
+        "VMInterface",
+    ):
+        model = apps.get_model("virtualization", model_name)
+        model_ct = ContentType.objects.get_for_model(model)
+        fixup_null_statuses(model=model, model_contenttype=model_ct, status_model=status_model)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("virtualization", "0023_ipam__namespaces"),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_null_statuses, migrations.RunPython.noop),
+    ]

nautobot/virtualization/migrations/0025_status_nonnullable.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.18 on 2023-05-19 18:05
+
+from django.db import migrations
+import django.db.models.deletion
+import nautobot.extras.models.statuses
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0083_rename_computed_field_slug_to_key"),
+        ("virtualization", "0024_fixup_null_statuses"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="virtualmachine",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="virtual_machines", to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vminterface",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="vm_interfaces", to="extras.status"
+            ),
+        ),
+    ]