Feat(eos_designs): Add wan_vni for WAN VRF

aristanetworks · Feb 23, 2024 · d602bb1 · d602bb1
1 parent fc15e22
commit d602bb1
Show file tree

Hide file tree

Showing 23 changed files with 618 additions and 127 deletions.
diff --git a/...ecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-common-path-group.cfg b/...ecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-common-path-group.cfg
@@ -117,6 +117,8 @@ spanning-tree mode none
 no enable password
 no aaa root
 !
+vrf instance ATTRACTED-VRF-FROM-UPLINK
+!
 vrf instance IT
 !
 vrf instance MGMT
@@ -175,19 +177,27 @@ interface Ethernet52
    flow tracker hardware WAN-FLOW-TRACKER
    ip address 172.17.0.3/31
 !
-interface Ethernet52.42
-   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.42_vrf_PROD
+interface Ethernet52.142
+   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.142_vrf_PROD
    no shutdown
    mtu 9214
-   encapsulation dot1q vlan 42
+   encapsulation dot1q vlan 142
    vrf PROD
    ip address 172.17.0.3/31
 !
-interface Ethernet52.100
-   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.100_vrf_IT
+interface Ethernet52.666
+   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK
+   no shutdown
+   mtu 9214
+   encapsulation dot1q vlan 666
+   vrf ATTRACTED-VRF-FROM-UPLINK
+   ip address 172.17.0.3/31
+!
+interface Ethernet52.1000
+   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.1000_vrf_IT
    no shutdown
    mtu 9214
-   encapsulation dot1q vlan 100
+   encapsulation dot1q vlan 1000
    vrf IT
    ip address 172.17.0.3/31
 !
@@ -200,6 +210,7 @@ interface Vxlan1
    description cv-pathfinder-edge-no-common-path-group_VTEP
    vxlan source-interface Dps1
    vxlan udp-port 4789
+   vxlan vrf ATTRACTED-VRF-FROM-UPLINK vni 166
    vxlan vrf default vni 1
    vxlan vrf IT vni 100
    vxlan vrf PROD vni 42
@@ -247,6 +258,7 @@ application traffic recognition
       42
 !
 ip routing
+ip routing vrf ATTRACTED-VRF-FROM-UPLINK
 ip routing vrf IT
 no ip routing vrf MGMT
 ip routing vrf PROD
@@ -329,30 +341,40 @@ router bgp 65000
       bgp additional-paths send any
       neighbor WAN-OVERLAY-PEERS activate
    !
+   vrf ATTRACTED-VRF-FROM-UPLINK
+      rd 192.168.42.2:666
+      route-target import evpn 666:666
+      route-target export evpn 666:666
+      router-id 192.168.42.2
+      neighbor 172.17.0.2 remote-as 65000
+      neighbor 172.17.0.2 peer group IPv4-UNDERLAY-PEERS
+      neighbor 172.17.0.2 description site-ha-disabled-leaf_Ethernet2.666_vrf_ATTRACTED-VRF-FROM-UPLINK
+      redistribute connected
+   !
    vrf default
       rd 192.168.42.2:1
       route-target import evpn 1:1
       route-target export evpn 1:1
       route-target export evpn route-map RM-EVPN-EXPORT-VRF-DEFAULT
    !
    vrf IT
-      rd 192.168.42.2:100
-      route-target import evpn 100:100
-      route-target export evpn 100:100
+      rd 192.168.42.2:1000
+      route-target import evpn 1000:1000
+      route-target export evpn 1000:1000
       router-id 192.168.42.2
       neighbor 172.17.0.2 remote-as 65199
       neighbor 172.17.0.2 peer group IPv4-UNDERLAY-PEERS
-      neighbor 172.17.0.2 description site-ha-disabled-leaf_Ethernet2.100_vrf_IT
+      neighbor 172.17.0.2 description site-ha-disabled-leaf_Ethernet2.1000_vrf_IT
       redistribute connected
    !
    vrf PROD
-      rd 192.168.42.2:42
-      route-target import evpn 42:42
-      route-target export evpn 42:42
+      rd 192.168.42.2:142
+      route-target import evpn 142:142
+      route-target export evpn 142:142
       router-id 192.168.42.2
       neighbor 172.17.0.2 remote-as 65199
       neighbor 172.17.0.2 peer group IPv4-UNDERLAY-PEERS
-      neighbor 172.17.0.2 description site-ha-disabled-leaf_Ethernet2.42_vrf_PROD
+      neighbor 172.17.0.2 description site-ha-disabled-leaf_Ethernet2.142_vrf_PROD
       redistribute connected
 !
 router traffic-engineering

diff --git a/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg b/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg
@@ -153,6 +153,8 @@ spanning-tree mode none
 no enable password
 no aaa root
 !
+vrf instance ATTRACTED-VRF-FROM-UPLINK
+!
 vrf instance IT
 !
 vrf instance MGMT
@@ -223,19 +225,27 @@ interface Ethernet52
    flow tracker hardware WAN-FLOW-TRACKER
    ip address 172.17.0.1/31
 !
-interface Ethernet52.42
-   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.42_vrf_PROD
+interface Ethernet52.142
+   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.142_vrf_PROD
    no shutdown
    mtu 9214
