fixing testcase

aristanetworks · Jul 2, 2024 · d574ede · d574ede
1 parent 4dee11b
commit d574ede
Show file tree

Hide file tree

Showing 9 changed files with 123 additions and 67 deletions.
diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg
@@ -171,10 +171,6 @@ interface Port-Channel11
    mtu 1600
    switchport
    switchport access vlan 110
-   evpn ethernet-segment
-      identifier 0000:0000:ca01:5ba3:6ffb
-      route-target import ca:01:5b:a3:6f:fb
-   lacp system-id ca01.5ba3.6ffb
    spanning-tree bpduguard enable
    spanning-tree bpdufilter enable
 !
@@ -202,6 +198,17 @@ interface Port-Channel26
    switchport phone trunk untagged
    switchport mode trunk phone
 !
+interface Port-Channel30
+   description DC1_L2LEAF6_Po1
+   no shutdown
+   switchport
+   switchport trunk allowed vlan 110-112,120-121,130-131,140-141,160-161,210-211,310-311,410-413,450-452
+   switchport mode trunk
+   evpn ethernet-segment
+      identifier 0000:0000:a8be:743c:0a1a
+      route-target import a8:be:74:3c:0a:1a
+   lacp system-id a8be.743c.0a1a
+!
 interface Port-Channel141
    description DC1_L2LEAF5_Po1
    no shutdown
@@ -332,6 +339,11 @@ interface Ethernet26
    no shutdown
    channel-group 26 mode active
 !
+interface Ethernet30
+   description DC1.L2LEAF6A_Ethernet1
+   no shutdown
+   channel-group 30 mode active
+!
 interface Ethernet49/1
    description P2P_LINK_TO_DC1-SPINE1_Ethernet3/1
    no shutdown

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg
@@ -171,10 +171,6 @@ interface Port-Channel11
    mtu 1600
    switchport
    switchport access vlan 110
-   evpn ethernet-segment
-      identifier 0000:0000:ca01:5ba3:6ffb
-      route-target import ca:01:5b:a3:6f:fb
-   lacp system-id ca01.5ba3.6ffb
    spanning-tree bpduguard enable
    spanning-tree bpdufilter enable
 !
@@ -202,6 +198,17 @@ interface Port-Channel26
    switchport phone trunk untagged
    switchport mode trunk phone
 !
+interface Port-Channel30
+   description DC1_L2LEAF6_Po1
+   no shutdown
+   switchport
+   switchport trunk allowed vlan 110-112,120-121,130-131,140-141,160-161,210-211,310-311,410-413,450-452
+   switchport mode trunk
+   evpn ethernet-segment
+      identifier 0000:0000:a8be:743c:0a1a
+      route-target import a8:be:74:3c:0a:1a
+   lacp system-id a8be.743c.0a1a
+!
 interface Port-Channel141
    description DC1_L2LEAF5_Po1
    no shutdown
@@ -296,6 +303,11 @@ interface Ethernet26
    no shutdown
    channel-group 26 mode active
 !
+interface Ethernet31
+   description DC1.L2LEAF6B_Ethernet1
+   no shutdown
+   channel-group 30 mode active
+!
 interface Ethernet49/1
    description P2P_LINK_TO_DC1-SPINE1_Ethernet5/1
    no shutdown

diff --git a/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1.L2LEAF6A.cfg b/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1.L2LEAF6A.cfg
@@ -112,7 +112,7 @@ vlan 4091
 vrf instance MGMT
 !
 interface Port-Channel1
-   description DC1_LEAF2_Po11
+   description DC1_LEAF2_Po30
    no shutdown
    switchport
    switchport trunk allowed vlan 110-112,120-121,130-131,140-141,160-161,210-211,310-311,410-413,450-452
@@ -127,7 +127,7 @@ interface Port-Channel3
    switchport trunk group MLAG
 !
 interface Ethernet1
-   description DC1-LEAF2A_Ethernet11
+   description DC1-LEAF2A_Ethernet30
    no shutdown
    channel-group 1 mode active
 !

diff --git a/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1.L2LEAF6B.cfg b/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1.L2LEAF6B.cfg
@@ -112,7 +112,7 @@ vlan 4091
 vrf instance MGMT
 !
 interface Port-Channel1
-   description DC1_LEAF2_Po11
+   description DC1_LEAF2_Po30
    no shutdown
    switchport
    switchport trunk allowed vlan 110-112,120-121,130-131,140-141,160-161,210-211,310-311,410-413,450-452
@@ -127,7 +127,7 @@ interface Port-Channel3
    switchport trunk group MLAG
 !
 interface Ethernet1
-   description DC1-LEAF2B_Ethernet12
+   description DC1-LEAF2B_Ethernet31
    no shutdown
    channel-group 1 mode active
 !

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml
@@ -491,17 +491,6 @@ ethernet_interfaces:
   channel_group:
     id: 9
     mode: active
