Bläddra i källkod

Fixes #6309: Restrict parent VM interface assignment to the parent VM

jeremystretch 4 år sedan
förälder
incheckning
cc57d1edf7
2 ändrade filer med 4 tillägg och 6 borttagningar
  1. 1 0
      docs/release-notes/version-2.11.md
  2. 3 6
      netbox/virtualization/forms.py

+ 1 - 0
docs/release-notes/version-2.11.md

@@ -9,6 +9,7 @@
 ### Bug Fixes
 
 * [#6308](https://github.com/netbox-community/netbox/issues/6308) - Fix linking of available VLANs in VLAN group view
+* [#6309](https://github.com/netbox-community/netbox/issues/6309) - Restrict parent VM interface assignment to the parent VM
 
 ---
 

+ 3 - 6
netbox/virtualization/forms.py

@@ -646,7 +646,7 @@ class VMInterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm)
         vm_id = self.initial.get('virtual_machine') or self.data.get('virtual_machine')
 
         # Restrict parent interface assignment by VM
-        self.fields['parent'].widget.add_query_param('virtualmachine_id', vm_id)
+        self.fields['parent'].widget.add_query_param('virtual_machine_id', vm_id)
 
         # Limit VLAN choices by virtual machine
         self.fields['untagged_vlan'].widget.add_query_param('available_on_virtualmachine', vm_id)
@@ -669,7 +669,7 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm):
         required=False,
         display_field='display_name',
         query_params={
-            'virtualmachine_id': 'virtual_machine',
+            'virtual_machine_id': '$virtual_machine',
         }
     )
     mtu = forms.IntegerField(
@@ -712,9 +712,6 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm):
         super().__init__(*args, **kwargs)
         vm_id = self.initial.get('virtual_machine') or self.data.get('virtual_machine')
 
-        # Restrict parent interface assignment by VM
-        self.fields['parent'].widget.add_query_param('virtualmachine_id', vm_id)
-
         # Limit VLAN choices by virtual machine
         self.fields['untagged_vlan'].widget.add_query_param('available_on_virtualmachine', vm_id)
         self.fields['tagged_vlans'].widget.add_query_param('available_on_virtualmachine', vm_id)
@@ -798,7 +795,7 @@ class VMInterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
             vm_id = self.initial.get('virtual_machine')
 
             # Restrict parent interface assignment by VM
-            self.fields['parent'].widget.add_query_param('virtualmachine_id', vm_id)
+            self.fields['parent'].widget.add_query_param('virtual_machine_id', vm_id)
 
             # Limit VLAN choices by virtual machine
             self.fields['untagged_vlan'].widget.add_query_param('available_on_virtualmachine', vm_id)