Refactor: Address PR comments

aristanetworks · Feb 22, 2024 · 327fd9e · 327fd9e
1 parent 90c7e7e
commit 327fd9e
Show file tree

Hide file tree

Showing 17 changed files with 568 additions and 147 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
@@ -175,6 +175,22 @@ interface Ethernet52
    flow tracker hardware WAN-FLOW-TRACKER
    ip address 172.17.0.3/31
 !
+interface Ethernet52.142
+   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet2.142_vrf_PROD
+   no shutdown
+   mtu 9214
+   encapsulation dot1q vlan 142
+   vrf PROD
+   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 1000
+   vrf IT
+   ip address 172.17.0.3/31
+!
 interface Loopback0
    description Router_ID
    no shutdown
@@ -339,6 +355,9 @@ router bgp 65000
       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 65000
+      neighbor 172.17.0.2 peer group IPv4-UNDERLAY-PEERS
+      neighbor 172.17.0.2 description site-ha-disabled-leaf_Ethernet2.1000_vrf_IT
       redistribute connected
       redistribute static
    !
@@ -347,6 +366,9 @@ router bgp 65000
       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 65000
+      neighbor 172.17.0.2 peer group IPv4-UNDERLAY-PEERS
+      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
@@ -223,6 +223,22 @@ interface Ethernet52
    flow tracker hardware WAN-FLOW-TRACKER
    ip address 172.17.0.1/31
 !
+interface Ethernet52.142
+   description P2P_LINK_TO_SITE-HA-DISABLED-LEAF_Ethernet1.142_vrf_PROD
+   no shutdown
+   mtu 9214
+   encapsulation dot1q vlan 142
+   vrf PROD
+   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 1000
+   vrf IT
+   ip address 172.17.0.1/31
+!
 interface Loopback0
    description Router_ID
    no shutdown
@@ -395,6 +411,9 @@ router bgp 65000
       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 65000
+      neighbor 172.17.0.0 peer group IPv4-UNDERLAY-PEERS
+      neighbor 172.17.0.0 description site-ha-disabled-leaf_Ethernet1.1000_vrf_IT
       redistribute connected
       redistribute static
    !
@@ -403,6 +422,9 @@ router bgp 65000
       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 65000
+      neighbor 172.17.0.0 peer group IPv4-UNDERLAY-PEERS
+      neighbor 172.17.0.0 description site-ha-disabled-leaf_Ethernet1.142_vrf_PROD
       redistribute connected
 !
 router traffic-engineering

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit.cfg
@@ -176,6 +176,8 @@ vrf instance IT
 !
 vrf instance MGMT
 !
+vrf instance NOT-WAN-VRF
+!
 vrf instance PROD
 !
 vrf instance TRANSIT
@@ -298,6 +300,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
 !

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-disabled-leaf.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/site-ha-disabled-leaf.cfg
@@ -11,25 +11,64 @@ hostname site-ha-disabled-leaf
 no enable password
 no aaa root
 !
+vlan 100
+   name VLAN100
+!
 vlan 101
    name VLAN101
 !
+vrf instance IT
+!
 vrf instance MGMT
 !
+vrf instance PROD
+!
 interface Ethernet1
    description P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52
    no shutdown
    mtu 9214
    no switchport
    ip address 172.17.0.0/31
 !
+interface Ethernet1.142
+   description P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52.142_vrf_PROD
+   no shutdown
+   mtu 9214
+   encapsulation dot1q vlan 142
+   vrf PROD
+   ip address 172.17.0.0/31
+!
+interface Ethernet1.1000
+   description P2P_LINK_TO_CV-PATHFINDER-EDGE_Ethernet52.1000_vrf_IT
+   no shutdown
+   mtu 9214
+   encapsulation dot1q vlan 1000
+   vrf IT
+   ip address 172.17.0.0/31
+!
 interface Ethernet2
    description P2P_LINK_TO_CV-PATHFINDER-EDGE-NO-COMMON-PATH-GROUP_Ethernet52
    no shutdown
    mtu 9214
    no switchport
    ip address 172.17.0.2/31
 !
