From 6f7289f93217c5d3499264f2cfe6e540ba17d8e9 Mon Sep 17 00:00:00 2001
From: Daniel Sheppard <dans@dansheps.com>
Date: Tue, 26 Jul 2022 07:22:21 -0500
Subject: [PATCH] Fixes #9844 - Add dedicated `device_vlan` form field

---
 netbox/ipam/forms/models.py                      | 10 ++++++++--
 netbox/templates/ipam/l2vpntermination_edit.html |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/netbox/ipam/forms/models.py b/netbox/ipam/forms/models.py
index 415c952be..0a22cbc21 100644
--- a/netbox/ipam/forms/models.py
+++ b/netbox/ipam/forms/models.py
@@ -906,8 +906,9 @@ class L2VPNTerminationForm(NetBoxModelForm):
         label='L2VPN',
         fetch_trigger='open'
     )
-    device = DynamicModelChoiceField(
+    device_vlan = DynamicModelChoiceField(
         queryset=Device.objects.all(),
+        label="Available on Device",
         required=False,
         query_params={}
     )
@@ -915,10 +916,15 @@ class L2VPNTerminationForm(NetBoxModelForm):
         queryset=VLAN.objects.all(),
         required=False,
         query_params={
-            'available_on_device': '$device'
+            'available_on_device': '$device_vlan'
         },
         label='VLAN'
     )
+    device = DynamicModelChoiceField(
+        queryset=Device.objects.all(),
+        required=False,
+        query_params={}
+    )
     interface = DynamicModelChoiceField(
         queryset=Interface.objects.all(),
         required=False,
diff --git a/netbox/templates/ipam/l2vpntermination_edit.html b/netbox/templates/ipam/l2vpntermination_edit.html
index 7b4a9f50a..c66b8a3d1 100644
--- a/netbox/templates/ipam/l2vpntermination_edit.html
+++ b/netbox/templates/ipam/l2vpntermination_edit.html
@@ -32,7 +32,7 @@
     <div class="row mb-3">
       <div class="tab-content p-0 border-0">
         <div class="tab-pane {% if not form.initial.interface or form.initial.vminterface %}active{% endif %}" id="vlan" role="tabpanel" aria-labeled-by="vlan_tab">
-          {% render_field form.device %}
+          {% render_field form.device_vlan %}
           {% render_field form.vlan %}
         </div>
         <div class="tab-pane {% if form.initial.interface %}active{% endif %}" id="interface" role="tabpanel" aria-labeled-by="interface_tab">