Refactor: Move wan_vni to wan_virtual_topologies

aristanetworks · Feb 26, 2024 · 9b09638 · 9b09638
1 parent 9233a35
commit 9b09638
Show file tree

Hide file tree

Showing 47 changed files with 1,864 additions and 450 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
@@ -22,17 +22,27 @@ router path-selection
    load-balance policy LB-CONTROL-PLANE-PROFILE
       path-group INET
    !
-   load-balance policy LB-DEFAULT-AVT-POLICY-DEFAULT
+   load-balance policy LB-DEFAULT-POLICY-DEFAULT
       path-group INET
    !
-   policy DEFAULT-AVT-POLICY-WITH-CP
+   policy DEFAULT-POLICY
       default-match
-         load-balance LB-DEFAULT-AVT-POLICY-DEFAULT
+         load-balance LB-DEFAULT-POLICY-DEFAULT
+   !
+   policy DEFAULT-POLICY-WITH-CP
+      default-match
+         load-balance LB-DEFAULT-POLICY-DEFAULT
       10 application-profile CONTROL-PLANE-APPLICATION-PROFILE
          load-balance LB-CONTROL-PLANE-PROFILE
    !
    vrf default
-      path-selection-policy DEFAULT-AVT-POLICY-WITH-CP
+      path-selection-policy DEFAULT-POLICY-WITH-CP
+   !
+   vrf IT
+      path-selection-policy DEFAULT-POLICY
+   !
+   vrf PROD
+      path-selection-policy DEFAULT-POLICY
 !
 spanning-tree mode none
 !

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
@@ -26,37 +26,37 @@ router path-selection
    load-balance policy LB-CONTROL-PLANE-PROFILE
       path-group INET
    !
-   load-balance policy LB-DEFAULT-AVT-POLICY-IT
+   load-balance policy LB-DEFAULT-AUTOVPN-POLICY-IT
       path-group INET priority 2
    !
-   load-balance policy LB-PROD-AVT-POLICY-DEFAULT
+   load-balance policy LB-PROD-AUTOVPN-POLICY-DEFAULT
       path-group INET
    !
-   load-balance policy LB-PROD-AVT-POLICY-VIDEO
+   load-balance policy LB-PROD-AUTOVPN-POLICY-VIDEO
       path-group INET
    !
-   load-balance policy LB-PROD-AVT-POLICY-VOICE
+   load-balance policy LB-PROD-AUTOVPN-POLICY-VOICE
       path-group INET
    !
-   policy DEFAULT-AVT-POLICY-WITH-CP
+   policy DEFAULT-AUTOVPN-POLICY-WITH-CP
       10 application-profile CONTROL-PLANE-APPLICATION-PROFILE
          load-balance LB-CONTROL-PLANE-PROFILE
       20 application-profile IT
-         load-balance LB-DEFAULT-AVT-POLICY-IT
+         load-balance LB-DEFAULT-AUTOVPN-POLICY-IT
    !
-   policy PROD-AVT-POLICY
+   policy PROD-AUTOVPN-POLICY
       default-match
-         load-balance LB-PROD-AVT-POLICY-DEFAULT
+         load-balance LB-PROD-AUTOVPN-POLICY-DEFAULT
       10 application-profile VOICE
-         load-balance LB-PROD-AVT-POLICY-VOICE
+         load-balance LB-PROD-AUTOVPN-POLICY-VOICE
       20 application-profile VIDEO
-         load-balance LB-PROD-AVT-POLICY-VIDEO
+         load-balance LB-PROD-AUTOVPN-POLICY-VIDEO
    !
    vrf default
-      path-selection-policy DEFAULT-AVT-POLICY-WITH-CP
+      path-selection-policy DEFAULT-AUTOVPN-POLICY-WITH-CP
    !
    vrf PROD
-      path-selection-policy PROD-AVT-POLICY
+      path-selection-policy PROD-AUTOVPN-POLICY
 !
 spanning-tree mode none
 !

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
@@ -24,38 +24,38 @@ router path-selection
    load-balance policy LB-CONTROL-PLANE-PROFILE
       path-group INET
    !
-   load-balance policy LB-DEFAULT-AVT-POLICY-IT
+   load-balance policy LB-DEFAULT-AUTOVPN-POLICY-IT
       path-group MPLS
       path-group INET priority 2
    !
