Fixes #3868: Fix creation of interfaces for virtual machines

netbox/virtualization/api/serializers.py

@@ -99,7 +99,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
 
 class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer):
     virtual_machine = NestedVirtualMachineSerializer()
-    type = ChoiceField(choices=InterfaceTypeChoices, default=InterfaceTypeChoices.TYPE_VIRTUAL, required=False)
+    type = ChoiceField(choices=VMInterfaceTypeChoices, default=VMInterfaceTypeChoices.TYPE_VIRTUAL, required=False)
     mode = ChoiceField(choices=InterfaceModeChoices, required=False, allow_null=True)
     untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
     tagged_vlans = SerializedPKRelatedField(

netbox/virtualization/choices.py

@@ -1,3 +1,4 @@
+from dcim.choices import InterfaceTypeChoices
 from utilities.choices import ChoiceSet
 
 
@@ -22,3 +23,16 @@ class VirtualMachineStatusChoices(ChoiceSet):
         STATUS_ACTIVE: 1,
         STATUS_STAGED: 3,
     }
+
+
+#
+# Interface types (for VirtualMachines)
+#
+
+class VMInterfaceTypeChoices(ChoiceSet):
+
+    TYPE_VIRTUAL = InterfaceTypeChoices.TYPE_VIRTUAL
+
+    CHOICES = (
+        (TYPE_VIRTUAL, 'Virtual'),
+    )

netbox/virtualization/forms.py

@@ -2,7 +2,7 @@ from django import forms
 from django.core.exceptions import ValidationError
 from taggit.forms import TagField
 
-from dcim.choices import InterfaceModeChoices, InterfaceTypeChoices
+from dcim.choices import InterfaceModeChoices
 from dcim.forms import INTERFACE_MODE_HELP_TEXT
 from dcim.models import Device, DeviceRole, Interface, Platform, Rack, Region, Site
 from extras.forms import AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldForm, CustomFieldFilterForm
@@ -18,10 +18,6 @@ from utilities.forms import (
 from .choices import *
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
 
-VIFACE_TYPE_CHOICES = (
-    (InterfaceTypeChoices.TYPE_VIRTUAL, 'Virtual'),
-)
-
 
 #
 # Cluster types
@@ -740,8 +736,8 @@ class InterfaceCreateForm(ComponentForm):
         label='Name'
     )
     type = forms.ChoiceField(
-        choices=VIFACE_TYPE_CHOICES,
-        initial=InterfaceTypeChoices.TYPE_VIRTUAL,
+        choices=VMInterfaceTypeChoices,
+        initial=VMInterfaceTypeChoices.TYPE_VIRTUAL,
         widget=forms.HiddenInput()
     )
     enabled = forms.BooleanField(
@@ -925,8 +921,8 @@ class VirtualMachineBulkAddComponentForm(BootstrapMixin, forms.Form):
 
 class VirtualMachineBulkAddInterfaceForm(VirtualMachineBulkAddComponentForm):
     type = forms.ChoiceField(
-        choices=VIFACE_TYPE_CHOICES,
-        initial=InterfaceTypeChoices.TYPE_VIRTUAL,
+        choices=VMInterfaceTypeChoices,
+        initial=VMInterfaceTypeChoices.TYPE_VIRTUAL,
         widget=forms.HiddenInput()
     )
     enabled = forms.BooleanField(