Fix(eos_cli_config_gen): Reordering router adaptive-virtual-topology …

…/ router path-selection (#3505)
aristanetworks · Jan 17, 2024 · 8495b94 · 8495b94
1 parent a456747
commit 8495b94
Show file tree

Hide file tree

Showing 6 changed files with 275 additions and 275 deletions.
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
@@ -17,64 +17,6 @@ service routing protocols model multi-agent
 !
 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 LTE id 102
-      ipsec profile CP-PROFILE
-      !
-      local interface Ethernet3
-      !
-      peer dynamic
-   !
-   path-group MPLS id 100
-      !
-      local interface Ethernet2
-         stun server-profile MPLS-cv-pathfinder-pathfinder-Ethernet2
-      !
-      peer dynamic
-      !
-      peer static router-ip 192.168.44.1
-         name cv-pathfinder-pathfinder
-         ipv4 address 172.16.0.1
-   !
-   load-balance policy LB-CONTROL-PLANE-PROFILE
-      path-group INET
-      path-group MPLS
-   !
-   load-balance policy LB-DEFAULT-AVT-POLICY-DEFAULT
-      path-group INET
-      path-group MPLS priority 42
-   !
-   load-balance policy LB-DEFAULT-AVT-POLICY-VIDEO
-      path-group INET
-      path-group MPLS
-   !
-   load-balance policy LB-PROD-AVT-POLICY-DEFAULT
-      path-group INET
-      path-group MPLS priority 2
-   !
-   load-balance policy LB-PROD-AVT-POLICY-VIDEO
-      path-group LTE
-      path-group MPLS
-      path-group INET priority 2
-   !
-   load-balance policy LB-PROD-AVT-POLICY-VOICE
-      path-group MPLS
-      path-group INET priority 2
-!
 router adaptive-virtual-topology
    topology role edge
    region AVD_Land_East id 43
@@ -146,6 +88,64 @@ router adaptive-virtual-topology
       avt profile PROD-AVT-POLICY-VOICE id 2
       avt profile PROD-AVT-POLICY-VIDEO id 4
 !
+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 LTE id 102
+      ipsec profile CP-PROFILE
+      !
+      local interface Ethernet3
+      !
+      peer dynamic
+   !
+   path-group MPLS id 100
+      !
+      local interface Ethernet2
+         stun server-profile MPLS-cv-pathfinder-pathfinder-Ethernet2
+      !
+      peer dynamic
+      !
+      peer static router-ip 192.168.44.1
+         name cv-pathfinder-pathfinder
+         ipv4 address 172.16.0.1
+   !
+   load-balance policy LB-CONTROL-PLANE-PROFILE
+      path-group INET
+      path-group MPLS
+   !
+   load-balance policy LB-DEFAULT-AVT-POLICY-DEFAULT
+      path-group INET
+      path-group MPLS priority 42
+   !
+   load-balance policy LB-DEFAULT-AVT-POLICY-VIDEO
+      path-group INET
+      path-group MPLS
+   !
+   load-balance policy LB-PROD-AVT-POLICY-DEFAULT
+      path-group INET
+      path-group MPLS priority 2
+   !
+   load-balance policy LB-PROD-AVT-POLICY-VIDEO
+      path-group LTE
+      path-group MPLS
+      path-group INET priority 2
+   !
+   load-balance policy LB-PROD-AVT-POLICY-VOICE
+      path-group MPLS
+      path-group INET priority 2
+!
 spanning-tree mode none
 !
 no enable password

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
@@ -17,54 +17,6 @@ service routing protocols model multi-agent
 !
 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 LB-CONTROL-PLANE-PROFILE
-      path-group INET
-      path-group MPLS
-   !
-   load-balance policy LB-DEFAULT-AVT-POLICY-DEFAULT
-      path-group Equinix
-      path-group INET
-      path-group MPLS priority 42
-   !
-   load-balance policy LB-DEFAULT-AVT-POLICY-VIDEO
-      path-group INET
-      path-group MPLS
-   !
-   load-balance policy LB-PROD-AVT-POLICY-DEFAULT
-      path-group INET
-      path-group MPLS priority 2
-   !
-   load-balance policy LB-PROD-AVT-POLICY-VIDEO
-      path-group LTE
-      path-group MPLS
-      path-group INET priority 2
-   !
-   load-balance policy LB-PROD-AVT-POLICY-VOICE
-      path-group MPLS
-      path-group INET priority 2
-   !
-   load-balance policy LB-TRANSIT-AVT-POLICY-DEFAULT
-      path-group INET
-      path-group MPLS priority 2
-   !
-   load-balance policy LB-TRANSIT-AVT-POLICY-VOICE
-      path-group MPLS
-      path-group INET priority 2
-!
 router adaptive-virtual-topology
    topology role pathfinder
    !
@@ -152,6 +104,54 @@ router adaptive-virtual-topology
       avt profile TRANSIT-AVT-POLICY-DEFAULT id 1
       avt profile TRANSIT-AVT-POLICY-VOICE id 42
 !
+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 LB-CONTROL-PLANE-PROFILE
+      path-group INET
+      path-group MPLS
+   !
+   load-balance policy LB-DEFAULT-AVT-POLICY-DEFAULT
+      path-group Equinix
+      path-group INET
+      path-group MPLS priority 42
+   !
+   load-balance policy LB-DEFAULT-AVT-POLICY-VIDEO
+      path-group INET
+      path-group MPLS
+   !
+   load-balance policy LB-PROD-AVT-POLICY-DEFAULT
+      path-group INET
+      path-group MPLS priority 2
+   !
+   load-balance policy LB-PROD-AVT-POLICY-VIDEO
+      path-group LTE
+      path-group MPLS
+      path-group INET priority 2
+   !
+   load-balance policy LB-PROD-AVT-POLICY-VOICE
+      path-group MPLS
+      path-group INET priority 2
+   !
+   load-balance policy LB-TRANSIT-AVT-POLICY-DEFAULT
+      path-group INET
+      path-group MPLS priority 2
+   !
+   load-balance policy LB-TRANSIT-AVT-POLICY-VOICE
+      path-group MPLS
+      path-group INET priority 2
+!
 spanning-tree mode none
 !
 no enable password

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
@@ -17,55 +17,6 @@ service routing protocols model multi-agent
 !
 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 LB-CONTROL-PLANE-PROFILE
-      path-group INET
-   !
-   load-balance policy LB-DEFAULT-AVT-POLICY-DEFAULT
-      path-group Equinix
-      path-group INET
-      path-group MPLS priority 42
-   !
-   load-balance policy LB-DEFAULT-AVT-POLICY-VIDEO
-      path-group INET
-      path-group MPLS
-   !
-   load-balance policy LB-PROD-AVT-POLICY-DEFAULT
-      path-group INET
-      path-group MPLS priority 2
-   !
-   load-balance policy LB-PROD-AVT-POLICY-VIDEO
-      path-group LTE
-      path-group MPLS
-      path-group INET priority 2
-   !
-   load-balance policy LB-PROD-AVT-POLICY-VOICE
-      path-group MPLS
-      path-group INET priority 2
-   !
-   load-balance policy LB-TRANSIT-AVT-POLICY-DEFAULT
-      path-group INET
-      path-group MPLS priority 2
-   !
-   load-balance policy LB-TRANSIT-AVT-POLICY-VOICE
-      path-group MPLS
-      path-group INET priority 2
-!
 router adaptive-virtual-topology
    topology role pathfinder
    !
@@ -153,6 +104,55 @@ router adaptive-virtual-topology
       avt profile TRANSIT-AVT-POLICY-DEFAULT id 1
       avt profile TRANSIT-AVT-POLICY-VOICE id 42
 !
+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 LB-CONTROL-PLANE-PROFILE
+      path-group INET
+   !
+   load-balance policy LB-DEFAULT-AVT-POLICY-DEFAULT
+      path-group Equinix
+      path-group INET
+      path-group MPLS priority 42
+   !
+   load-balance policy LB-DEFAULT-AVT-POLICY-VIDEO
+      path-group INET
+      path-group MPLS
+   !
+   load-balance policy LB-PROD-AVT-POLICY-DEFAULT
+      path-group INET
+      path-group MPLS priority 2
+   !
+   load-balance policy LB-PROD-AVT-POLICY-VIDEO
+      path-group LTE
+      path-group MPLS
+      path-group INET priority 2
+   !
+   load-balance policy LB-PROD-AVT-POLICY-VOICE
+      path-group MPLS
+      path-group INET priority 2
+   !
+   load-balance policy LB-TRANSIT-AVT-POLICY-DEFAULT
+      path-group INET
+      path-group MPLS priority 2
+   !
+   load-balance policy LB-TRANSIT-AVT-POLICY-VOICE
+      path-group MPLS
+      path-group INET priority 2
+!
 spanning-tree mode none
 !
 no enable password