-- name: Ethernet11
-  peer: server01_MTU_PROFILE_MLAG
-  peer_interface: Eth4
-  peer_type: server
-  description: server01_MTU_PROFILE_MLAG_Eth4
-  shutdown: false
-  type: port-channel-member
-  channel_group:
-    id: 11
-    mode: active
-  port_profile: TENANT_A_MTU
 - name: Ethernet13
   peer: DC1-L2LEAF4A
   peer_interface: Ethernet1
@@ -532,6 +521,16 @@ ethernet_interfaces:
   channel_group:
     id: 141
     mode: active
+- name: Ethernet30
+  peer: DC1.L2LEAF6A
+  peer_interface: Ethernet1
+  peer_type: l2leaf
+  description: DC1.L2LEAF6A_Ethernet1
+  shutdown: false
+  type: port-channel-member
+  channel_group:
+    id: 30
+    mode: active
 - name: Ethernet49/1
   peer: DC1-SPINE1
   peer_interface: Ethernet3/1
@@ -687,6 +686,17 @@ ethernet_interfaces:
   channel_group:
     id: 10
     mode: active
+- name: Ethernet11
+  peer: server01_MTU_PROFILE_MLAG
+  peer_interface: Eth4
+  peer_type: server
+  port_profile: TENANT_A_MTU
+  description: server01_MTU_PROFILE_MLAG_Eth4
+  shutdown: false
+  type: port-channel-member
+  channel_group:
+    id: 11
+    mode: active
 - name: Ethernet12
   peer: server01_MTU_ADAPTOR_MLAG
   peer_interface: Eth6
@@ -750,19 +760,6 @@ port_channel_interfaces:
     identifier: 0000:0000:0606:0707:0808
     route_target: 06:06:07:07:08:08
   lacp_id: 0606.0707.0808
-- name: Port-Channel11
-  description: server01_MTU_PROFILE_MLAG_PortChanne1
-  type: switched
-  shutdown: false
-  mode: access
-  vlans: '110'
-  evpn_ethernet_segment:
-    identifier: 0000:0000:ca01:5ba3:6ffb
-    route_target: ca:01:5b:a3:6f:fb
-  lacp_id: ca01.5ba3.6ffb
-  mtu: 1600
-  spanning_tree_bpdufilter: enabled
-  spanning_tree_bpduguard: enabled
 - name: Port-Channel1013
   description: DC1-L2LEAF4A_Po1001
   type: switched
@@ -783,6 +780,16 @@ port_channel_interfaces:
     identifier: 0000:0000:fa91:ce62:ce95
     route_target: fa:91:ce:62:ce:95
   lacp_id: fa91.ce62.ce95
+- name: Port-Channel30
+  description: DC1_L2LEAF6_Po1
+  type: switched
+  shutdown: false
+  mode: trunk
+  vlans: 110-112,120-121,130-131,140-141,160-161,210-211,310-311,410-413,450-452
+  evpn_ethernet_segment:
+    identifier: 0000:0000:a8be:743c:0a1a
+    route_target: a8:be:74:3c:0a:1a
+  lacp_id: a8be.743c.0a1a
 - name: Port-Channel10
   description: server01_MLAG_PortChanne1
   type: switched
@@ -791,6 +798,15 @@ port_channel_interfaces:
   vlans: 210-211
   spanning_tree_bpdufilter: disabled
   spanning_tree_bpduguard: disabled
+- name: Port-Channel11
+  description: server01_MTU_PROFILE_MLAG_PortChanne1
+  type: switched
+  shutdown: false
+  mtu: 1600
+  mode: access
+  vlans: '110'
+  spanning_tree_bpdufilter: enabled
+  spanning_tree_bpduguard: enabled
 - name: Port-Channel12
   description: server01_MTU_ADAPTOR_MLAG_PortChanne1
   type: switched

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml
@@ -491,16 +491,6 @@ ethernet_interfaces:
   channel_group:
     id: 9
     mode: active
-- name: Ethernet12
-  peer: server01_MTU_ADAPTOR_MLAG
-  peer_interface: Eth7
-  peer_type: server
-  description: server01_MTU_ADAPTOR_MLAG_Eth7
-  shutdown: false
-  type: port-channel-member
-  channel_group:
-    id: 12
-    mode: active
 - name: Ethernet13
   peer: DC1-L2LEAF4A
   peer_interface: Ethernet2
@@ -531,6 +521,16 @@ ethernet_interfaces:
   channel_group:
     id: 141
     mode: active
+- name: Ethernet31
+  peer: DC1.L2LEAF6B
+  peer_interface: Ethernet1
+  peer_type: l2leaf
+  description: DC1.L2LEAF6B_Ethernet1
+  shutdown: false
+  type: port-channel-member
+  channel_group:
+    id: 30
+    mode: active
 - name: Ethernet49/1
   peer: DC1-SPINE1
   peer_interface: Ethernet5/1
@@ -641,6 +641,16 @@ ethernet_interfaces:
   channel_group:
     id: 11
     mode: active
