Feat(eos_designs): Support for custom naming of trunk groups (#2021)

aristanetworks · Aug 30, 2022 · 80cd8e5 · 80cd8e5
1 parent 3cd3516
commit 80cd8e5
Show file tree

Hide file tree

Showing 11 changed files with 127 additions and 79 deletions.
diff --git a/...rista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1b.cfg b/...rista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l2leaf1b.cfg
@@ -15,51 +15,51 @@ no aaa root
 !
 vlan 100
    name svi100_with_trunk_groups
-   trunk group MLAG
-   trunk group UPLINK
+   trunk group CUSTOM_MLAG_TG_NAME
+   trunk group CUSTOM_UPLINK_TG_NAME
 !
 vlan 110
    name l2vlan110_with_trunk_groups
-   trunk group MLAG
-   trunk group UPLINK
+   trunk group CUSTOM_MLAG_TG_NAME
+   trunk group CUSTOM_UPLINK_TG_NAME
 !
 vlan 200
    name svi200_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
+   trunk group CUSTOM_UPLINK_TG_NAME
    trunk group TG_200
-   trunk group UPLINK
 !
 vlan 210
    name l2vlan210_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
+   trunk group CUSTOM_UPLINK_TG_NAME
    trunk group TG_200
-   trunk group UPLINK
 !
 vlan 300
    name svi300_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
+   trunk group CUSTOM_UPLINK_TG_NAME
    trunk group TG_300
-   trunk group UPLINK
 !
 vlan 310
    name l2vlan310_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
+   trunk group CUSTOM_UPLINK_TG_NAME
    trunk group TG_300
-   trunk group UPLINK
 !
 vlan 398
    name svi398_without_trunk_groups
-   trunk group MLAG
-   trunk group UPLINK
+   trunk group CUSTOM_MLAG_TG_NAME
+   trunk group CUSTOM_UPLINK_TG_NAME
 !
 vlan 399
    name l2vlan399_without_trunk_groups
-   trunk group MLAG
-   trunk group UPLINK
+   trunk group CUSTOM_MLAG_TG_NAME
+   trunk group CUSTOM_UPLINK_TG_NAME
 !
 vlan 4094
    name MLAG_PEER
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
 !
 vrf instance MGMT
 !
@@ -77,7 +77,7 @@ interface Port-Channel3
    switchport
    switchport trunk allowed vlan 2-4094
    switchport mode trunk
-   switchport trunk group MLAG
+   switchport trunk group CUSTOM_MLAG_TG_NAME
 !
 interface Port-Channel13
    description server_with_tg_300_portchannel

diff --git a/...rista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg b/...rista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg
@@ -15,77 +15,77 @@ no aaa root
 !
 vlan 100
    name svi100_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group TRUNK_GROUP_TESTS_L2LEAF1
 !
 vlan 110
    name l2vlan110_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group TRUNK_GROUP_TESTS_L2LEAF1
 !
 vlan 200
    name svi200_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group trunk-group-tests-l2leaf3
    trunk group TRUNK_GROUP_TESTS_L2LEAF1
 !
 vlan 210
    name l2vlan210_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group trunk-group-tests-l2leaf3
    trunk group TRUNK_GROUP_TESTS_L2LEAF1
 !
 vlan 300
    name svi300_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group TG_300
    trunk group TRUNK_GROUP_TESTS_L2LEAF1
 !
 vlan 301
    name svi301_with_trunk_groups_only_l3leaf
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group TG_300
 !
 vlan 310
    name l2vlan310_with_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group TG_300
    trunk group TRUNK_GROUP_TESTS_L2LEAF1
 !
 vlan 311
    name l2vlan310_with_trunk_groups_only_l3leaf
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group TG_300
 !
 vlan 398
    name svi398_without_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group TRUNK_GROUP_TESTS_L2LEAF1
 !
 vlan 399
    name l2vlan399_without_trunk_groups
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
    trunk group TRUNK_GROUP_TESTS_L2LEAF1
 !
 vlan 3099
    name MLAG_iBGP_TG_100
-   trunk group LEAF_PEER_L3
+   trunk group CUSTOM_LEAF_PEER_L3_TG_NAME
 !
 vlan 3199
    name MLAG_iBGP_TG_200
-   trunk group LEAF_PEER_L3
+   trunk group CUSTOM_LEAF_PEER_L3_TG_NAME
 !
 vlan 3299
    name MLAG_iBGP_TG_300
-   trunk group LEAF_PEER_L3
+   trunk group CUSTOM_LEAF_PEER_L3_TG_NAME
 !
 vlan 4093
    name LEAF_PEER_L3
-   trunk group LEAF_PEER_L3
+   trunk group CUSTOM_LEAF_PEER_L3_TG_NAME
 !
 vlan 4094
    name MLAG_PEER
-   trunk group MLAG
+   trunk group CUSTOM_MLAG_TG_NAME
 !
 vrf instance MGMT
 !
@@ -109,8 +109,8 @@ interface Port-Channel3
    switchport
    switchport trunk allowed vlan 2-4094
    switchport mode trunk
-   switchport trunk group LEAF_PEER_L3
-   switchport trunk group MLAG
+   switchport trunk group CUSTOM_LEAF_PEER_L3_TG_NAME
+   switchport trunk group CUSTOM_MLAG_TG_NAME
 !
 interface Port-Channel5
    description TRUNK-GROUP-TESTS-L2LEAF3_Po1

diff --git a/...olecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1b.yml b/...olecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l2leaf1b.yml
@@ -23,59 +23,59 @@ vlans:
     tenant: system
     name: MLAG_PEER
     trunk_groups:
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
   100:
     tenant: TRUNK_GROUP_TESTS
     name: svi100_with_trunk_groups
     trunk_groups:
-    - MLAG
-    - UPLINK
+    - CUSTOM_MLAG_TG_NAME
+    - CUSTOM_UPLINK_TG_NAME
   200:
     tenant: TRUNK_GROUP_TESTS
     name: svi200_with_trunk_groups
     trunk_groups:
     - TG_200
-    - MLAG
-    - UPLINK
+    - CUSTOM_MLAG_TG_NAME
+    - CUSTOM_UPLINK_TG_NAME
   300:
     tenant: TRUNK_GROUP_TESTS
     name: svi300_with_trunk_groups
     trunk_groups:
     - TG_300
-    - MLAG
-    - UPLINK
+    - CUSTOM_MLAG_TG_NAME
+    - CUSTOM_UPLINK_TG_NAME
   398:
     tenant: TRUNK_GROUP_TESTS
     name: svi398_without_trunk_groups
     trunk_groups:
-    - MLAG
-    - UPLINK
+    - CUSTOM_MLAG_TG_NAME
+    - CUSTOM_UPLINK_TG_NAME
   110:
     tenant: TRUNK_GROUP_TESTS
     name: l2vlan110_with_trunk_groups
     trunk_groups:
-    - MLAG
-    - UPLINK
+    - CUSTOM_MLAG_TG_NAME
+    - CUSTOM_UPLINK_TG_NAME
   210:
     tenant: TRUNK_GROUP_TESTS
     name: l2vlan210_with_trunk_groups
     trunk_groups:
     - TG_200
-    - MLAG
-    - UPLINK
+    - CUSTOM_MLAG_TG_NAME
+    - CUSTOM_UPLINK_TG_NAME
   310:
     tenant: TRUNK_GROUP_TESTS
     name: l2vlan310_with_trunk_groups
     trunk_groups:
     - TG_300
-    - MLAG
-    - UPLINK
+    - CUSTOM_MLAG_TG_NAME
+    - CUSTOM_UPLINK_TG_NAME
   399:
     tenant: TRUNK_GROUP_TESTS
     name: l2vlan399_without_trunk_groups
     trunk_groups:
-    - MLAG
-    - UPLINK
+    - CUSTOM_MLAG_TG_NAME
+    - CUSTOM_UPLINK_TG_NAME
 vlan_interfaces:
   Vlan4094:
     description: MLAG_PEER
@@ -91,7 +91,7 @@ port_channel_interfaces:
     vlans: 2-4094
     mode: trunk
     trunk_groups:
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
   Port-Channel1:
     description: TRUNK_GROUP_TESTS_L3LEAF1_Po1
     type: switched

diff --git a/...olecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml b/...olecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml
@@ -203,91 +203,91 @@ vlans:
     tenant: system
     name: LEAF_PEER_L3
     trunk_groups:
-    - LEAF_PEER_L3
+    - CUSTOM_LEAF_PEER_L3_TG_NAME
   4094:
     tenant: system
     name: MLAG_PEER
     trunk_groups:
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
   100:
     trunk_groups:
     - TRUNK_GROUP_TESTS_L2LEAF1
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
     tenant: TRUNK_GROUP_TESTS
     name: svi100_with_trunk_groups
   110:
     trunk_groups:
     - TRUNK_GROUP_TESTS_L2LEAF1
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
     tenant: TRUNK_GROUP_TESTS
     name: l2vlan110_with_trunk_groups
   200:
     trunk_groups:
     - TRUNK_GROUP_TESTS_L2LEAF1
     - trunk-group-tests-l2leaf3
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
     tenant: TRUNK_GROUP_TESTS
     name: svi200_with_trunk_groups
   210:
     trunk_groups:
     - TRUNK_GROUP_TESTS_L2LEAF1
     - trunk-group-tests-l2leaf3
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
     tenant: TRUNK_GROUP_TESTS
     name: l2vlan210_with_trunk_groups
   300:
     trunk_groups:
     - TRUNK_GROUP_TESTS_L2LEAF1
     - TG_300
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
     tenant: TRUNK_GROUP_TESTS
     name: svi300_with_trunk_groups
   310:
     trunk_groups:
     - TRUNK_GROUP_TESTS_L2LEAF1
     - TG_300
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
     tenant: TRUNK_GROUP_TESTS
     name: l2vlan310_with_trunk_groups
   398:
     trunk_groups:
     - TRUNK_GROUP_TESTS_L2LEAF1
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
     tenant: TRUNK_GROUP_TESTS
     name: svi398_without_trunk_groups
   399:
     trunk_groups:
     - TRUNK_GROUP_TESTS_L2LEAF1
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
     tenant: TRUNK_GROUP_TESTS
     name: l2vlan399_without_trunk_groups
   3099:
     tenant: TRUNK_GROUP_TESTS
     name: MLAG_iBGP_TG_100
     trunk_groups:
-    - LEAF_PEER_L3
+    - CUSTOM_LEAF_PEER_L3_TG_NAME
   3199:
     tenant: TRUNK_GROUP_TESTS
     name: MLAG_iBGP_TG_200
     trunk_groups:
-    - LEAF_PEER_L3
+    - CUSTOM_LEAF_PEER_L3_TG_NAME
   301:
     tenant: TRUNK_GROUP_TESTS
     name: svi301_with_trunk_groups_only_l3leaf
     trunk_groups:
     - TG_300
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
   3299:
     tenant: TRUNK_GROUP_TESTS
     name: MLAG_iBGP_TG_300
     trunk_groups:
-    - LEAF_PEER_L3
+    - CUSTOM_LEAF_PEER_L3_TG_NAME
   311:
     tenant: TRUNK_GROUP_TESTS
     name: l2vlan310_with_trunk_groups_only_l3leaf
     trunk_groups:
     - TG_300
-    - MLAG
+    - CUSTOM_MLAG_TG_NAME
 vlan_interfaces:
   Vlan4093:
     description: MLAG_PEER_L3_PEERING
@@ -376,8 +376,8 @@ port_channel_interfaces:
     vlans: 2-4094
     mode: trunk
     trunk_groups:
-    - LEAF_PEER_L3
-    - MLAG
+    - CUSTOM_LEAF_PEER_L3_TG_NAME
+    - CUSTOM_MLAG_TG_NAME
   Port-Channel1:
     description: TRUNK_GROUP_TESTS_L2LEAF1_Po1
     type: switched

diff --git a/...ta/avd/molecule/eos_designs_unit_tests/inventory/host_vars/trunk-group-tests-l2leaf1b.yml b/...ta/avd/molecule/eos_designs_unit_tests/inventory/host_vars/trunk-group-tests-l2leaf1b.yml
@@ -2,3 +2,12 @@
 # Testing "only_local_vlan_trunk_groups: true" set in hostvars to see that only
 # locally used trunk-groups are set on vlans even without "filter.only_vlans_in_use: true"
 only_local_vlan_trunk_groups: true
+
+# Testing custom Trunk Group names on l2leaf1b and l3leaf1b.
+trunk_groups:
+  mlag:
+    name: "CUSTOM_MLAG_TG_NAME"
+  mlag_l3:
+    name: "CUSTOM_LEAF_PEER_L3_TG_NAME"
+  uplink:
+    name: "CUSTOM_UPLINK_TG_NAME"