Merge branch 'devel' into dtls_stun

aristanetworks · Feb 22, 2024 · 8e93291 · 8e93291
2 parents 1323958 + 95301e0
commit 8e93291
Show file tree

Hide file tree

Showing 51 changed files with 377 additions and 167 deletions.
diff --git a/...a/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-edge-no-default-policy.cfg b/...a/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-edge-no-default-policy.cfg
@@ -1,9 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 hostname autovpn-edge-no-default-policy
@@ -139,6 +135,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS remote-as 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community

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
@@ -1,9 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 hostname autovpn-edge
@@ -169,6 +165,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS remote-as 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community

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
@@ -1,9 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 hostname autovpn-rr1
@@ -154,6 +150,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS route-reflector-client
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community
@@ -162,6 +159,7 @@ router bgp 65000
    neighbor WAN-RR-OVERLAY-PEERS remote-as 65000
    neighbor WAN-RR-OVERLAY-PEERS update-source Dps1
    neighbor WAN-RR-OVERLAY-PEERS bfd
+   neighbor WAN-RR-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-RR-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-RR-OVERLAY-PEERS send-community
    neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0

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
@@ -1,9 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 hostname autovpn-rr2
@@ -155,6 +151,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS route-reflector-client
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community
@@ -163,6 +160,7 @@ router bgp 65000
    neighbor WAN-RR-OVERLAY-PEERS remote-as 65000
    neighbor WAN-RR-OVERLAY-PEERS update-source Dps1
    neighbor WAN-RR-OVERLAY-PEERS bfd
+   neighbor WAN-RR-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-RR-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-RR-OVERLAY-PEERS send-community
    neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0

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
@@ -1,7 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
 flow tracking hardware
    tracker WAN-FLOW-TRACKER
       record export on inactive timeout 70000
@@ -12,8 +10,6 @@ flow tracking hardware
          template interval 5000
    no shutdown
 !
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 ip as-path access-list ASPATH-WAN permit 65000 any
@@ -307,7 +303,6 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS peer group
    neighbor WAN-OVERLAY-PEERS remote-as 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
-   neighbor WAN-OVERLAY-PEERS bfd
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community

diff --git a/...molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg b/...molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg
@@ -1,7 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
 flow tracking hardware
    tracker WAN-FLOW-TRACKER
       record export on inactive timeout 70000
@@ -12,8 +10,6 @@ flow tracking hardware
          template interval 5000
    no shutdown
 !
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 hostname cv-pathfinder-edge-no-default-policy
@@ -214,6 +210,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS remote-as 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 42
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community

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
@@ -1,7 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
 flow tracking hardware
    tracker WAN-FLOW-TRACKER
       record export on inactive timeout 70000
@@ -12,8 +10,6 @@ flow tracking hardware
          template interval 5000
    no shutdown
 !
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 ip as-path access-list ASPATH-WAN permit 65000 any
@@ -367,6 +363,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS remote-as 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community

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
@@ -1,7 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
 flow tracking hardware
    tracker WAN-FLOW-TRACKER
       record export on inactive timeout 70000
@@ -12,8 +10,6 @@ flow tracking hardware
          template interval 5000
    no shutdown
 !
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 hostname cv-pathfinder-pathfinder
@@ -304,6 +300,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS route-reflector-client
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community

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
@@ -1,7 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
 flow tracking hardware
    tracker WAN-FLOW-TRACKER
       record export on inactive timeout 70000
@@ -12,8 +10,6 @@ flow tracking hardware
          template interval 5000
    no shutdown
 !
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 hostname cv-pathfinder-pathfinder1
@@ -293,6 +289,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS route-reflector-client
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community
@@ -301,6 +298,7 @@ router bgp 65000
    neighbor WAN-RR-OVERLAY-PEERS remote-as 65000
    neighbor WAN-RR-OVERLAY-PEERS update-source Dps1
    neighbor WAN-RR-OVERLAY-PEERS bfd
+   neighbor WAN-RR-OVERLAY-PEERS bfd interval 2020 min-rx 2000 multiplier 3
    neighbor WAN-RR-OVERLAY-PEERS ttl maximum-hops 42
    neighbor WAN-RR-OVERLAY-PEERS send-community
    neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg
@@ -1,7 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
 flow tracking hardware
    tracker WAN-FLOW-TRACKER
       record export on inactive timeout 70000
@@ -12,8 +10,6 @@ flow tracking hardware
          template interval 5000
    no shutdown
 !
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 hostname cv-pathfinder-pathfinder2
@@ -306,6 +302,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS route-reflector-client
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community
@@ -314,6 +311,7 @@ router bgp 65000
    neighbor WAN-RR-OVERLAY-PEERS remote-as 65000
    neighbor WAN-RR-OVERLAY-PEERS update-source Dps1
    neighbor WAN-RR-OVERLAY-PEERS bfd
