Refactor(eos_cli_config_gen): Rearrange generated CLI for `traffic-po…

…licies`, `system` and `static-routes` (#4590)
aristanetworks · Oct 17, 2024 · ce3b411 · ce3b411
1 parent 40451d8
commit ce3b411
Show file tree

Hide file tree

Showing 67 changed files with 95 additions and 75 deletions.
diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md
@@ -1481,8 +1481,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md
@@ -1481,8 +1481,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md
@@ -6847,8 +6847,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md
@@ -2588,8 +2588,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md
@@ -2588,8 +2588,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md
@@ -2477,8 +2477,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md
@@ -2477,8 +2477,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md
@@ -2477,8 +2477,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg
@@ -1063,8 +1063,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg
@@ -1063,8 +1063,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg
@@ -6070,8 +6070,8 @@ interface Vlan10
    ip address 10.10.10.8/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg
@@ -2067,8 +2067,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg
@@ -2067,8 +2067,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg
@@ -1990,8 +1990,8 @@ interface Vlan10
    ip address 10.10.10.11/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg
@@ -1990,8 +1990,8 @@ interface Vlan10
    ip address 10.10.10.12/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg
@@ -1990,8 +1990,8 @@ interface Vlan10
    ip address 10.10.10.13/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org

diff --git a/...s/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md b/...s/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md
@@ -58,10 +58,10 @@ interface Management1
 !
 ip route 1.1.1.0/24 Vlan101 10.1.1.1
 ip route 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ
-ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1
-ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ
 ip route vrf APP 10.3.4.0/24 1.2.3.4
 ip route vrf APP 10.3.5.0/24 Null0
+ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1
+ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ
 ip route vrf customer01 10.3.6.0/24 Ethernet40 11.2.1.1 track bfd 100 tag 1000 name Track-BFD metric 300
 ip route vrf customer01 10.3.7.0/24 Ethernet41 100 tag 1000 name No-Track-BFD metric 300
 ```
diff --git a/...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md b/...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md
@@ -66,13 +66,13 @@ interface Management1
 system control-plane
    tcp mss ceiling ipv4 1344 ipv6 1366
    ip access-group acl4_1 in
+   ip access-group acl4_3 vrf default in
    ip access-group acl4_2 vrf red in
    ip access-group acl4_2 vrf red_1 in
-   ip access-group acl4_3 vrf default in
    ipv6 access-group acl6_1 in
+   ipv6 access-group acl6_3 vrf default in
    ipv6 access-group acl6_2 vrf blue in
    ipv6 access-group acl6_2 vrf blue_1 in
-   ipv6 access-group acl6_3 vrf default in
 ```
 
 ## System L1

diff --git a/...ble_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg b/...ble_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg
@@ -6,9 +6,9 @@ interface Management1
 !
 ip route 1.1.1.0/24 Vlan101 10.1.1.1
 ip route 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ
-ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1
-ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ
 ip route vrf APP 10.3.4.0/24 1.2.3.4
 ip route vrf APP 10.3.5.0/24 Null0
+ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1
+ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ
 ip route vrf customer01 10.3.6.0/24 Ethernet40 11.2.1.1 track bfd 100 tag 1000 name Track-BFD metric 300
 ip route vrf customer01 10.3.7.0/24 Ethernet41 100 tag 1000 name No-Track-BFD metric 300
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg
@@ -11,10 +11,10 @@ interface Management1
 system control-plane
    tcp mss ceiling ipv4 1344 ipv6 1366
    ip access-group acl4_1 in
+   ip access-group acl4_3 vrf default in
    ip access-group acl4_2 vrf red in
    ip access-group acl4_2 vrf red_1 in
-   ip access-group acl4_3 vrf default in
    ipv6 access-group acl6_1 in
+   ipv6 access-group acl6_3 vrf default in
    ipv6 access-group acl6_2 vrf blue in
    ipv6 access-group acl6_2 vrf blue_1 in
-   ipv6 access-group acl6_3 vrf default in
diff --git a/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md b/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md
@@ -508,6 +508,7 @@ interface Port-Channel10
    switchport trunk allowed vlan 110-111,210-211
    switchport mode trunk
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0303:0202:0101
       route-target import 03:03:02:02:01:01

diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg
@@ -162,6 +162,7 @@ interface Port-Channel10
    switchport trunk allowed vlan 110-111,210-211
    switchport mode trunk
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0303:0202:0101
       route-target import 03:03:02:02:01:01

diff --git a/...s_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml b/...s_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml
@@ -1087,7 +1087,7 @@ cvp_configlets:
     trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n
     \  switchport mode trunk\n   switchport\n   mlag 7\n!\ninterface Port-Channel10\n
     \  description SERVER_server03_ESI\n   no shutdown\n   switchport trunk allowed
-    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   evpn ethernet-segment\n
+    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   !\n   evpn ethernet-segment\n
     \     identifier 0000:0000:0303:0202:0101\n      route-target import 03:03:02:02:01:01\n
     \  lacp system-id 0303.0202.0101\n!\ninterface Ethernet1\n   description P2P_DC1-SPINE1_Ethernet4\n
     \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.25/31\n!\ninterface

diff --git a/...d/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml b/...d/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml
@@ -1087,7 +1087,7 @@ cvp_configlets:
     trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n
     \  switchport mode trunk\n   switchport\n   mlag 7\n!\ninterface Port-Channel10\n
     \  description SERVER_server03_ESI\n   no shutdown\n   switchport trunk allowed
-    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   evpn ethernet-segment\n
+    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   !\n   evpn ethernet-segment\n
     \     identifier 0000:0000:0303:0202:0101\n      route-target import 03:03:02:02:01:01\n
     \  lacp system-id 0303.0202.0101\n!\ninterface Ethernet1\n   description P2P_DC1-SPINE1_Ethernet4\n
     \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.25/31\n!\ninterface

diff --git a/...ections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md b/...ections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md
@@ -282,8 +282,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast

diff --git a/...ections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md b/...ections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast

diff --git a/...ctions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md b/...ctions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md
@@ -412,8 +412,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.0.0.0/8 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ### Router BGP

diff --git a/...ctions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md b/...ctions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md
@@ -243,8 +243,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast

diff --git a/...tions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md b/...tions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md
@@ -312,8 +312,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.1.0.0/16 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ### Router ISIS

diff --git a/...ions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md b/...ions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast

diff --git a/...ions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md b/...ions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast

diff --git a/...ctions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md b/...ctions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast

diff --git a/...ctions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md b/...ctions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast

diff --git a/...tions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md b/...tions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md
@@ -382,8 +382,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.0.0.0/8 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ### Router OSPF

diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg
@@ -95,7 +95,7 @@ interface Vlan4092
    ip address 172.23.254.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg
@@ -63,7 +63,7 @@ interface Vlan4092
    ip address 172.23.254.5/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg
@@ -143,8 +143,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.0.0.0/8 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 route-map RM-MLAG-PEER-IN permit 10
    description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing

diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg
@@ -50,7 +50,7 @@ interface Vlan4092
    ip address 172.23.254.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg
@@ -75,8 +75,8 @@ ip virtual-router mac-address 00:1c:73:00:00:9a
 ip routing
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.1.0.0/16 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 router isis EVPN_UNDERLAY
    net 49.0001.1921.6825.5001.00