+- name: Ethernet12
+  peer: server01_MTU_ADAPTOR_MLAG
+  peer_interface: Eth7
+  peer_type: server
+  description: server01_MTU_ADAPTOR_MLAG_Eth7
+  shutdown: false
+  type: port-channel-member
+  channel_group:
+    id: 12
+    mode: active
 - name: Ethernet20
   peer: FIREWALL01
   peer_interface: E1
@@ -694,19 +704,6 @@ port_channel_interfaces:
     identifier: 0000:0000:0606:0707:0808
     route_target: 06:06:07:07:08:08
   lacp_id: 0606.0707.0808
-- name: Port-Channel11
-  description: server01_MTU_PROFILE_MLAG_PortChanne1
-  type: switched
-  shutdown: false
-  mode: access
-  vlans: '110'
-  evpn_ethernet_segment:
-    identifier: 0000:0000:ca01:5ba3:6ffb
-    route_target: ca:01:5b:a3:6f:fb
-  lacp_id: ca01.5ba3.6ffb
-  mtu: 1600
-  spanning_tree_bpdufilter: enabled
-  spanning_tree_bpduguard: enabled
 - name: Port-Channel1013
   description: DC1-L2LEAF4A_Po1001
   type: switched
@@ -727,6 +724,16 @@ port_channel_interfaces:
     identifier: 0000:0000:fa91:ce62:ce95
     route_target: fa:91:ce:62:ce:95
   lacp_id: fa91.ce62.ce95
+- name: Port-Channel30
+  description: DC1_L2LEAF6_Po1
+  type: switched
+  shutdown: false
+  mode: trunk
+  vlans: 110-112,120-121,130-131,140-141,160-161,210-211,310-311,410-413,450-452
+  evpn_ethernet_segment:
+    identifier: 0000:0000:a8be:743c:0a1a
+    route_target: a8:be:74:3c:0a:1a
+  lacp_id: a8be.743c.0a1a
 - name: Port-Channel10
   description: server01_MLAG_PortChanne1
   type: switched
@@ -735,6 +742,15 @@ port_channel_interfaces:
   vlans: 210-211
   spanning_tree_bpdufilter: disabled
   spanning_tree_bpduguard: disabled
+- name: Port-Channel11
+  description: server01_MTU_PROFILE_MLAG_PortChanne1
+  type: switched
+  shutdown: false
+  mtu: 1600
+  mode: access
+  vlans: '110'
+  spanning_tree_bpdufilter: enabled
+  spanning_tree_bpduguard: enabled
 - name: Port-Channel12
   description: server01_MTU_ADAPTOR_MLAG_PortChanne1
   type: switched

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1.L2LEAF6A.yml b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1.L2LEAF6A.yml
@@ -166,7 +166,7 @@ port_channel_interfaces:
   trunk_groups:
   - MLAG
 - name: Port-Channel1
-  description: DC1_LEAF2_Po11
+  description: DC1_LEAF2_Po30
   type: switched
   shutdown: false
   mode: trunk
@@ -195,9 +195,9 @@ ethernet_interfaces:
     mode: active
 - name: Ethernet1
   peer: DC1-LEAF2A
-  peer_interface: Ethernet11
+  peer_interface: Ethernet30
   peer_type: l3leaf
-  description: DC1-LEAF2A_Ethernet11
+  description: DC1-LEAF2A_Ethernet30
   shutdown: false
   type: port-channel-member
   channel_group:

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1.L2LEAF6B.yml b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1.L2LEAF6B.yml
@@ -166,7 +166,7 @@ port_channel_interfaces:
   trunk_groups:
   - MLAG
 - name: Port-Channel1
-  description: DC1_LEAF2_Po11
+  description: DC1_LEAF2_Po30
   type: switched
   shutdown: false
   mode: trunk
@@ -195,9 +195,9 @@ ethernet_interfaces:
     mode: active
 - name: Ethernet1
   peer: DC1-LEAF2B
-  peer_interface: Ethernet12
+  peer_interface: Ethernet31
   peer_type: l3leaf
-  description: DC1-LEAF2B_Ethernet12
+  description: DC1-LEAF2B_Ethernet31
   shutdown: false
   type: port-channel-member
   channel_group:

diff --git a/...ollections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_FABRIC.yml b/...ollections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_FABRIC.yml
@@ -376,12 +376,12 @@ l2leaf:
           id: 16
           mgmt_ip: 192.168.200.122/24
           uplink_switches: [ DC1-LEAF2A ]
-          uplink_switch_interfaces: [ Ethernet11 ]
+          uplink_switch_interfaces: [ Ethernet30 ]
         - name: DC1.L2LEAF6B
           id: 17
           mgmt_ip: 192.168.200.123/24
           uplink_switches: [ DC1-LEAF2B ]
-          uplink_switch_interfaces: [ Ethernet12 ]
+          uplink_switch_interfaces: [ Ethernet31 ]
 
 # Update p2p mtu 9000 -> 1500
 p2p_uplinks_mtu: 1500