Refactor(eos_cli_config_gen): Rearrange eos_cli output to match with …

…eos for `port-channel-interfaces` (#4557) Co-authored-by: Laxmikant Chintakindi <[email protected]> Co-authored-by: Claus Holbech <[email protected]> Co-authored-by: Guillaume Mulocher <[email protected]>
aristanetworks · Oct 11, 2024 · 57203f3 · 57203f3
1 parent 72226dc
commit 57203f3
Show file tree

Hide file tree

Showing 55 changed files with 789 additions and 617 deletions.
diff --git a/...avd/molecule/eos_cli_config_gen/documentation/devices/l2-protocol-forwarding.md b/...avd/molecule/eos_cli_config_gen/documentation/devices/l2-protocol-forwarding.md
@@ -152,6 +152,6 @@ interface Ethernet1
 !
 interface Port-Channel1
    description L2PF test
-   switchport
    l2-protocol forwarding profile TEST2
+   switchport
 ```
diff --git a/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md b/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md
@@ -395,6 +395,7 @@ interface Port-Channel5
    switchport trunk allowed vlan 110,201
    switchport mode trunk
    switchport
+   ip verify unicast source reachable-via rx
    ip igmp host-proxy
    ip igmp host-proxy 239.0.0.1
    ip igmp host-proxy 239.0.0.2 exclude 10.0.2.1
@@ -410,7 +411,6 @@ interface Port-Channel5
    l2 mtu 8000
    l2 mru 8000
    mlag 5
-   ip verify unicast source reachable-via rx
    storm-control broadcast level 1
    storm-control multicast level 1
    storm-control unknown-unicast level 1
@@ -432,18 +432,19 @@ interface Port-Channel8.101
 !
 interface Port-Channel9
    no switchport
-   spanning-tree guard root
    ip address 10.9.2.3/31
    bfd interval 500 min-rx 500 multiplier 5
    bfd echo
    bfd neighbor 10.1.2.4
    bfd per-link rfc-7130
+   spanning-tree guard root
 !
 interface Port-Channel10
    description SRV01_bond0
    switchport trunk allowed vlan 2-3000
    switchport mode trunk
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0404:0404:0303
       route-target import 04:04:03:03:02:02
@@ -460,6 +461,7 @@ interface Port-Channel12
 interface Port-Channel13
    description EVPN-Vxlan single-active redundancy
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0000:0102:0304
       redundancy single-active
@@ -471,6 +473,7 @@ interface Port-Channel13
 interface Port-Channel14
    description EVPN-MPLS multihoming
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0000:0102:0305
       mpls tunnel flood filter time 100
@@ -519,6 +522,7 @@ interface Port-Channel50
    switchport trunk allowed vlan 1-4000
    switchport mode trunk
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0303:0202:0101
       route-target import 03:03:02:02:01:01
@@ -529,13 +533,13 @@ interface Port-Channel51
    switchport trunk allowed vlan 1-500
    switchport mode trunk
    switchport
+   ipv6 nd prefix a1::/64 infinite infinite no-autoconfig
    switchport port-security
    no switchport port-security mac-address maximum disabled
    switchport port-security vlan 1 mac-address maximum 3
    switchport port-security vlan 2 mac-address maximum 3
    switchport port-security vlan 3 mac-address maximum 3
    switchport port-security vlan default mac-address maximum 2
-   ipv6 nd prefix a1::/64 infinite infinite no-autoconfig
 !
 interface Port-Channel99
    description MCAST
@@ -587,19 +591,19 @@ interface Port-Channel100
 !
 interface Port-Channel100.101
    description IFL for TENANT01
-   logging event link-status
    mtu 1500
+   logging event link-status
    encapsulation dot1q vlan 101
    ip address 10.1.1.3/31
 !
 interface Port-Channel100.102
    description IFL for TENANT02
-   no logging event link-status
-   logging event storm-control discards
    mtu 1500
+   no logging event link-status
    encapsulation dot1q vlan 102 inner 110
    vrf C2
    ip address 10.1.2.3/31
+   logging event storm-control discards
 !
 interface Port-Channel101
    description PVLAN Promiscuous Access - only one secondary
@@ -629,8 +633,8 @@ interface Port-Channel104
    switchport trunk allowed vlan 112
    switchport mode trunk
    switchport
-   port-channel lacp fallback timeout 300
    port-channel lacp fallback individual
+   port-channel lacp fallback timeout 300
 !
 interface Port-Channel105
    description bpdu disabled
@@ -673,8 +677,8 @@ interface Port-Channel110
    isis bfd
    isis circuit-type level-2
    isis metric 99
-   isis network point-to-point
    isis hello padding
+   isis network point-to-point
    isis authentication mode text
    isis authentication key 7 <removed>
 !
@@ -684,34 +688,41 @@ interface Port-Channel111
 !
 interface Port-Channel111.1
    description TENANT_A pseudowire 1 interface
+   !
    encapsulation vlan
       client unmatched
 !
 interface Port-Channel111.100
    description TENANT_A pseudowire 2 interface
+   !
    encapsulation vlan
       client dot1q 100 network client
 !
 interface Port-Channel111.200
    description TENANT_A pseudowire 3 interface
+   !
    encapsulation vlan
       client dot1q 200
 !
 interface Port-Channel111.300
    description TENANT_A pseudowire 4 interface
+   !
    encapsulation vlan
       client dot1q 300 network dot1q 400
 !
 interface Port-Channel111.400
    description TENANT_A pseudowire 3 interface
+   !
    encapsulation vlan
       client dot1q outer 400 inner 20 network dot1q outer 401 inner 21
 !
 interface Port-Channel111.1000
    description L2 Subinterface
    vlan id 1000
+   !
    encapsulation vlan
       client dot1q 100 network client
+   !
    evpn ethernet-segment
       identifier 0000:0000:0303:0202:0101
       route-target import 03:03:02:02:01:01
@@ -722,23 +733,23 @@ interface Port-Channel112
    switchport trunk allowed vlan 112
    switchport mode trunk
    switchport
-   port-channel lacp fallback timeout 5
    port-channel lacp fallback individual
+   port-channel lacp fallback timeout 5
 !
 interface Port-Channel113
    description interface_with_mpls_enabled
    no switchport
    ip address 172.31.128.9/31
-   mpls ip
-   mpls ldp interface
    mpls ldp igp sync
+   mpls ldp interface
+   mpls ip
 !
 interface Port-Channel114
    description interface_with_mpls_disabled
    no switchport
    ip address 172.31.128.10/31
-   no mpls ip
    no mpls ldp interface
+   no mpls ip
 !
 interface Port-Channel115
    description native-vlan-tag-precedence
@@ -796,51 +807,61 @@ interface Port-Channel131
 !
 interface Port-Channel131.1
    description Test_encapsulation_vlan1
+   !
    encapsulation vlan
       client dot1q outer 23 inner dot1q 45 network dot1ad outer 32 inner dot1ad 54
 !
 interface Port-Channel131.2
    description Test_encapsulation_vlan2
+   !
    encapsulation vlan
       client dot1q 10 network dot1q outer 32 inner 54
 !
 interface Port-Channel131.3
    description Test_encapsulation_vlan3
+   !
    encapsulation vlan
       client dot1ad 12 network dot1q 25
 !
 interface Port-Channel131.4
    description Test_encapsulation_vlan4
+   !
    encapsulation vlan
       client dot1ad outer 35 inner dot1q 60 network dot1q outer 53 inner dot1ad 6
 !
 interface Port-Channel131.5
    description Test_encapsulation_vlan5
+   !
    encapsulation vlan
       client dot1ad outer 35 inner 60 network dot1ad outer 52 inner 62
 !
 interface Port-Channel131.6
    description Test_encapsulation_vlan6
+   !
    encapsulation vlan
       client dot1ad outer 35 inner 60 network client
 !
 interface Port-Channel131.7
    description Test_encapsulation_vlan7
+   !
    encapsulation vlan
       client untagged network dot1ad outer 35 inner 60
 !
 interface Port-Channel131.8
    description Test_encapsulation_vlan8
+   !
    encapsulation vlan
       client untagged network dot1q outer 35 inner 60
 !
 interface Port-Channel131.9
    description Test_encapsulation_vlan9
+   !
    encapsulation vlan
       client untagged network untagged
 !
 interface Port-Channel131.10
    description Test_encapsulation_vlan9
+   !
    encapsulation vlan
       client dot1q outer 14 inner 11 network client inner
 ```

diff --git a/...collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ptp.md b/...collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ptp.md
@@ -155,10 +155,10 @@ interface Port-Channel5
    mlag 5
    ptp enable
    ptp mpass
-   ptp profile g8275.1 destination mac-address forwardable
    ptp delay-mechanism e2e
-   ptp sync-message interval 1
+   ptp profile g8275.1 destination mac-address forwardable
    ptp role dynamic
-   ptp vlan 2
+   ptp sync-message interval 1
    ptp transport layer2
+   ptp vlan 2
 ```
diff --git a/...collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/qos.md b/...collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/qos.md
@@ -135,10 +135,10 @@ interface Port-Channel3
    switchport trunk group LEAF_PEER_L3
    switchport trunk group MLAG
    switchport
+   service-policy type qos input pmap_test1
+   service-profile experiment
    qos trust cos
    qos cos 2
-   service-profile experiment
-   service-policy type qos input pmap_test1
 ```
 
 ## ACL

diff --git a/...ons/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-ospf.md b/...ons/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-ospf.md
@@ -81,10 +81,10 @@ interface Ethernet1
 !
 interface Port-Channel12
    no switchport
-   ip ospf network point-to-point
-   ip ospf area 0.0.0.12
    ip ospf cost 99
+   ip ospf network point-to-point
    ip ospf authentication message-digest
+   ip ospf area 0.0.0.12
    ip ospf message-digest-key 55 md5 7 <removed>
 ```
 

diff --git a/...rista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md b/...rista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md
@@ -74,9 +74,9 @@ interface Ethernet1
 ```eos
 !
 interface Port-Channel2
-   no switchport
    traffic-policy input BLUE-C1-POLICY
    traffic-policy output BLUE-C2-POLICY
+   no switchport
 ```
 
 ### Traffic Policies information

diff --git a/...ctions/arista/avd/molecule/eos_cli_config_gen/intended/configs/l2-protocol-forwarding.cfg b/...ctions/arista/avd/molecule/eos_cli_config_gen/intended/configs/l2-protocol-forwarding.cfg
@@ -39,8 +39,8 @@ l2-protocol
 !
 interface Port-Channel1
    description L2PF test
-   switchport
    l2-protocol forwarding profile TEST2
+   switchport
 !
 interface Ethernet1
    description L2PF test