+interface Ethernet2.142
+   description P2P_LINK_TO_CV-PATHFINDER-EDGE-NO-COMMON-PATH-GROUP_Ethernet52.142_vrf_PROD
+   no shutdown
+   mtu 9214
+   encapsulation dot1q vlan 142
+   vrf PROD
+   ip address 172.17.0.2/31
+!
+interface Ethernet2.1000
+   description P2P_LINK_TO_CV-PATHFINDER-EDGE-NO-COMMON-PATH-GROUP_Ethernet52.1000_vrf_IT
+   no shutdown
+   mtu 9214
+   encapsulation dot1q vlan 1000
+   vrf IT
+   ip address 172.17.0.2/31
+!
 interface Loopback0
    description EVPN_Overlay_Peering
    no shutdown
@@ -40,24 +79,50 @@ interface Loopback1
    no shutdown
    ip address 192.168.255.3/32
 !
+interface Vlan100
+   description VLAN100
+   shutdown
+   vrf PROD
+   ip address virtual 10.0.100.1/24
+!
 interface Vxlan1
    description site-ha-disabled-leaf_VTEP
    vxlan source-interface Loopback1
    vxlan udp-port 4789
+   vxlan vlan 100 vni 1100
    vxlan vlan 101 vni 1101
+   vxlan vrf default vni 1
+   vxlan vrf IT vni 1000
+   vxlan vrf PROD vni 142
 !
 ip virtual-router mac-address 00:1c:73:00:00:01
 !
 ip routing
+ip routing vrf IT
 no ip routing vrf MGMT
+ip routing vrf PROD
 !
 ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
    seq 10 permit 192.168.45.0/24 eq 32
    seq 20 permit 192.168.255.0/24 eq 32
 !
+ip prefix-list PL-STATIC-VRF-DEFAULT
+   seq 10 permit 172.0.0.0/8
+!
+ip route 172.0.0.0/8 172.2.10.100
+ip route vrf IT 10.0.0.0/8 10.2.10.100
+!
+route-map RM-BGP-UNDERLAY-PEERS-OUT deny 15
+   match ip address prefix-list PL-STATIC-VRF-DEFAULT
+!
+route-map RM-BGP-UNDERLAY-PEERS-OUT permit 20
+!
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !
+route-map RM-EVPN-EXPORT-VRF-DEFAULT permit 20
+   match ip address prefix-list PL-STATIC-VRF-DEFAULT
+!
 router bfd
    multihop interval 300 min-rx 300 multiplier 3
 !
@@ -75,13 +140,20 @@ router bgp 65000
    neighbor IPv4-UNDERLAY-PEERS peer group
    neighbor IPv4-UNDERLAY-PEERS send-community
    neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
+   neighbor IPv4-UNDERLAY-PEERS route-map RM-BGP-UNDERLAY-PEERS-OUT out
    neighbor 172.17.0.1 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.17.0.1 remote-as 65000
    neighbor 172.17.0.1 description cv-pathfinder-edge_Ethernet52
    neighbor 172.17.0.3 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.17.0.3 remote-as 65000
    neighbor 172.17.0.3 description cv-pathfinder-edge-no-common-path-group_Ethernet52
    redistribute connected route-map RM-CONN-2-BGP
+   redistribute static
+   !
+   vlan 100
+      rd 192.168.45.3:1100
+      route-target both 1100:1100
+      redistribute learned
    !
    vlan 101
       rd 192.168.45.3:1101
@@ -94,6 +166,39 @@ router bgp 65000
    address-family ipv4
       no neighbor EVPN-OVERLAY-PEERS activate
       neighbor IPv4-UNDERLAY-PEERS activate
