Fixes: #14839 - Check for tunnel termination type in additional insta…

…nces
netbox-community · Jan 31, 2024 · 1c2107e · 1c2107e
1 parent 1b9e6be
commit 1c2107e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py
@@ -265,9 +265,17 @@ class Meta:
     def __init__(self, *args, initial=None, **kwargs):
         super().__init__(*args, initial=initial, **kwargs)
 
-        if initial and initial.get('type') == TunnelTerminationTypeChoices.TYPE_VIRTUALMACHINE:
+        # If initial or self.data is set and the type is a VIRTUALMACHINE type, swap the field querysets.
+        if (
+            initial and initial.get('type') == TunnelTerminationTypeChoices.TYPE_VIRTUALMACHINE
+        ) or (
+            self.data and self.data.get('type') == TunnelTerminationTypeChoices.TYPE_VIRTUALMACHINE
+        ) or (
+            self.instance.pk and isinstance(self.instance.termination.parent_object, VirtualMachine)
+        ):
             self.fields['parent'].label = _('Virtual Machine')
             self.fields['parent'].queryset = VirtualMachine.objects.all()
+            self.fields['parent'].widget.attrs['selector'] = 'virtualization.virtualmachine'
             self.fields['termination'].queryset = VMInterface.objects.all()
             self.fields['termination'].widget.add_query_params({
                 'virtual_machine_id': '$parent',