-   encapsulation dot1q vlan 42
+   encapsulation dot1q vlan 142
    vrf PROD
    ip address 172.17.0.1/31
 !
-interface Ethernet52.100
-   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.100_vrf_IT
+interface Ethernet52.666
+   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK
+   no shutdown
+   mtu 9214
+   encapsulation dot1q vlan 666
+   vrf ATTRACTED-VRF-FROM-UPLINK
+   ip address 172.17.0.1/31
+!
+interface Ethernet52.1000
+   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.1000_vrf_IT
    no shutdown
    mtu 9214
-   encapsulation dot1q vlan 100
+   encapsulation dot1q vlan 1000
    vrf IT
    ip address 172.17.0.1/31
 !
@@ -248,6 +258,7 @@ interface Vxlan1
    description cv-pathfinder-edge_VTEP
    vxlan source-interface Dps1
    vxlan udp-port 4789
+   vxlan vrf ATTRACTED-VRF-FROM-UPLINK vni 166
    vxlan vrf default vni 1
    vxlan vrf IT vni 100
    vxlan vrf PROD vni 42
@@ -296,6 +307,7 @@ application traffic recognition
       42
 !
 ip routing
+ip routing vrf ATTRACTED-VRF-FROM-UPLINK
 ip routing vrf IT
 no ip routing vrf MGMT
 ip routing vrf PROD
@@ -393,30 +405,40 @@ router bgp 65000
       bgp additional-paths send any
       neighbor WAN-OVERLAY-PEERS activate
    !
+   vrf ATTRACTED-VRF-FROM-UPLINK
+      rd 192.168.42.1:666
+      route-target import evpn 666:666
+      route-target export evpn 666:666
+      router-id 192.168.42.1
+      neighbor 172.17.0.0 remote-as 65000
+      neighbor 172.17.0.0 peer group IPv4-UNDERLAY-PEERS
+      neighbor 172.17.0.0 description site-ha-disabled-leaf_Ethernet1.666_vrf_ATTRACTED-VRF-FROM-UPLINK
+      redistribute connected
+   !
    vrf default
       rd 192.168.42.1:1
       route-target import evpn 1:1
       route-target export evpn 1:1
       route-target export evpn route-map RM-EVPN-EXPORT-VRF-DEFAULT
    !
    vrf IT
-      rd 192.168.42.1:100
-      route-target import evpn 100:100
-      route-target export evpn 100:100
+      rd 192.168.42.1:1000
+      route-target import evpn 1000:1000
+      route-target export evpn 1000:1000
       router-id 192.168.42.1
       neighbor 172.17.0.0 remote-as 65199
       neighbor 172.17.0.0 peer group IPv4-UNDERLAY-PEERS
-      neighbor 172.17.0.0 description site-ha-disabled-leaf_Ethernet1.100_vrf_IT
+      neighbor 172.17.0.0 description site-ha-disabled-leaf_Ethernet1.1000_vrf_IT
       redistribute connected
    !
    vrf PROD
-      rd 192.168.42.1:42
-      route-target import evpn 42:42
-      route-target export evpn 42:42
+      rd 192.168.42.1:142
+      route-target import evpn 142:142
+      route-target export evpn 142:142
       router-id 192.168.42.1
       neighbor 172.17.0.0 remote-as 65199
       neighbor 172.17.0.0 peer group IPv4-UNDERLAY-PEERS
-      neighbor 172.17.0.0 description site-ha-disabled-leaf_Ethernet1.42_vrf_PROD
+      neighbor 172.17.0.0 description site-ha-disabled-leaf_Ethernet1.142_vrf_PROD
       redistribute connected
 !
 router traffic-engineering

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg
@@ -193,6 +193,8 @@ vrf instance IT
 !
 vrf instance MGMT
 !
+vrf instance NOT-WAN-VRF
+!
 vrf instance PROD
 !
 vrf instance TRANSIT
@@ -343,6 +345,7 @@ application traffic recognition
 ip routing
 ip routing vrf IT
 no ip routing vrf MGMT
+ip routing vrf NOT-WAN-VRF
 ip routing vrf PROD
 ip routing vrf TRANSIT
 !
@@ -463,19 +466,19 @@ router bgp 65000
       route-target export evpn route-map RM-EVPN-EXPORT-VRF-DEFAULT
    !
    vrf IT
-      rd 192.168.43.1:100
-      route-target import evpn 100:100
-      route-target export evpn 100:100
+      rd 192.168.43.1:1000
+      route-target import evpn 1000:1000
+      route-target export evpn 1000:1000
       router-id 192.168.43.1
       neighbor 172.17.0.0 remote-as 65199
       neighbor 172.17.0.0 peer group IPv4-UNDERLAY-PEERS
       neighbor 172.17.0.0 description site-ha-enabled-leaf1_Ethernet1.100_vrf_IT
       redistribute connected
    !
    vrf PROD
-      rd 192.168.43.1:42
-      route-target import evpn 42:42
-      route-target export evpn 42:42
+      rd 192.168.43.1:142
+      route-target import evpn 142:142
+      route-target export evpn 142:142
       router-id 192.168.43.1
       neighbor 172.17.0.0 remote-as 65199
       neighbor 172.17.0.0 peer group IPv4-UNDERLAY-PEERS