-   load-balance policy LB-PROD-AVT-POLICY-DEFAULT
+   load-balance policy LB-PROD-AUTOVPN-POLICY-DEFAULT
       path-group INET
    !
-   load-balance policy LB-PROD-AVT-POLICY-VIDEO
+   load-balance policy LB-PROD-AUTOVPN-POLICY-VIDEO
       path-group INET
    !
-   load-balance policy LB-PROD-AVT-POLICY-VOICE
+   load-balance policy LB-PROD-AUTOVPN-POLICY-VOICE
       path-group INET
    !
-   policy DEFAULT-AVT-POLICY-WITH-CP
+   policy DEFAULT-AUTOVPN-POLICY-WITH-CP
       10 application-profile CONTROL-PLANE-APPLICATION-PROFILE
          load-balance LB-CONTROL-PLANE-PROFILE
       20 application-profile IT
-         load-balance LB-DEFAULT-AVT-POLICY-IT
+         load-balance LB-DEFAULT-AUTOVPN-POLICY-IT
    !
-   policy PROD-AVT-POLICY
+   policy PROD-AUTOVPN-POLICY
       default-match
-         load-balance LB-PROD-AVT-POLICY-DEFAULT
+         load-balance LB-PROD-AUTOVPN-POLICY-DEFAULT
       10 application-profile VOICE
-         load-balance LB-PROD-AVT-POLICY-VOICE
+         load-balance LB-PROD-AUTOVPN-POLICY-VOICE
       20 application-profile VIDEO
-         load-balance LB-PROD-AVT-POLICY-VIDEO
+         load-balance LB-PROD-AUTOVPN-POLICY-VIDEO
    !
    vrf default
-      path-selection-policy DEFAULT-AVT-POLICY-WITH-CP
+      path-selection-policy DEFAULT-AUTOVPN-POLICY-WITH-CP
    !
    vrf PROD
-      path-selection-policy PROD-AVT-POLICY
+      path-selection-policy PROD-AUTOVPN-POLICY
 !
 spanning-tree mode none
 !

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
@@ -24,38 +24,38 @@ router path-selection
    load-balance policy LB-CONTROL-PLANE-PROFILE
       path-group INET
    !
-   load-balance policy LB-DEFAULT-AVT-POLICY-IT
+   load-balance policy LB-DEFAULT-AUTOVPN-POLICY-IT
       path-group MPLS
       path-group INET priority 2
    !
-   load-balance policy LB-PROD-AVT-POLICY-DEFAULT
+   load-balance policy LB-PROD-AUTOVPN-POLICY-DEFAULT
       path-group INET
    !
-   load-balance policy LB-PROD-AVT-POLICY-VIDEO
+   load-balance policy LB-PROD-AUTOVPN-POLICY-VIDEO
       path-group INET
    !
-   load-balance policy LB-PROD-AVT-POLICY-VOICE
+   load-balance policy LB-PROD-AUTOVPN-POLICY-VOICE
       path-group INET
    !
-   policy DEFAULT-AVT-POLICY-WITH-CP
+   policy DEFAULT-AUTOVPN-POLICY-WITH-CP
       10 application-profile CONTROL-PLANE-APPLICATION-PROFILE
          load-balance LB-CONTROL-PLANE-PROFILE
       20 application-profile IT
-         load-balance LB-DEFAULT-AVT-POLICY-IT
+         load-balance LB-DEFAULT-AUTOVPN-POLICY-IT
    !
-   policy PROD-AVT-POLICY
+   policy PROD-AUTOVPN-POLICY
       default-match
-         load-balance LB-PROD-AVT-POLICY-DEFAULT
+         load-balance LB-PROD-AUTOVPN-POLICY-DEFAULT
       10 application-profile VOICE
-         load-balance LB-PROD-AVT-POLICY-VOICE
+         load-balance LB-PROD-AUTOVPN-POLICY-VOICE
       20 application-profile VIDEO
-         load-balance LB-PROD-AVT-POLICY-VIDEO
+         load-balance LB-PROD-AUTOVPN-POLICY-VIDEO
    !
    vrf default
-      path-selection-policy DEFAULT-AVT-POLICY-WITH-CP
+      path-selection-policy DEFAULT-AUTOVPN-POLICY-WITH-CP
    !
    vrf PROD
-      path-selection-policy PROD-AVT-POLICY
+      path-selection-policy PROD-AUTOVPN-POLICY
 !
 spanning-tree mode none
 !