Revert(eos_designs): Remove legacy autovpn with new plan for when Aut…

…oVPN 2.0 gets out (#4652)
aristanetworks · Oct 25, 2024 · a8aea88 · a8aea88
1 parent 4d9396a
commit a8aea88
Show file tree

Hide file tree

Showing 28 changed files with 115 additions and 133 deletions.
diff --git a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
@@ -851,16 +851,6 @@ The trunk group for MLAG L3 peerings can be reverted if needed:
 +     name: LEAF_PEER_L3
 ```
 
-### `wan_mode: autovpn` renamed to `wan_mode: legacy-autovpn`
-
-With AVD version 5.0.0, the valid values for the `wan_mode` key have changed.
-If using the `autovpn` mode in AVD 4.x, the `wan_mode` key must be updated to `legacy-autovpn`.
-
-```diff
-- wan_mode: autovpn
-+ wan_mode: legacy-autovpn
-```
-
 ### custom_structured_configuration_prefix no longer accepts a string
 
 Starting AVD 5.0.0, `custom_structured_configuration_prefix` only accepts a list of strings.

diff --git a/ansible_collections/arista/avd/docs/release-notes/5.x.x.md b/ansible_collections/arista/avd/docs/release-notes/5.x.x.md
@@ -235,12 +235,6 @@ This applies to:
 - `svi_profiles`
 - `ptp_profiles`
 
-#### `wan_mode: autovpn` renamed `wan_mode: legacy-autovpn`
-
-With AVD version 5.0.0 the valid values for the `wan_mode` key are now `legacy-autovpn | cv-pathfinder`.
-
-See the [porting guide](../porting-guides/5.x.x.md#wan-mode-autovpn-renamed-wan-mode-legacy-vpn) for details.
-
 #### Default encapsulation for WAN EVPN iBGP peerings changed to `path-selection`
 
 With AVD version 5.0.0, the default encapsulation used for EVPN iBGP peering between WAN routers is `path-selection`. Previously, it was `vxlan`.

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,5 +1,5 @@
 ---
-wan_mode: legacy-autovpn
+wan_mode: autovpn
 type: wan_router
 fabric_name: FABRIC_WAN_ROLE_OVERLAY_ROUTING_PROTOCOL
 

diff --git a/..._designs_negative_unit_tests/inventory/host_vars/ipv4-acl-in-missing-on-wan-interface.yml b/..._designs_negative_unit_tests/inventory/host_vars/ipv4-acl-in-missing-on-wan-interface.yml
@@ -1,6 +1,6 @@
 ---
 type: wan_router
-wan_mode: legacy-autovpn
+wan_mode: autovpn
 wan_router:
   nodes:
     - bgp_as: 65000

diff --git a/...legacy-autovpn-edge-no-default-policy.cfg → ...onfigs/autovpn-edge-no-default-policy.cfg b/...legacy-autovpn-edge-no-default-policy.cfg → ...onfigs/autovpn-edge-no-default-policy.cfg
@@ -16,7 +16,7 @@ flow tracking hardware
 !
 service routing protocols model multi-agent
 !
-hostname legacy-autovpn-edge-no-default-policy
+hostname autovpn-edge-no-default-policy
 !
 router path-selection
    tcp mss ceiling ipv4 ingress
@@ -25,12 +25,12 @@ router path-selection
       ipsec profile AUTOVPN
       !
       local interface Ethernet1
-         stun server-profile INET-legacy-autovpn-rr3-Ethernet1
+         stun server-profile INET-autovpn-rr3-Ethernet1
       !
       peer dynamic
       !
       peer static router-ip 2.2.2.2
-         name legacy-autovpn-rr3
+         name autovpn-rr3
          ipv4 address 10.7.7.7
    !
    load-balance policy LB-DEFAULT-POLICY-CONTROL-PLANE
@@ -117,7 +117,7 @@ interface Loopback0
    ip address 192.168.30.1/32
 !
 interface Vxlan1
-   description legacy-autovpn-edge-no-default-policy_VTEP
+   description autovpn-edge-no-default-policy_VTEP
    vxlan source-interface Dps1
    vxlan udp-port 4789
    vxlan vrf default vni 1
@@ -178,7 +178,7 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS send-community
    neighbor WAN-OVERLAY-PEERS maximum-routes 0
    neighbor 2.2.2.2 peer group WAN-OVERLAY-PEERS
-   neighbor 2.2.2.2 description legacy-autovpn-rr3_Dps1
+   neighbor 2.2.2.2 description autovpn-rr3_Dps1
    redistribute connected route-map RM-CONN-2-BGP
    !
    address-family evpn
@@ -217,7 +217,7 @@ router bgp 65000
 !
 stun
    client
-      server-profile INET-legacy-autovpn-rr3-Ethernet1
+      server-profile INET-autovpn-rr3-Ethernet1
          ip address 10.7.7.7
          ssl profile STUN-DTLS
 !

diff --git a/.../intended/configs/legacy-autovpn-edge.cfg → ...t_tests/intended/configs/autovpn-edge.cfg b/.../intended/configs/legacy-autovpn-edge.cfg → ...t_tests/intended/configs/autovpn-edge.cfg
@@ -16,7 +16,7 @@ flow tracking hardware
 !
 service routing protocols model multi-agent
 !
-hostname legacy-autovpn-edge
+hostname autovpn-edge
 !
 router path-selection
    tcp mss ceiling ipv4 ingress
@@ -25,16 +25,16 @@ router path-selection
       ipsec profile AUTOVPN
       !
       local interface Ethernet1
-         stun server-profile INET-legacy-autovpn-rr1-Ethernet1 INET-legacy-autovpn-rr2-Ethernet1
+         stun server-profile INET-autovpn-rr1-Ethernet1 INET-autovpn-rr2-Ethernet1
       !
       peer dynamic
       !
       peer static router-ip 192.168.131.1
-         name legacy-autovpn-rr1
+         name autovpn-rr1
          ipv4 address 10.7.7.7
       !
       peer static router-ip 192.168.131.2
-         name legacy-autovpn-rr2
+         name autovpn-rr2
          ipv4 address 10.8.8.8
    !
    path-group MPLS id 100
@@ -141,7 +141,7 @@ interface Loopback0
    ip address 192.168.30.1/32
 !
 interface Vxlan1
-   description legacy-autovpn-edge_VTEP
+   description autovpn-edge_VTEP
    vxlan source-interface Dps1
    vxlan udp-port 4789
    vxlan vrf default vni 1
@@ -207,9 +207,9 @@ router bgp 65000
    neighbor WAN-OVERLAY-PEERS send-community
    neighbor WAN-OVERLAY-PEERS maximum-routes 0
    neighbor 192.168.131.1 peer group WAN-OVERLAY-PEERS
-   neighbor 192.168.131.1 description legacy-autovpn-rr1_Dps1
+   neighbor 192.168.131.1 description autovpn-rr1_Dps1
    neighbor 192.168.131.2 peer group WAN-OVERLAY-PEERS
-   neighbor 192.168.131.2 description legacy-autovpn-rr2_Dps1
+   neighbor 192.168.131.2 description autovpn-rr2_Dps1
    redistribute connected route-map RM-CONN-2-BGP
    !
    address-family evpn
@@ -241,9 +241,9 @@ router bgp 65000
 !
 stun
    client
-      server-profile INET-legacy-autovpn-rr1-Ethernet1
+      server-profile INET-autovpn-rr1-Ethernet1
          ip address 10.7.7.7
-      server-profile INET-legacy-autovpn-rr2-Ethernet1
+      server-profile INET-autovpn-rr2-Ethernet1
          ip address 10.8.8.8
 !
 end
diff --git a/...s/intended/configs/legacy-autovpn-rr1.cfg → ...it_tests/intended/configs/autovpn-rr1.cfg b/...s/intended/configs/legacy-autovpn-rr1.cfg → ...it_tests/intended/configs/autovpn-rr1.cfg
@@ -16,7 +16,7 @@ flow tracking hardware
 !
 service routing protocols model multi-agent
 !
-hostname legacy-autovpn-rr1
+hostname autovpn-rr1
 !
 router path-selection
    peer dynamic source stun
@@ -28,7 +28,7 @@ router path-selection
       local interface Ethernet1
       !
       peer static router-ip 192.168.131.2
-         name legacy-autovpn-rr2
+         name autovpn-rr2
          ipv4 address 10.8.8.8
    !
    path-group LTE id 102
@@ -121,7 +121,7 @@ interface Loopback0
    ip address 192.168.31.1/32
 !
 interface Vxlan1
-   description legacy-autovpn-rr1_VTEP
+   description autovpn-rr1_VTEP
    vxlan source-interface Dps1
    vxlan udp-port 4789
    vxlan vrf default vni 1
@@ -189,7 +189,7 @@ router bgp 65000
    neighbor WAN-RR-OVERLAY-PEERS send-community
    neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0
    neighbor 192.168.131.2 peer group WAN-RR-OVERLAY-PEERS
-   neighbor 192.168.131.2 description legacy-autovpn-rr2_Dps1
+   neighbor 192.168.131.2 description autovpn-rr2_Dps1
    redistribute connected route-map RM-CONN-2-BGP
    !
    address-family evpn

diff --git a/...s/intended/configs/legacy-autovpn-rr2.cfg → ...it_tests/intended/configs/autovpn-rr2.cfg b/...s/intended/configs/legacy-autovpn-rr2.cfg → ...it_tests/intended/configs/autovpn-rr2.cfg
@@ -16,7 +16,7 @@ flow tracking hardware
 !
 service routing protocols model multi-agent
 !
-hostname legacy-autovpn-rr2
+hostname autovpn-rr2
 !
 router path-selection
    peer dynamic source stun
@@ -28,7 +28,7 @@ router path-selection
       local interface Ethernet1
       !
       peer static router-ip 192.168.131.1
-         name legacy-autovpn-rr1
+         name autovpn-rr1
          ipv4 address 10.7.7.7
    !
    path-group LTE id 102
@@ -120,7 +120,7 @@ interface Loopback0
    ip address 192.168.31.2/32
 !
 interface Vxlan1
-   description legacy-autovpn-rr2_VTEP
+   description autovpn-rr2_VTEP
    vxlan source-interface Dps1
    vxlan udp-port 4789
    vxlan vrf default vni 1
@@ -190,7 +190,7 @@ router bgp 65000
    neighbor WAN-RR-OVERLAY-PEERS send-community
    neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0
    neighbor 192.168.131.1 peer group WAN-RR-OVERLAY-PEERS
-   neighbor 192.168.131.1 description legacy-autovpn-rr1_Dps1
+   neighbor 192.168.131.1 description autovpn-rr1_Dps1
    redistribute connected route-map RM-CONN-2-BGP
    !
    address-family evpn

diff --git a/...legacy-autovpn-edge-no-default-policy.yml → ...onfigs/autovpn-edge-no-default-policy.yml b/...legacy-autovpn-edge-no-default-policy.yml → ...onfigs/autovpn-edge-no-default-policy.yml
@@ -1,4 +1,4 @@
-hostname: legacy-autovpn-edge-no-default-policy
+hostname: autovpn-edge-no-default-policy
 is_deployed: true
 router_bgp:
   as: '65000'
@@ -50,8 +50,8 @@ router_bgp:
   neighbors:
   - ip_address: 2.2.2.2
     peer_group: WAN-OVERLAY-PEERS
-    peer: legacy-autovpn-rr3
-    description: legacy-autovpn-rr3_Dps1
+    peer: autovpn-rr3
+    description: autovpn-rr3_Dps1
   vrfs:
   - name: default
     rd: 192.168.30.1:1
@@ -220,12 +220,12 @@ router_path_selection:
     - name: Ethernet1
       stun:
         server_profiles:
-        - INET-legacy-autovpn-rr3-Ethernet1
+        - INET-autovpn-rr3-Ethernet1
     dynamic_peers:
       enabled: true
     static_peers:
     - router_ip: 2.2.2.2
-      name: legacy-autovpn-rr3
+      name: autovpn-rr3
       ipv4_addresses:
       - 10.7.7.7
     ipsec_profile: AUTOVPN
@@ -257,7 +257,7 @@ router_path_selection:
 stun:
   client:
     server_profiles:
-    - name: INET-legacy-autovpn-rr3-Ethernet1
+    - name: INET-autovpn-rr3-Ethernet1
       ip_address: 10.7.7.7
       ssl_profile: STUN-DTLS
 application_traffic_recognition:
@@ -283,7 +283,7 @@ dps_interfaces:
     hardware: FLOW-TRACKER
 vxlan_interface:
   vxlan1:
-    description: legacy-autovpn-edge-no-default-policy_VTEP
+    description: autovpn-edge-no-default-policy_VTEP
     vxlan:
       udp_port: 4789
       source_interface: Dps1

diff --git a/...tructured_configs/legacy-autovpn-edge.yml → ...ended/structured_configs/autovpn-edge.yml b/...tructured_configs/legacy-autovpn-edge.yml → ...ended/structured_configs/autovpn-edge.yml
@@ -1,4 +1,4 @@
-hostname: legacy-autovpn-edge
+hostname: autovpn-edge
 is_deployed: true
 router_bgp:
   as: '65000'
@@ -50,12 +50,12 @@ router_bgp:
   neighbors:
   - ip_address: 192.168.131.1
     peer_group: WAN-OVERLAY-PEERS
-    peer: legacy-autovpn-rr1
-    description: legacy-autovpn-rr1_Dps1
+    peer: autovpn-rr1
+    description: autovpn-rr1_Dps1
   - ip_address: 192.168.131.2
     peer_group: WAN-OVERLAY-PEERS
-    peer: legacy-autovpn-rr2
-    description: legacy-autovpn-rr2_Dps1
+    peer: autovpn-rr2
+    description: autovpn-rr2_Dps1
   vrfs:
   - name: default
     rd: 192.168.30.1:1
@@ -206,17 +206,17 @@ router_path_selection:
     - name: Ethernet1
       stun:
         server_profiles:
-        - INET-legacy-autovpn-rr1-Ethernet1
-        - INET-legacy-autovpn-rr2-Ethernet1
+        - INET-autovpn-rr1-Ethernet1
+        - INET-autovpn-rr2-Ethernet1
     dynamic_peers:
       enabled: true
     static_peers:
     - router_ip: 192.168.131.1
-      name: legacy-autovpn-rr1
+      name: autovpn-rr1
       ipv4_addresses:
       - 10.7.7.7
     - router_ip: 192.168.131.2
-      name: legacy-autovpn-rr2
+      name: autovpn-rr2
       ipv4_addresses:
       - 10.8.8.8
     ipsec_profile: AUTOVPN
@@ -274,9 +274,9 @@ router_path_selection:
 stun:
   client:
     server_profiles:
-    - name: INET-legacy-autovpn-rr1-Ethernet1
+    - name: INET-autovpn-rr1-Ethernet1
       ip_address: 10.7.7.7
-    - name: INET-legacy-autovpn-rr2-Ethernet1
+    - name: INET-autovpn-rr2-Ethernet1
       ip_address: 10.8.8.8
 application_traffic_recognition:
   application_profiles:
@@ -305,7 +305,7 @@ dps_interfaces:
     hardware: FLOW-TRACKER
 vxlan_interface:
   vxlan1:
-    description: legacy-autovpn-edge_VTEP
+    description: autovpn-edge_VTEP
     vxlan:
       udp_port: 4789
       source_interface: Dps1

diff --git a/...structured_configs/legacy-autovpn-rr1.yml → ...tended/structured_configs/autovpn-rr1.yml b/...structured_configs/legacy-autovpn-rr1.yml → ...tended/structured_configs/autovpn-rr1.yml
@@ -1,4 +1,4 @@
-hostname: legacy-autovpn-rr1
+hostname: autovpn-rr1
 is_deployed: true
 router_bgp:
   as: '65000'
@@ -76,8 +76,8 @@ router_bgp:
   neighbors:
   - ip_address: 192.168.131.2
     peer_group: WAN-RR-OVERLAY-PEERS
-    peer: legacy-autovpn-rr2
-    description: legacy-autovpn-rr2_Dps1
+    peer: autovpn-rr2
+    description: autovpn-rr2_Dps1
   vrfs:
   - name: default
     rd: 192.168.31.1:1
@@ -189,7 +189,7 @@ router_path_selection:
     - name: Ethernet1
     static_peers:
     - router_ip: 192.168.131.2
-      name: legacy-autovpn-rr2
+      name: autovpn-rr2
       ipv4_addresses:
       - 10.8.8.8
     ipsec_profile: AUTOVPN
@@ -270,7 +270,7 @@ dps_interfaces:
     hardware: FLOW-TRACKER
 vxlan_interface:
   vxlan1:
-    description: legacy-autovpn-rr1_VTEP
+    description: autovpn-rr1_VTEP
     vxlan:
       udp_port: 4789
       source_interface: Dps1