Feat(eos_designs): MLAG secondary should use short-esi from MLAG prim…

…ary (#4172)
aristanetworks · Jul 26, 2024 · 9af8ff4 · 9af8ff4
1 parent 410b7b5
commit 9af8ff4
Show file tree

Hide file tree

Showing 11 changed files with 889 additions and 0 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
@@ -198,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
@@ -328,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
@@ -198,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
@@ -292,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
@@ -0,0 +1,176 @@
+!RANCID-CONTENT-TYPE: arista
+!
+boot secret sha512 a153de6290ff1409257ade45f
+!
+daemon TerminAttr
+   exec /usr/bin/TerminAttr -cvaddr=192.168.200.11:9910 -cvauth=key,telarista -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
+   no shutdown
+!
+vlan internal order ascending range 1006 1199
+!
+no ip igmp snooping vlan 120
+!
+transceiver qsfp default-mode 4x10G
+!
+service routing protocols model multi-agent
+!
+hostname DC1.L2LEAF6A
+ip name-server vrf MGMT 8.8.8.8
+ip name-server vrf MGMT 192.168.200.5
+ip name-server vrf MGMT 2001:db8::1
+ip name-server vrf MGMT 2001:db8::2
+!
+ntp local-interface vrf MGMT Management1
+ntp server vrf MGMT 192.168.200.5 prefer
+ntp server vrf MGMT 2001:db8::3
+!
+snmp-server contact [email protected]
+snmp-server location EOS_DESIGNS_UNIT_TESTS rackE DC1.L2LEAF6A
+!
+spanning-tree mode mstp
+no spanning-tree vlan-id 4091
+spanning-tree mst 0 priority 16384
+!
+no enable password
+no aaa root
+!
+no username admin
+username cvpadmin privilege 15 role network-admin secret sha512 $6$rZKcbIZ7iWGAWTUM$TCgDn1KcavS0s.OV8lacMTUkxTByfzcGlFlYUWroxYuU7M/9bIodhRO7nXGzMweUxvbk8mJmQl8Bh44cRktUj.
+username cvpadmin ssh-key ssh-rsa AAAAB3NzaC1yc2EAA82spi2mkxp4FgaLi4CjWkpnL1A/MD7WhrSNgqXToF7QCb9Lidagy9IHafQxfu7LwkFdyQIMu8XNwDZIycuf29wHbDdz1N+YNVK8zwyNAbMOeKMqblsEm2YIorgjzQX1m9+/rJeFBKz77PSgeMp/Rc3txFVuSmFmeTy3aMkU= [email protected]
+username cvpadmin ssh-key secondary ssh-rsa AAAAB3NzaC1yc2EAA82spi2mkxp4FgaLi4CjWkpnL1A/MD7WhrSNgqXToF7QCb9Lidagy9IHafQxfu7LwkFdyQIMu8XNwDZIycuf29wHbDdz1N+YNVK8zwyNAbMOeKMqblsEm2YIorgjzQX1m9+/rJeFBKz77PSgeMp/Rc3txFVuSmFmeTy3aMkz= [email protected]
+!
+vlan 110
+   name Tenant_A_OP_Zone_1
+!
+vlan 111
+   name Tenant_A_OP_Zone_2
+!
+vlan 112
+   name Tenant_A_OP_Zone_3
+!
+vlan 120
+   name Tenant_A_WEB_Zone_1
+!
+vlan 121
+   name Tenant_A_WEBZone_2
+!
+vlan 130
+   name Tenant_A_APP_Zone_1
+!
+vlan 131
+   name Tenant_A_APP_Zone_2
+!
+vlan 140
+   name Tenant_A_DB_BZone_1
+!
+vlan 141
+   name Tenant_A_DB_Zone_2
+!
+vlan 160
+   name Tenant_A_VMOTION
+!
+vlan 161
+   name Tenant_A_NFS
+!
+vlan 210
+   name Tenant_B_OP_Zone_1
+!
+vlan 211
+   name Tenant_B_OP_Zone_2
+!
+vlan 310
+   name Tenant_C_OP_Zone_1
+!
+vlan 311
+   name Tenant_C_OP_Zone_2
+!
+vlan 410
+   name Tenant_D_v6_OP_Zone_1
+!
+vlan 411
+   name Tenant_D_v6_OP_Zone_2
+!
+vlan 412
+   name Tenant_D_v6_OP_Zone_1
+!
+vlan 413
+   name Tenant_D_v6_OP_Zone_3
+!
+vlan 450
+   name Tenant_D_v6_WAN_Zone_1
+!
+vlan 451
+   name Tenant_D_v6_WAN_Zone_2
+!
+vlan 452
+   name Tenant_D_v6_WAN_Zone_3
+!
+vlan 4091
+   name MLAG_PEER
+   trunk group MLAG
+!
+vrf instance MGMT
+!
+interface Port-Channel1
+   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
+   switchport mode trunk
+   mlag 1
+!
+interface Port-Channel3
+   description MLAG_PEER_DC1.L2LEAF6B_Po3
+   no shutdown
+   switchport
+   switchport mode trunk
+   switchport trunk group MLAG
+!
+interface Ethernet1
+   description DC1-LEAF2A_Ethernet30
+   no shutdown
+   channel-group 1 mode active
+!
+interface Ethernet3
+   description MLAG_PEER_DC1.L2LEAF6B_Ethernet3
+   no shutdown
+   channel-group 3 mode active
+!
+interface Ethernet4
+   description MLAG_PEER_DC1.L2LEAF6B_Ethernet4
+   no shutdown
+   channel-group 3 mode active
+!
+interface Management1
+   description oob_management
+   no shutdown
+   vrf MGMT
+   ip address 192.168.200.122/24
+!
+interface Vlan4091
+   description MLAG_PEER
+   no shutdown
+   mtu 1500
+   no autostate
+   ip address 10.255.252.30/31
+no ip routing vrf MGMT
+!
+mlag configuration
+   domain-id DC1_L2LEAF6
+   local-interface Vlan4091
+   peer-address 10.255.252.31
+   peer-link Port-Channel3
+   reload-delay mlag 300
+   reload-delay non-mlag 330
+!
+ip route vrf MGMT 0.0.0.0/0 192.168.200.5
+!
+management api http-commands
+   protocol https
+   no default-services
+   no shutdown
+   !
+   vrf MGMT
+      no shutdown
+!
+end