Refactor(eos_cli_config_gen): Rearrange the eos-cli config for `vlan-…

…interfaces` to match with EOS (#4488)
aristanetworks · Oct 7, 2024 · b309e7a · b309e7a
1 parent a8b2b17
commit b309e7a
Show file tree

Hide file tree

Showing 20 changed files with 175 additions and 170 deletions.
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
@@ -131,10 +131,10 @@ interface Loopback2
 ```eos
 !
 interface Vlan24
-   ip ospf network point-to-point
-   ip ospf area 0.0.0.24
    ip ospf cost 99
+   ip ospf network point-to-point
    ip ospf authentication message-digest
+   ip ospf area 0.0.0.24
    ip ospf message-digest-key 55 md5 7 <removed>
 ```
 

diff --git a/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/vlan-interfaces.md b/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/vlan-interfaces.md
@@ -221,15 +221,15 @@ interface Vlan24
    ipv6 address 1b11:3a00:22b0:6::15/64
    ipv6 nd managed-config-flag
    ipv6 nd prefix 1b11:3a00:22b0:6::/64 infinite infinite no-autoconfig
-   ipv6 virtual-router address 1b11:3a00:22b0:6::1
    ip address virtual 10.10.24.1/24
+   ipv6 virtual-router address 1b11:3a00:22b0:6::1
 !
 interface Vlan25
    description SVI Description
    no shutdown
    ipv6 address 1b11:3a00:22b0:16::16/64
-   ipv6 virtual-router address 1b11:3a00:22b0:16::15
    ipv6 virtual-router address 1b11:3a00:22b0:16::14
+   ipv6 virtual-router address 1b11:3a00:22b0:16::15
 !
 interface Vlan41
    description SVI Description
@@ -277,8 +277,8 @@ interface Vlan43
 interface Vlan44
    description SVI Description
    no shutdown
-   ipv6 dhcp relay destination a0::5 vrf TEST source-address a0::6 link-address a0::7
    ipv6 dhcp relay destination a0::8
+   ipv6 dhcp relay destination a0::5 vrf TEST source-address a0::6 link-address a0::7
    ipv6 address a0::4/64
 !
 interface Vlan50
@@ -301,17 +301,17 @@ interface Vlan75
    multicast ipv6 boundary ff00::/16 out
    multicast ipv6 boundary ff01::/16 out
    multicast ipv4 static
-   ipv6 virtual-router address 1b11:3a00:22b0:1000::1
    ip address virtual 10.10.75.1/24
+   ipv6 virtual-router address 1b11:3a00:22b0:1000::1
 !
 interface Vlan81
    description IPv6 Virtual Address
    vrf Tenant_C
    ipv6 enable
+   ip address virtual 10.10.81.1/24
    ipv6 address virtual fc00:10:10:81::1/64
    ipv6 address virtual fc00:10:11:81::1/64
    ipv6 address virtual fc00:10:12:81::1/64
-   ip address virtual 10.10.81.1/24
 !
 interface Vlan83
    description SVI Description
@@ -326,8 +326,8 @@ interface Vlan83
 interface Vlan84
    description SVI Description
    arp gratuitous accept
-   arp monitor mac-address
    ip address 10.10.84.1/24
+   arp monitor mac-address
    isis enable EVPN_UNDERLAY
    isis authentication mode sha key-id 2 rx-disabled
    isis authentication key 0 password
@@ -336,20 +336,20 @@ interface Vlan84
 !
 interface Vlan85
    description SVI Description
-   arp cache dynamic capacity 50000
    ip address 10.10.84.1/24
+   arp cache dynamic capacity 50000
+   bfd interval 500 min-rx 500 multiplier 5
+   bfd echo
    isis enable EVPN_UNDERLAY
    isis authentication mode sha key-id 2
    isis authentication key 0 password
-   bfd interval 500 min-rx 500 multiplier 5
-   bfd echo
 !
 interface Vlan86
    description SVI Description
    ip address 10.10.83.1/24
+   ip attached-host route export 10
    isis enable EVPN_UNDERLAY
    isis authentication mode shared-secret profile profile1 algorithm sha-1 rx-disabled
-   ip attached-host route export 10
 !
 interface Vlan87
    description SVI Description
@@ -388,51 +388,51 @@ interface Vlan89
    multicast ipv6 static
    pim ipv4 sparse-mode
    pim ipv4 local-interface Loopback0
-   ipv6 virtual-router address 1b11:3a00:22b0:5200::3
    ip address virtual 10.10.144.3/20
+   ipv6 virtual-router address 1b11:3a00:22b0:5200::3
 !
 interface Vlan90
    description SVI Description
    ip address 10.10.83.1/24
+   ip attached-host route export
    isis enable EVPN_UNDERLAY
    isis authentication mode shared-secret profile profile2 algorithm sha-1 level-1
    isis authentication mode shared-secret profile profile1 algorithm sha-256 level-2
-   ip attached-host route export
 !
 interface Vlan91
    description PBR Description
    shutdown
+   service-policy type pbr input MyServicePolicy
    isis enable EVPN_UNDERLAY
    isis authentication mode md5 level-1
    isis authentication mode text level-2
    isis authentication key 0 password level-1
    isis authentication key 0 password level-2
-   service-policy type pbr input MyServicePolicy
 !
 interface Vlan92
    description SVI Description
    ip proxy-arp
-   ip directed-broadcast
    ip address 10.10.92.1/24
+   ip directed-broadcast
    isis enable EVPN_UNDERLAY
    isis authentication mode shared-secret profile profile2 algorithm sha-1 rx-disabled level-1
    isis authentication mode shared-secret profile profile1 algorithm sha-256 rx-disabled level-2
 !
 interface Vlan110
    description PVLAN Primary with vlan mapping
    no shutdown
+   pvlan mapping 111-112
    vrf Tenant_A
    ip address 10.0.101.1/24
    multicast ipv4 boundary ACL_MULTICAST out
    multicast ipv6 source route export 20
    multicast ipv4 static
-   pvlan mapping 111-112
 !
 interface Vlan333
    description Multiple VRIDs and tracking
    no shutdown
-   arp aging timeout 180
    ip address 192.0.2.2/25
+   arp aging timeout 180
    ipv6 enable
    ipv6 address 2001:db8:333::2/64
    ipv6 address fe80::2/64 link-local
@@ -497,8 +497,8 @@ interface Vlan501
 interface Vlan667
    description Multiple VRIDs
    no shutdown
-   arp aging timeout 180
    ip address 192.0.2.2/25
+   arp aging timeout 180
    ipv6 enable
    ipv6 address 2001:db8:667::2/64
    ipv6 address fe80::2/64 link-local
@@ -529,8 +529,8 @@ interface Vlan1002
 !
 interface Vlan2001
    description SVI Description
-   vrf Tenant_B
    logging event link-status
+   vrf Tenant_B
    ip address virtual 10.2.1.1/24
    comment
    Comment created from eos_cli under vlan_interfaces.Vlan2001

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-ospf.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-ospf.cfg
@@ -24,10 +24,10 @@ interface Management1
    ip address 10.73.255.122/24
 !
 interface Vlan24
-   ip ospf network point-to-point
-   ip ospf area 0.0.0.24
    ip ospf cost 99
+   ip ospf network point-to-point
    ip ospf authentication message-digest
+   ip ospf area 0.0.0.24
    ip ospf message-digest-key 55 md5 7 ABCDEFGHIJKLMNOPQRSTUVWXYZ
 !
 router ospf 100

diff --git a/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vlan-interfaces.cfg b/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vlan-interfaces.cfg
@@ -10,15 +10,15 @@ interface Vlan24
    ipv6 address 1b11:3a00:22b0:6::15/64
    ipv6 nd managed-config-flag
    ipv6 nd prefix 1b11:3a00:22b0:6::/64 infinite infinite no-autoconfig
-   ipv6 virtual-router address 1b11:3a00:22b0:6::1
    ip address virtual 10.10.24.1/24
+   ipv6 virtual-router address 1b11:3a00:22b0:6::1
 !
 interface Vlan25
    description SVI Description
    no shutdown
    ipv6 address 1b11:3a00:22b0:16::16/64
-   ipv6 virtual-router address 1b11:3a00:22b0:16::15
    ipv6 virtual-router address 1b11:3a00:22b0:16::14
+   ipv6 virtual-router address 1b11:3a00:22b0:16::15
 !
 interface Vlan41
    description SVI Description
@@ -66,8 +66,8 @@ interface Vlan43
 interface Vlan44
    description SVI Description
    no shutdown
-   ipv6 dhcp relay destination a0::5 vrf TEST source-address a0::6 link-address a0::7
    ipv6 dhcp relay destination a0::8
+   ipv6 dhcp relay destination a0::5 vrf TEST source-address a0::6 link-address a0::7
    ipv6 address a0::4/64
 !
 interface Vlan50
@@ -90,17 +90,17 @@ interface Vlan75
    multicast ipv6 boundary ff00::/16 out
    multicast ipv6 boundary ff01::/16 out
    multicast ipv4 static
-   ipv6 virtual-router address 1b11:3a00:22b0:1000::1
    ip address virtual 10.10.75.1/24
+   ipv6 virtual-router address 1b11:3a00:22b0:1000::1
 !
 interface Vlan81
    description IPv6 Virtual Address
    vrf Tenant_C
    ipv6 enable
+   ip address virtual 10.10.81.1/24
    ipv6 address virtual fc00:10:10:81::1/64
    ipv6 address virtual fc00:10:11:81::1/64
    ipv6 address virtual fc00:10:12:81::1/64
-   ip address virtual 10.10.81.1/24
 !
 interface Vlan83
    description SVI Description
@@ -115,8 +115,8 @@ interface Vlan83
 interface Vlan84
    description SVI Description
    arp gratuitous accept
-   arp monitor mac-address
    ip address 10.10.84.1/24
+   arp monitor mac-address
    isis enable EVPN_UNDERLAY
    isis authentication mode sha key-id 2 rx-disabled
    isis authentication key 0 password
@@ -125,20 +125,20 @@ interface Vlan84
 !
 interface Vlan85
    description SVI Description
-   arp cache dynamic capacity 50000
    ip address 10.10.84.1/24
+   arp cache dynamic capacity 50000
+   bfd interval 500 min-rx 500 multiplier 5
+   bfd echo
    isis enable EVPN_UNDERLAY
    isis authentication mode sha key-id 2
    isis authentication key 0 password
-   bfd interval 500 min-rx 500 multiplier 5
-   bfd echo
 !
 interface Vlan86
    description SVI Description
    ip address 10.10.83.1/24
+   ip attached-host route export 10
    isis enable EVPN_UNDERLAY
    isis authentication mode shared-secret profile profile1 algorithm sha-1 rx-disabled
-   ip attached-host route export 10
 !
 interface Vlan87
    description SVI Description
@@ -177,51 +177,51 @@ interface Vlan89
    multicast ipv6 static
    pim ipv4 sparse-mode
    pim ipv4 local-interface Loopback0
-   ipv6 virtual-router address 1b11:3a00:22b0:5200::3
    ip address virtual 10.10.144.3/20
+   ipv6 virtual-router address 1b11:3a00:22b0:5200::3
 !
 interface Vlan90
    description SVI Description
    ip address 10.10.83.1/24
+   ip attached-host route export
    isis enable EVPN_UNDERLAY
    isis authentication mode shared-secret profile profile2 algorithm sha-1 level-1
    isis authentication mode shared-secret profile profile1 algorithm sha-256 level-2
-   ip attached-host route export
 !
 interface Vlan91
    description PBR Description
    shutdown
+   service-policy type pbr input MyServicePolicy
    isis enable EVPN_UNDERLAY
    isis authentication mode md5 level-1
    isis authentication mode text level-2
    isis authentication key 0 password level-1
    isis authentication key 0 password level-2
-   service-policy type pbr input MyServicePolicy
 !
 interface Vlan92
    description SVI Description
    ip proxy-arp
-   ip directed-broadcast
    ip address 10.10.92.1/24
+   ip directed-broadcast
    isis enable EVPN_UNDERLAY
    isis authentication mode shared-secret profile profile2 algorithm sha-1 rx-disabled level-1
    isis authentication mode shared-secret profile profile1 algorithm sha-256 rx-disabled level-2
 !
 interface Vlan110
    description PVLAN Primary with vlan mapping
    no shutdown
+   pvlan mapping 111-112
    vrf Tenant_A
    ip address 10.0.101.1/24
    multicast ipv4 boundary ACL_MULTICAST out
    multicast ipv6 source route export 20
    multicast ipv4 static
-   pvlan mapping 111-112
 !
 interface Vlan333
    description Multiple VRIDs and tracking
    no shutdown
-   arp aging timeout 180
    ip address 192.0.2.2/25
+   arp aging timeout 180
    ipv6 enable
    ipv6 address 2001:db8:333::2/64
    ipv6 address fe80::2/64 link-local
@@ -286,8 +286,8 @@ interface Vlan501
 interface Vlan667
    description Multiple VRIDs
    no shutdown
-   arp aging timeout 180
    ip address 192.0.2.2/25
+   arp aging timeout 180
    ipv6 enable
    ipv6 address 2001:db8:667::2/64
    ipv6 address fe80::2/64 link-local
@@ -318,8 +318,8 @@ interface Vlan1002
 !
 interface Vlan2001
    description SVI Description
-   vrf Tenant_B
    logging event link-status
+   vrf Tenant_B
    ip address virtual 10.2.1.1/24
    comment
    Comment created from eos_cli under vlan_interfaces.Vlan2001

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg
@@ -206,10 +206,10 @@ interface Vlan150
    description Tenant_A_WAN_Zone_1
    no shutdown
    vrf Tenant_A_WAN_Zone
-   ip ospf area 1
    ip ospf cost 100
    ip ospf authentication
    ip ospf authentication-key 7 AQQvKeimxJu+uGQ/yYvv9w==
+   ip ospf area 1
    ip address virtual 10.1.40.1/24
 !
 interface Vlan250

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg
@@ -196,10 +196,10 @@ interface Vlan150
    description Tenant_A_WAN_Zone_1
    no shutdown
    vrf Tenant_A_WAN_Zone
-   ip ospf area 1
    ip ospf cost 100
    ip ospf authentication
    ip ospf authentication-key 7 AQQvKeimxJu+uGQ/yYvv9w==
+   ip ospf area 1
    ip address virtual 10.1.40.1/24
 !
 interface Vlan250

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2A.cfg
@@ -113,10 +113,10 @@ interface Vlan150
    description Tenant_A_WAN_Zone_1
    no shutdown
    vrf Tenant_A_WAN_Zone
-   ip ospf area 1
    ip ospf cost 100
    ip ospf authentication
    ip ospf authentication-key 7 AQQvKeimxJu+uGQ/yYvv9w==
+   ip ospf area 1
    ip address virtual 10.1.40.1/24
 !
 interface Vlan250

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL2B.cfg
@@ -111,10 +111,10 @@ interface Vlan150
    description Tenant_A_WAN_Zone_1
    no shutdown
    vrf Tenant_A_WAN_Zone
-   ip ospf area 1
    ip ospf cost 100
    ip ospf authentication
    ip ospf authentication-key 7 AQQvKeimxJu+uGQ/yYvv9w==
+   ip ospf area 1
    ip address virtual 10.1.40.1/24
 !
 interface Vlan250