From ee03f3d5846f9342782553245a6750e50eab33e4 Mon Sep 17 00:00:00 2001
From: PieterL75 <74899468+PieterL75@users.noreply.github.com>
Date: Fri, 2 Dec 2022 15:27:47 +0100
Subject: [PATCH] 10748 Add 'Provider' to the circuit termination edit/view
 (#10939)

* Show the Provider of the NetworkProvider

* Clean up form fields

Co-authored-by: Pieter Lambrecht <pieter.lambrecht@sentia.com>
Co-authored-by: jeremystretch <jstretch@ns1.com>
---
 netbox/circuits/forms/models.py                  | 16 ++++++++++++++--
 .../circuits/circuittermination_edit.html        |  1 +
 .../circuits/inc/circuit_termination.html        |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/netbox/circuits/forms/models.py b/netbox/circuits/forms/models.py
index aebdce10e..7dd85aef9 100644
--- a/netbox/circuits/forms/models.py
+++ b/netbox/circuits/forms/models.py
@@ -158,16 +158,28 @@ class CircuitTerminationForm(NetBoxModelForm):
         },
         required=False
     )
+    provider_network_provider = DynamicModelChoiceField(
+        queryset=Provider.objects.all(),
+        required=False,
+        label='Provider',
+        initial_params={
+            'networks': 'provider_network'
+        }
+    )
     provider_network = DynamicModelChoiceField(
         queryset=ProviderNetwork.objects.all(),
+        query_params={
+            'provider_id': '$provider_network_provider',
+        },
         required=False
     )
 
     class Meta:
         model = CircuitTermination
         fields = [
-            'provider', 'circuit', 'term_side', 'region', 'site_group', 'site', 'provider_network', 'mark_connected',
-            'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'tags',
+            'provider', 'circuit', 'term_side', 'region', 'site_group', 'site', 'provider_network_provider',
+            'provider_network', 'mark_connected', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
+            'description', 'tags',
         ]
         help_texts = {
             'port_speed': "Physical circuit speed",
diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index 5196eddf2..f171ecc1b 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -32,6 +32,7 @@
           {% render_field form.site %}
         </div>
         <div class="tab-pane{% if providernetwork_tab_active %} active{% endif %}" id="providernetwork">
+          {% render_field form.provider_network_provider %}
           {% render_field form.provider_network %}
         </div>
       </div>
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index f4e0ea6ca..160ff940f 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -81,7 +81,7 @@
           {% else %}
             <tr>
               <td>Provider Network</td>
-              <td>{{ termination.provider_network|linkify }}</td>
+              <td>{{ termination.provider_network.provider|linkify }} / {{ termination.provider_network|linkify }}</td>
             </tr>
           {% endif %}
             <tr>