Fix DHCP status for DHCP relay (#1173) (#1195)

Co-authored-by: Caleb Ellis <[email protected]>
canonical · Jun 4, 2020 · 18f0ef7 · 18f0ef7
1 parent f71504d
commit 18f0ef7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/legacy/src/app/controllers/networks_list.js b/legacy/src/app/controllers/networks_list.js
@@ -286,11 +286,18 @@ function NetworksListController(
     $scope.newObject = null;
   };
 
-  // Return the name name for the VLAN.
+  // Return the short name for the VLAN.
   $scope.getVLANName = function(vlan) {
     return VLANsManager.getName(vlan);
   };
 
+  // Return the full name for the VLAN.
+  $scope.getFullVLANName = function(vlan_id) {
+    var vlan = VLANsManager.getItemFromList(vlan_id);
+    var fabric = FabricsManager.getItemFromList(vlan.fabric);
+    return FabricsManager.getName(fabric) + "." + VLANsManager.getName(vlan);
+  };
+
   // Return the name of the fabric from its given ID.
   $scope.getFabricNameById = function(fabricId) {
     return FabricsManager.getName(FabricsManager.getItemFromList(fabricId));
@@ -310,6 +317,8 @@ function NetworksListController(
 
     if (vlan.dhcp_on) {
       return "MAAS-provided";
+    } else if (vlan.relay_vlan) {
+      return "Relayed via " + $scope.getFullVLANName(vlan.relay_vlan);
     }
 
     return "No DHCP";

diff --git a/legacy/src/app/controllers/node_details.js b/legacy/src/app/controllers/node_details.js
@@ -1519,6 +1519,13 @@ function NodeDetailsController(
     return text;
   };
 
+  // Return the full name for the VLAN.
+  $scope.getFullVLANName = function(vlan_id) {
+    var vlan = VLANsManager.getItemFromList(vlan_id);
+    var fabric = FabricsManager.getItemFromList(vlan.fabric);
+    return FabricsManager.getName(fabric) + "." + VLANsManager.getName(vlan);
+  };
+
   $scope.getDHCPStatus = iface => {
     const { vlans } = $scope;
     const vlan = vlans.find(vlan => vlan.id === iface.vlan_id);
@@ -1529,7 +1536,10 @@ function NodeDetailsController(
 
       if (vlan.dhcp_on) {
         return "MAAS-provided";
+      } else if (vlan.relay_vlan) {
+        return "Relayed via " + $scope.getFullVLANName(vlan.relay_vlan);
       }
+
     }
     return "No DHCP";
   };