+   neighbor WAN-RR-OVERLAY-PEERS bfd interval 2020 min-rx 2000 multiplier 3
    neighbor WAN-RR-OVERLAY-PEERS ttl maximum-hops 42
    neighbor WAN-RR-OVERLAY-PEERS send-community
    neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0

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
@@ -1,7 +1,5 @@
 !RANCID-CONTENT-TYPE: arista
 !
-vlan internal order ascending range 1006 1199
-!
 flow tracking hardware
    tracker WAN-FLOW-TRACKER
       record export on inactive timeout 70000
@@ -12,8 +10,6 @@ flow tracking hardware
          template interval 5000
    no shutdown
 !
-transceiver qsfp default-mode 4x10G
-!
 service routing protocols model multi-agent
 !
 ip as-path access-list ASPATH-WAN permit 65000 any
@@ -358,6 +354,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS remote-as 65000
    neighbor WAN-OVERLAY-PEERS update-source Dps1
    neighbor WAN-OVERLAY-PEERS bfd
+   neighbor WAN-OVERLAY-PEERS bfd interval 1000 min-rx 1000 multiplier 10
    neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
    neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
    neighbor WAN-OVERLAY-PEERS send-community

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
@@ -23,6 +23,10 @@ router_bgp:
     maximum_routes: 0
     remote_as: '65000'
     ttl_maximum_hops: 1
+    bfd_timers:
+      interval: 1000
+      min_rx: 1000
+      multiplier: 10
   address_family_evpn:
     peer_groups:
     - name: WAN-OVERLAY-PEERS
@@ -90,11 +94,7 @@ router_bgp:
     - source_protocol: connected
 service_routing_protocols_model: multi-agent
 ip_routing: true
-vlan_internal_order:
-  allocation: ascending
-  range:
-    beginning: 1006
-    ending: 1199
+transceiver_qsfp_default_mode_4x10: false
 spanning_tree:
   mode: none
 vrfs:

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
@@ -23,6 +23,10 @@ router_bgp:
     maximum_routes: 0
     remote_as: '65000'
     ttl_maximum_hops: 1
+    bfd_timers:
+      interval: 1000
+      min_rx: 1000
+      multiplier: 10
   address_family_evpn:
     peer_groups:
     - name: WAN-OVERLAY-PEERS
@@ -94,11 +98,7 @@ router_bgp:
     - source_protocol: connected
 service_routing_protocols_model: multi-agent
 ip_routing: true
-vlan_internal_order:
-  allocation: ascending
-  range:
-    beginning: 1006
-    ending: 1199
+transceiver_qsfp_default_mode_4x10: false
 spanning_tree:
   mode: none
 vrfs:

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml
@@ -29,6 +29,10 @@ router_bgp:
     remote_as: '65000'
     ttl_maximum_hops: 1
     route_reflector_client: true
+    bfd_timers:
+      interval: 1000
+      min_rx: 1000
+      multiplier: 10
   - name: WAN-RR-OVERLAY-PEERS
     type: wan
     update_source: Dps1
@@ -37,6 +41,10 @@ router_bgp:
     maximum_routes: 0
     remote_as: '65000'
     ttl_maximum_hops: 1
+    bfd_timers:
+      interval: 1000
+      min_rx: 1000
+      multiplier: 10
   address_family_evpn:
     peer_groups:
     - name: WAN-OVERLAY-PEERS
@@ -82,11 +90,7 @@ router_bgp:
         - route-map RM-EVPN-EXPORT-VRF-DEFAULT
 service_routing_protocols_model: multi-agent
 ip_routing: true
-vlan_internal_order:
-  allocation: ascending
-  range:
-    beginning: 1006
-    ending: 1199
+transceiver_qsfp_default_mode_4x10: false
 spanning_tree:
   mode: none
 vrfs:

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml
@@ -29,6 +29,10 @@ router_bgp:
     remote_as: '65000'
     ttl_maximum_hops: 1
     route_reflector_client: true
+    bfd_timers:
+      interval: 1000
+      min_rx: 1000
+      multiplier: 10
   - name: WAN-RR-OVERLAY-PEERS
     type: wan
     update_source: Dps1
@@ -37,6 +41,10 @@ router_bgp:
     maximum_routes: 0
     remote_as: '65000'
     ttl_maximum_hops: 1
+    bfd_timers:
+      interval: 1000
+      min_rx: 1000
+      multiplier: 10
   address_family_evpn:
     peer_groups:
     - name: WAN-OVERLAY-PEERS
@@ -82,11 +90,7 @@ router_bgp:
         - route-map RM-EVPN-EXPORT-VRF-DEFAULT
 service_routing_protocols_model: multi-agent
 ip_routing: true
-vlan_internal_order:
-  allocation: ascending
-  range:
-    beginning: 1006
-    ending: 1199
+transceiver_qsfp_default_mode_4x10: false
 spanning_tree:
   mode: none
 vrfs: