Refactor(eos_cli_config_gen): Rearrange eos_cli_config_gen output t…

…o match with EOS - Part 4 (#4487) Co-authored-by: Laxmikant Chintakindi <[email protected]>
aristanetworks · Sep 27, 2024 · 61657ba · 61657ba
1 parent a784bf5
commit 61657ba
Show file tree

Hide file tree

Showing 113 changed files with 446 additions and 408 deletions.
diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p1.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p1.md
@@ -413,10 +413,10 @@ router isis CORE
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.0.1
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 ```
 
 ### MPLS Interfaces

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p2.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p2.md
@@ -413,10 +413,10 @@ router isis CORE
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.0.2
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 ```
 
 ### MPLS Interfaces

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p3.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p3.md
@@ -393,10 +393,10 @@ router isis CORE
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.0.3
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 ```
 
 ### MPLS Interfaces

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p4.md b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/p4.md
@@ -393,10 +393,10 @@ router isis CORE
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.0.4
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 ```
 
 ### MPLS Interfaces

diff --git a/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe1.md b/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe1.md
@@ -579,10 +579,10 @@ router bfd
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.1.1
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 ```
 
 ### MPLS Interfaces

diff --git a/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe2.md b/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe2.md
@@ -579,10 +579,10 @@ router bfd
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.1.2
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 ```
 
 ### MPLS Interfaces

diff --git a/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe3.md b/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/pe3.md
@@ -568,10 +568,10 @@ router bfd
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.1.3
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 ```
 
 ### MPLS Interfaces

diff --git a/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr1.md b/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr1.md
@@ -520,10 +520,10 @@ router bfd
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.2.1
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 ```
 
 ### MPLS Interfaces

diff --git a/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr2.md b/...ble_collections/arista/avd/examples/isis-ldp-ipvpn/documentation/devices/rr2.md
@@ -520,10 +520,10 @@ router bfd
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.2.2
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 ```
 
 ### MPLS Interfaces

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p1.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p1.cfg
@@ -117,10 +117,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.0.1
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 router isis CORE
    net 49.0001.0102.5500.0001.00

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p2.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p2.cfg
@@ -117,10 +117,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.0.2
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 router isis CORE
    net 49.0001.0102.5500.0002.00

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p3.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p3.cfg
@@ -100,10 +100,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.0.3
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 router isis CORE
    net 49.0001.0102.5500.0003.00

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p4.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/p4.cfg
@@ -100,10 +100,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.0.4
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 router isis CORE
    net 49.0001.0102.5500.0004.00

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe1.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe1.cfg
@@ -110,10 +110,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.1.1
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 router bfd
    multihop interval 300 min-rx 300 multiplier 3

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe2.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe2.cfg
@@ -110,10 +110,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.1.2
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 router bfd
    multihop interval 300 min-rx 300 multiplier 3

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe3.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/pe3.cfg
@@ -106,10 +106,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.1.3
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 router bfd
    multihop interval 300 min-rx 300 multiplier 3

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr1.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr1.cfg
@@ -100,10 +100,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.2.1
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 router bfd
    multihop interval 300 min-rx 300 multiplier 3

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr2.cfg b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/configs/rr2.cfg
@@ -100,10 +100,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.1.1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 10.255.2.2
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 router bfd
    multihop interval 300 min-rx 300 multiplier 3

diff --git a/...vd/molecule/eos_cli_config_gen/documentation/devices/management-tech-support.md b/...vd/molecule/eos_cli_config_gen/documentation/devices/management-tech-support.md
@@ -64,14 +64,14 @@ interface Management1
 !
 management tech-support
    policy show tech-support
-      exclude command show platform fap ip route
-      exclude command show platform fap ipv6 route
       exclude command show ip bgp vrf all
+      exclude command show ip route vrf all detail
       exclude command show ipv6 bgp vrf all
+      exclude command show ipv6 route vrf all detail
       exclude command show kernel ip route vrf all
       exclude command show kernel ipv6 route vrf all
-      exclude command show ip route vrf all detail
-      exclude command show ipv6 route vrf all detail
+      exclude command show platform fap ip route
+      exclude command show platform fap ipv6 route
       exclude command json show version detail
       include command show version detail | grep TerminAttr
    exit

diff --git a/...ons/arista/avd/molecule/eos_cli_config_gen/documentation/devices/match-lists.md b/...ons/arista/avd/molecule/eos_cli_config_gen/documentation/devices/match-lists.md
@@ -64,14 +64,14 @@ interface Management1
 
 ```eos
 !
+match-list input string molecule
+   10 match regex ^.*MOLECULE.*$
+   20 match regex ^.*TESTING.*$
+!
 match-list input prefix-ipv4 molecule_v4
    match prefix-ipv4 10.10.10.0/24
    match prefix-ipv4 10.10.20.0/24
 !
 match-list input prefix-ipv6 molecule_v6
    match prefix-ipv6 2001:0DB8::/32
-!
-match-list input string molecule
-   10 match regex ^.*MOLECULE.*$
-   20 match regex ^.*TESTING.*$
 ```
diff --git a/...a/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-connectivity.md b/...a/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-connectivity.md
@@ -114,33 +114,6 @@ interface Management1
 ```eos
 !
 monitor connectivity
-   interval 5
-   no shutdown
-   interface set GLOBAL_SET Ethernet1-4
-   interface set HOST_SET Loopback2-4, Loopback10-12
-   local-interfaces GLOBAL_SET address-only default
-   !
-   host server1
-      description
-      server1_connectivity_monitor
-      local-interfaces HOST_SET address-only
-      ip 10.10.10.1
-      url https://server1.local.com
-   !
-   host server2
-      description
-      server2_connectivity_monitor
-      local-interfaces HOST_SET address-only
-      ip 10.10.10.2
-      url https://server2.local.com
-   !
-   host server3
-      description
-      server3_connectivity_monitor
-      local-interfaces HOST_SET
-      ip 10.10.10.3
-   !
-   host server4
    vrf blue
       interface set VRF_GLOBAL_SET Vlan21-24, Vlan29-32
       local-interfaces VRF_GLOBAL_SET default
@@ -160,18 +133,47 @@ monitor connectivity
          url https://server5.local.com
       !
       host server6
+   !
    vrf red
       interface set VRF_GLOBAL_SET Vlan21-24, Vlan29-32
       interface set VRF_HOST_SET Loopback12-14, 19-23
-      local-interfaces VRF_GLOBAL_SET address-only default
       description
       vrf_connectivity_monitor
+      local-interfaces VRF_GLOBAL_SET address-only default
       !
       host server2
          description
          server2_connectivity_monitor
          local-interfaces VRF_HOST_SET address-only
          ip 10.10.20.1
          url https://server2.local.com
+   !
    vrf yellow
+   interval 5
+   no shutdown
+   interface set GLOBAL_SET Ethernet1-4
+   interface set HOST_SET Loopback2-4, Loopback10-12
+   local-interfaces GLOBAL_SET address-only default
+   !
+   host server1
+      description
+      server1_connectivity_monitor
+      local-interfaces HOST_SET address-only
+      ip 10.10.10.1
+      url https://server1.local.com
+   !
+   host server2
+      description
+      server2_connectivity_monitor
+      local-interfaces HOST_SET address-only
+      ip 10.10.10.2
+      url https://server2.local.com
+   !
+   host server3
+      description
+      server3_connectivity_monitor
+      local-interfaces HOST_SET
+      ip 10.10.10.3
+   !
+   host server4
 ```
diff --git a/...rista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-sessions.md b/...rista/avd/molecule/eos_cli_config_gen/documentation/devices/monitor-sessions.md
@@ -101,17 +101,17 @@ interface Management1
 monitor session myMonitoringSession1 source Ethernet0 ipv6 access-group ipv6ACL
 monitor session myMonitoringSession1 source Ethernet5 both ip access-group ipv4ACL priority 10
 monitor session myMonitoringSession1 destination Ethernet48
-monitor session myMonitoringSession1 encapsulation gre metadata tx
-monitor session myMonitoringSession1 header remove size 32
 monitor session myMonitoringSession1 truncate
+monitor session myMonitoringSession1 header remove size 32
+monitor session myMonitoringSession1 encapsulation gre metadata tx
+monitor session myMonitoringSession2 ip access-group ipv4ACL
 monitor session myMonitoringSession2 source Ethernet3, Ethernet5 rx
 monitor session myMonitoringSession2 source Ethernet10-15 rx
 monitor session myMonitoringSession2 source Ethernet12 rx
 monitor session myMonitoringSession2 source Ethernet18 tx mac access-group macACL priority 100
 monitor session myMonitoringSession2 destination Cpu
 monitor session myMonitoringSession2 destination Ethernet50
-monitor session myMonitoringSession2 encapsulation gre metadata tx
-monitor session myMonitoringSession2 ip access-group ipv4ACL
 monitor session myMonitoringSession2 sample 50
+monitor session myMonitoringSession2 encapsulation gre metadata tx
 monitor session myMonitoringSession3 source Ethernet20 both ip access-group ipv4ACL priority 10
 ```
diff --git a/...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls-3.md b/...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls-3.md
@@ -56,6 +56,6 @@ interface Management1
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 192.168.1.2
+   interface disabled default
 ```
diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls.md b/...ollections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls.md
@@ -117,10 +117,10 @@ interface Loopback0
 mpls ip
 !
 mpls ldp
-   interface disabled default
    router-id 192.168.1.1
-   no shutdown
    transport-address interface Loopback0
+   interface disabled default
+   no shutdown
 !
 mpls icmp fragmentation-needed tunneling
 ```