Add EX2500 to configuration generation on TDS architectures.

Cray-HPE · Oct 16, 2024 · 66fc6e7 · 66fc6e7
1 parent da3739a
commit 66fc6e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/canu/generate/switch/config/config.py b/canu/generate/switch/config/config.py
@@ -908,8 +908,8 @@ def vsx_mac(switch_name):
             variables["VSX_ISL_PORT1"] = pair_connections[0]
             variables["VSX_ISL_PORT2"] = pair_connections[1]
 
-    # get VLANs and IPs for CDU switches
-    if "sw-cdu" in node_shasta_name:
+    # get VLANs and IPs for CDU and Spine (for EX2500) switches
+    if "sw-cdu" or "sw-spine" in node_shasta_name:
         nodes_by_name = {}
         nodes_by_id = {}
         destination_rack_list = []

diff --git a/network_modeling/configs/templates/1.6/aruba/tds/sw-spine.primary.j2 b/network_modeling/configs/templates/1.6/aruba/tds/sw-spine.primary.j2
@@ -45,6 +45,7 @@ vlan {{ variables.CAN_VLAN }}
 {%- endif %}
 vlan 10
     name SUN
+
 spanning-tree
 {#- forward delay added to help with pxe boots. CASMNET-1099 + CASMTRIAGE-2793 #}
 spanning-tree forward-delay 4
@@ -62,6 +63,9 @@ interface mgmt
 {% include variables.CSM_VERSION+'/aruba/common/bonded_nmn.j2' %}
 {% include variables.CSM_VERSION+'/aruba/tds/spine-to-leaf-bmc.lag.j2' %}
 {% include variables.CSM_VERSION+'/aruba/common/spine-to-cdu.lag.j2' %}
+{%- include variables.CSM_VERSION+'/aruba/common/mtn_hmn_vlan.j2' %}
+{%- include variables.CSM_VERSION+'/aruba/common/mtn_nmn_vlan.j2' %}
+{% include variables.CSM_VERSION+'/aruba/common/cmm.j2' %}
 {% include variables.CSM_VERSION+'/aruba/common/vsx_isl.primary.j2' %}
 
 interface loopback 0

diff --git a/network_modeling/configs/templates/1.6/aruba/tds/sw-spine.secondary.j2 b/network_modeling/configs/templates/1.6/aruba/tds/sw-spine.secondary.j2
@@ -45,6 +45,8 @@ vlan {{ variables.CAN_VLAN }}
 {%- endif %}
 vlan 10
     name SUN
+{%- include variables.CSM_VERSION+'/aruba/common/mtn_hmn_vlan.j2' %}
+{%- include variables.CSM_VERSION+'/aruba/common/mtn_nmn_vlan.j2' %}
 spanning-tree
 {#- forward delay added to help with pxe boots. CASMNET-1099 + CASMTRIAGE-2793 #}
 spanning-tree forward-delay 4
@@ -62,6 +64,9 @@ interface mgmt
 {% include variables.CSM_VERSION+'/aruba/common/bonded_nmn.j2' %}
 {% include variables.CSM_VERSION+'/aruba/tds/spine-to-leaf-bmc.lag.j2' %}
 {% include variables.CSM_VERSION+'/aruba/common/spine-to-cdu.lag.j2' %}
+{%- include variables.CSM_VERSION+'/aruba/common/mtn_hmn_vlan.j2' %}
+{%- include variables.CSM_VERSION+'/aruba/common/mtn_nmn_vlan.j2' %}
+{% include variables.CSM_VERSION+'/aruba/common/cmm.j2' %}
 {% include variables.CSM_VERSION+'/aruba/common/vsx_isl.secondary.j2' %}
 
 interface loopback 0