Feat(eos_designs): Add WAN interface configuration under `l3_edge.l3_…

…interfaces` (#3440)
aristanetworks · Jan 5, 2024 · 1045709 · 1045709
1 parent b06ec1b
commit 1045709
Show file tree

Hide file tree

Showing 52 changed files with 1,734 additions and 205 deletions.
diff --git a/...designs_negative_unit_tests/inventory/host_vars/invalid-wan-role-cv-pathfinder-role-1.yml b/...designs_negative_unit_tests/inventory/host_vars/invalid-wan-role-cv-pathfinder-role-1.yml
@@ -4,6 +4,14 @@ type: wan_edge
 
 bgp_as: 65000
 
+wan_carriers:
+  - name: MPLS
+    path_group: MPLS
+
+wan_path_groups:
+  - name: MPLS
+    id: 42
+
 wan_edge:
   defaults:
     loopback_ipv4_pool: 192.168.0.0/24

diff --git a/...designs_negative_unit_tests/inventory/host_vars/invalid-wan-role-cv-pathfinder-role-2.yml b/...designs_negative_unit_tests/inventory/host_vars/invalid-wan-role-cv-pathfinder-role-2.yml
@@ -4,6 +4,14 @@ type: wan_rr
 
 bgp_as: 65000
 
+wan_carriers:
+  - name: MPLS
+    path_group: MPLS
+
+wan_path_groups:
+  - name: MPLS
+    id: 42
+
 wan_rr:
   defaults:
     loopback_ipv4_pool: 192.168.0.0/24

diff --git a/...gns_negative_unit_tests/inventory/host_vars/invalid-wan-role-overlay-routing-protocol.yml b/...gns_negative_unit_tests/inventory/host_vars/invalid-wan-role-overlay-routing-protocol.yml
@@ -1,6 +1,7 @@
 ---
 wan_mode: autovpn
 type: wan_edge
+fabric_name: fabric_wan_role_overlay_routing_protocol
 
 # Not ibgp
 overlay_routing_protocol: none

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml
@@ -45,6 +45,9 @@ all:
             invalid-uplink-port-channel-id-l3leaf-2:
             invalid-uplink-port-channel-id-l2leaf-1:
             invalid-uplink-port-channel-id-l2leaf-2:
+        fabric_wan_role_overlay_routing_protocol:
+          hosts:
+            invalid-wan-role-overlay-routing-protocol:
     EOS_DESIGNS_FAILURES: # Add cases that fail during 'eos_designs_structured_config' phase
       hosts:
         failure-port-channel:
@@ -79,7 +82,6 @@ all:
         failure-duplicate-evpn-vlan-bundle-name:
         ntp-settings-server-vrf-missing-mgmt-ip:
         ntp-settings-server-vrf-missing-inband-mgmt-interface:
-        invalid-wan-role-overlay-routing-protocol:
         invalid-wan-role-cv-pathfinder-role-1:
         invalid-wan-role-cv-pathfinder-role-2:
         source-interfaces-domain-lookup-duplicate-vrf:

diff --git a/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-edge.cfg b/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-edge.cfg
@@ -10,7 +10,24 @@ hostname autovpn-edge
 !
 router path-selection
    !
+   path-group INET id 101
+      ipsec profile AUTOVPN
+      !
+      local interface Ethernet1
+         stun server-profile INET-autovpn-rr1-Ethernet1 INET-autovpn-rr2-Ethernet1
+      !
+      peer dynamic
+      !
+      peer static router-ip 192.168.31.1
+         name autovpn-rr1
+         ipv4 address 10.7.7.7
+      !
+      peer static router-ip 192.168.31.2
+         name autovpn-rr2
+         ipv4 address 10.8.8.8
+   !
    load-balance policy LBPOLICY
+      path-group INET
    !
    policy dps-policy-default
       default-match
@@ -48,6 +65,12 @@ interface Dps1
    description DPS Interface
    tcp mss ceiling ipv4 1000
 !
+interface Ethernet1
+   no shutdown
+   no switchport
+   ip address dhcp
+   dhcp client accept default-route
+!
 interface Loopback0
    description Router_ID
    no shutdown
@@ -100,4 +123,11 @@ management api http-commands
    vrf MGMT
       no shutdown
 !
+stun
+   client
+      server-profile INET-autovpn-rr1-Ethernet1
+         ip address 10.7.7.7
+      server-profile INET-autovpn-rr2-Ethernet1
+         ip address 10.8.8.8
+!
 end
diff --git a/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr1.cfg b/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr1.cfg
@@ -11,7 +11,17 @@ hostname autovpn-rr1
 router path-selection
    peer dynamic source stun
    !
+   path-group INET id 101
+      ipsec profile AUTOVPN
+      !
+      local interface Ethernet1
+      !
+      peer static router-ip 192.168.31.2
+         name autovpn-rr2
+         ipv4 address 10.8.8.8
+   !
    load-balance policy LBPOLICY
+      path-group INET
    !
    policy dps-policy-default
       default-match
@@ -46,6 +56,12 @@ interface Dps1
    description DPS Interface
    tcp mss ceiling ipv4 1000
 !
+interface Ethernet1
+   no shutdown
+   no switchport
+   ip address dhcp
+   dhcp client accept default-route
+!
 interface Loopback0
    description Router_ID
    no shutdown
@@ -111,5 +127,6 @@ management api http-commands
 !
 stun
    server
+      local-interface Ethernet1
 !
 end
diff --git a/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr2.cfg b/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr2.cfg
@@ -11,7 +11,17 @@ hostname autovpn-rr2
 router path-selection
    peer dynamic source stun
    !
+   path-group INET id 101
+      ipsec profile AUTOVPN
+      !
+      local interface Ethernet1
+      !
+      peer static router-ip 192.168.31.1
+         name autovpn-rr1
+         ipv4 address 10.7.7.7
+   !
    load-balance policy LBPOLICY
+      path-group INET
    !
    policy dps-policy-default
       default-match
@@ -46,6 +56,11 @@ interface Dps1
    description DPS Interface
    tcp mss ceiling ipv4 1000
 !
+interface Ethernet1
+   no shutdown
+   no switchport
+   ip address 10.8.8.8/31
+!
 interface Loopback0
    description Router_ID
    no shutdown
@@ -60,6 +75,8 @@ interface Vxlan1
 ip routing
 no ip routing vrf MGMT
 !
+ip route 0.0.0.0/0 10.8.8.9
+!
 router bfd
    multihop interval 300 min-rx 300 multiplier 3
 !
@@ -111,5 +128,6 @@ management api http-commands
 !
 stun
    server
+      local-interface Ethernet1
 !
 end
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
@@ -19,7 +19,28 @@ hostname cv-pathfinder-edge
 !
 router path-selection
    !
+   path-group INET id 101
+      ipsec profile CP-PROFILE
+      !
+      local interface Ethernet1
+         stun server-profile INET-cv-pathfinder-pathfinder-Ethernet1 INET-cv-pathfinder-pathfinder-Ethernet3
+      !
+      peer dynamic
+      !
+      peer static router-ip 192.168.44.1
+         name cv-pathfinder-pathfinder
+         ipv4 address 10.7.7.7
+         ipv4 address 10.9.9.9
+   !
+   path-group MPLS id 100
+      !
+      local interface Ethernet2
+      !
+      peer dynamic
+   !
    load-balance policy LBPOLICY
+      path-group INET
+      path-group MPLS
 !
 router adaptive-virtual-topology
    topology role edge
@@ -74,6 +95,19 @@ interface Dps1
    flow tracker hardware WAN-FLOW-TRACKER
    tcp mss ceiling ipv4 1000
 !
+interface Ethernet1
+   no shutdown
+   no switchport
+   flow tracker hardware WAN-FLOW-TRACKER
+   ip address dhcp
+   dhcp client accept default-route
+!
+interface Ethernet2
+   no shutdown
+   no switchport
+   flow tracker hardware WAN-FLOW-TRACKER
+   ip address 172.15.5.5/31
+!
 interface Loopback0
    description Router_ID
    no shutdown
@@ -131,4 +165,11 @@ management api http-commands
    vrf MGMT
       no shutdown
 !
+stun
+   client
+      server-profile INET-cv-pathfinder-pathfinder-Ethernet1
+         ip address 10.7.7.7
+      server-profile INET-cv-pathfinder-pathfinder-Ethernet3
+         ip address 10.9.9.9
+!
 end
diff --git a/.../arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg b/.../arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg
@@ -20,7 +20,20 @@ hostname cv-pathfinder-pathfinder
 router path-selection
    peer dynamic source stun
    !
+   path-group INET id 101
+      ipsec profile CP-PROFILE
+      !
+      local interface Ethernet1
+      !
+      local interface Ethernet3
+   !
+   path-group MPLS id 100
+      !
+      local interface Ethernet2
+   !
    load-balance policy LBPOLICY
+      path-group INET
+      path-group MPLS
 !
 router adaptive-virtual-topology
    topology role pathfinder
@@ -69,6 +82,24 @@ interface Dps1
    flow tracker hardware WAN-FLOW-TRACKER
    tcp mss ceiling ipv4 1000
 !
+interface Ethernet1
+   no shutdown
+   no switchport
+   flow tracker hardware WAN-FLOW-TRACKER
+   ip address 10.7.7.7/31
+!
+interface Ethernet2
+   no shutdown
+   no switchport
+   flow tracker hardware WAN-FLOW-TRACKER
+   ip address 172.16.0.1/31
+!
+interface Ethernet3
+   no shutdown
+   no switchport
+   flow tracker hardware WAN-FLOW-TRACKER
+   ip address 10.9.9.9/31
+!
 interface Loopback0
    description Router_ID
    no shutdown
@@ -83,6 +114,8 @@ interface Vxlan1
 ip routing
 no ip routing vrf MGMT
 !
+ip route 0.0.0.0/0 10.7.7.6
+!
 router bfd
    multihop interval 300 min-rx 300 multiplier 3
 !
@@ -132,5 +165,8 @@ management api http-commands
 !
 stun
    server
+      local-interface Ethernet1
+      local-interface Ethernet2
+      local-interface Ethernet3
 !
 end
diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg
@@ -20,7 +20,21 @@ hostname cv-pathfinder-pathfinder1
 router path-selection
    peer dynamic source stun
    !
+   path-group INET id 101
+      ipsec profile CP-PROFILE
+      !
+      local interface Ethernet1
+      !
+      peer static router-ip 6.6.6.6
+         name cv-pathfinder-pathfinder3
+         ipv4 address 10.50.50.50
+      !
+      peer static router-ip 192.168.44.3
+         name cv-pathfinder-pathfinder2
+         ipv4 address 10.9.9.9
+   !
    load-balance policy LBPOLICY
+      path-group INET
 !
 router adaptive-virtual-topology
    topology role pathfinder
@@ -69,6 +83,12 @@ interface Dps1
    flow tracker hardware WAN-FLOW-TRACKER
    tcp mss ceiling ipv4 1000
 !
+interface Ethernet1
+   no shutdown
+   no switchport
+   flow tracker hardware WAN-FLOW-TRACKER
+   ip address 10.8.8.8/31
+!
 interface Loopback0
    description Router_ID
    no shutdown
@@ -147,5 +167,6 @@ management api http-commands
 !
 stun
    server
+      local-interface Ethernet1
 !
 end