+   !
+   vrf default
+      rd 192.168.45.3: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.45.3:1000
+      route-target import evpn 1000:1000
+      route-target export evpn 1000:1000
+      router-id 192.168.45.3
+      neighbor 172.17.0.1 remote-as 65000
+      neighbor 172.17.0.1 peer group IPv4-UNDERLAY-PEERS
+      neighbor 172.17.0.1 description cv-pathfinder-edge_Ethernet52.1000_vrf_IT
+      neighbor 172.17.0.3 remote-as 65000
+      neighbor 172.17.0.3 peer group IPv4-UNDERLAY-PEERS
+      neighbor 172.17.0.3 description cv-pathfinder-edge-no-common-path-group_Ethernet52.1000_vrf_IT
+      redistribute connected
+      redistribute static
+   !
+   vrf PROD
+      rd 192.168.45.3:142
+      route-target import evpn 142:142
+      route-target export evpn 142:142
+      router-id 192.168.45.3
+      neighbor 172.17.0.1 remote-as 65000
+      neighbor 172.17.0.1 peer group IPv4-UNDERLAY-PEERS
+      neighbor 172.17.0.1 description cv-pathfinder-edge_Ethernet52.142_vrf_PROD
+      neighbor 172.17.0.3 remote-as 65000
+      neighbor 172.17.0.3 peer group IPv4-UNDERLAY-PEERS
+      neighbor 172.17.0.3 description cv-pathfinder-edge-no-common-path-group_Ethernet52.142_vrf_PROD
+      redistribute connected
 !
 management api http-commands
    protocol https

diff --git a/...ule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge-no-default-policy.yml b/...ule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge-no-default-policy.yml
@@ -52,6 +52,18 @@ router_bgp:
     peer: autovpn-rr3
     description: autovpn-rr3
   vrfs:
+  - name: default
+    rd: 192.168.30.1:1
+    route_targets:
+      import:
+      - address_family: evpn
+        route_targets:
+        - '1:1'
+      export:
+      - address_family: evpn
+        route_targets:
+        - '1:1'
+        - route-map RM-EVPN-EXPORT-VRF-DEFAULT
   - name: IT
     router_id: 192.168.30.1
     rd: 192.168.30.1:100
@@ -80,18 +92,6 @@ router_bgp:
         - '42:42'
     redistribute_routes:
     - source_protocol: connected
-  - name: default
-    rd: 192.168.30.1:1
-    route_targets:
-      import:
-      - address_family: evpn
-        route_targets:
-        - '1:1'
-      export:
-      - address_family: evpn
-        route_targets:
-        - '1:1'
-        - route-map RM-EVPN-EXPORT-VRF-DEFAULT
 service_routing_protocols_model: multi-agent
 ip_routing: true
 transceiver_qsfp_default_mode_4x10: false
@@ -253,9 +253,9 @@ vxlan_interface:
       udp_port: 4789
       source_interface: Dps1
       vrfs:
+      - name: default
+        vni: 1
       - name: IT
         vni: 100
       - name: PROD
         vni: 42
-      - name: default
-        vni: 1
diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml
@@ -56,6 +56,18 @@ router_bgp:
     peer: autovpn-rr2
     description: autovpn-rr2
   vrfs:
+  - name: default
+    rd: 192.168.30.1:1
+    route_targets:
+      import:
+      - address_family: evpn
+        route_targets:
+        - '1:1'
+      export:
+      - address_family: evpn
+        route_targets:
+        - '1:1'
+        - route-map RM-EVPN-EXPORT-VRF-DEFAULT
   - name: IT
     router_id: 192.168.30.1
     rd: 192.168.30.1:100
@@ -84,18 +96,6 @@ router_bgp:
         - '42:42'
     redistribute_routes:
     - source_protocol: connected
-  - name: default
-    rd: 192.168.30.1:1
-    route_targets:
-      import:
-      - address_family: evpn
-        route_targets:
-        - '1:1'
-      export:
-      - address_family: evpn
-        route_targets:
-        - '1:1'
-        - route-map RM-EVPN-EXPORT-VRF-DEFAULT
 service_routing_protocols_model: multi-agent
 ip_routing: true
 transceiver_qsfp_default_mode_4x10: false
@@ -291,9 +291,9 @@ vxlan_interface:
       udp_port: 4789
       source_interface: Dps1
       vrfs:
+      - name: default
+        vni: 1
       - name: IT
         vni: 100
       - name: PROD
         vni: 42
-      - name: default
-        vni: 1