Refactoring more shared_utils

aristanetworks · Nov 5, 2024 · 0c63b54 · 0c63b54
1 parent 824bbf9
commit 0c63b54
Show file tree

Hide file tree

Showing 77 changed files with 9,596 additions and 9,658 deletions.
diff --git a/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/inet-cloud.yml b/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/inet-cloud.yml
@@ -23,8 +23,8 @@ router_bgp:
       activate: true
   neighbors:
   - ip_address: 100.64.21.2
-    remote_as: '65000'
     peer_group: IPv4-UNDERLAY-PEERS
+    remote_as: '65000'
     default_originate:
       enabled: true
       always: true

diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/pf1.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/pf1.yml
@@ -236,32 +236,32 @@ ip_access_lists:
   entries:
   - sequence: 1
     remark: 'Not for PRODUCTION: This ACL is built this way because the lab has an out-of-band interface'
-  - sequence: 10
+  - source: any
+    destination: 100.64.100.2
+    sequence: 10
     action: permit
     protocol: udp
-    source: any
-    destination: 100.64.100.2
     destination_ports_match: eq
     destination_ports:
     - isakmp
     - non500-isakmp
-  - sequence: 20
+  - source: any
+    destination: 100.64.100.2
+    sequence: 20
     action: permit
     protocol: udp
-    source: any
-    destination: 100.64.100.2
     destination_ports_match: eq
     destination_ports:
     - '3478'
-  - sequence: 30
+  - source: any
+    destination: 100.64.100.2
+    sequence: 30
     action: permit
     protocol: icmp
-    source: any
-    destination: 100.64.100.2
-  - action: deny
-    protocol: ip
-    source: any
+  - source: any
     destination: any
+    action: deny
+    protocol: ip
 ip_extcommunity_lists:
 - name: ECL-EVPN-SOO
   entries:

diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/pf2.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/pf2.yml
@@ -236,32 +236,32 @@ ip_access_lists:
   entries:
   - sequence: 1
     remark: 'Not for PRODUCTION: This ACL is built this way because the lab has an out-of-band interface'
-  - sequence: 10
+  - source: any
+    destination: 100.64.200.2
+    sequence: 10
     action: permit
     protocol: udp
-    source: any
-    destination: 100.64.200.2
     destination_ports_match: eq
     destination_ports:
     - isakmp
     - non500-isakmp
-  - sequence: 20
+  - source: any
+    destination: 100.64.200.2
+    sequence: 20
     action: permit
     protocol: udp
-    source: any
-    destination: 100.64.200.2
     destination_ports_match: eq
     destination_ports:
     - '3478'
-  - sequence: 30
+  - source: any
+    destination: 100.64.200.2
+    sequence: 30
     action: permit
     protocol: icmp
-    source: any
-    destination: 100.64.200.2
-  - action: deny
-    protocol: ip
-    source: any
+  - source: any
     destination: any
+    action: deny
+    protocol: ip
 ip_extcommunity_lists:
 - name: ECL-EVPN-SOO
   entries:

diff --git a/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan1.yml b/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan1.yml
@@ -458,24 +458,24 @@ ip_access_lists:
   entries:
   - sequence: 1
     remark: 'Not for PRODUCTION: This ACL is built this way because the lab has an out-of-band interface'
-  - sequence: 10
+  - source: any
+    destination: 100.64.10.2
+    sequence: 10
     action: permit
     protocol: udp
-    source: any
-    destination: 100.64.10.2
     destination_ports_match: eq
     destination_ports:
     - isakmp
     - non500-isakmp
-  - sequence: 30
+  - source: any
+    destination: 100.64.10.2
+    sequence: 30
     action: permit
     protocol: icmp
-    source: any
-    destination: 100.64.10.2
-  - action: deny
-    protocol: ip
-    source: any
+  - source: any
     destination: any
+    action: deny
+    protocol: ip
 ip_extcommunity_lists:
 - name: ECL-EVPN-SOO
   entries:

diff --git a/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan2.yml b/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan2.yml
@@ -459,24 +459,24 @@ ip_access_lists:
   entries:
   - sequence: 1
     remark: 'Not for PRODUCTION: This ACL is built this way because the lab has an out-of-band interface'
-  - sequence: 10
+  - source: any
+    destination: 100.64.11.2
+    sequence: 10
     action: permit
     protocol: udp
-    source: any
-    destination: 100.64.11.2
     destination_ports_match: eq
     destination_ports:
     - isakmp
     - non500-isakmp
-  - sequence: 30
+  - source: any
+    destination: 100.64.11.2
+    sequence: 30
     action: permit
     protocol: icmp
-    source: any
-    destination: 100.64.11.2
-  - action: deny
-    protocol: ip
-    source: any
+  - source: any
     destination: any
+    action: deny
+    protocol: ip
 ip_extcommunity_lists:
 - name: ECL-EVPN-SOO
   entries:

diff --git a/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan2.yml b/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan2.yml
@@ -393,32 +393,32 @@ ip_access_lists:
   entries:
   - sequence: 1
     remark: 'Not for PRODUCTION: This ACL is built this way because the lab has an out-of-band interface'
-  - sequence: 10
+  - source: any
+    destination: 100.64.21.2
+    sequence: 10
     action: permit
     protocol: udp
-    source: any
-    destination: 100.64.21.2
     destination_ports_match: eq
     destination_ports:
     - isakmp
     - non500-isakmp
-  - sequence: 20
+  - source: any
+    destination: 100.64.21.2
+    sequence: 20
     action: permit
     protocol: tcp
-    source: any
-    destination: 100.64.21.2
     destination_ports_match: eq
     destination_ports:
     - bgp
-  - sequence: 30
+  - source: any
+    destination: 100.64.21.2
+    sequence: 30
     action: permit
     protocol: icmp
-    source: any
-    destination: 100.64.21.2
-  - action: deny
-    protocol: ip
-    source: any
+  - source: any
     destination: any
+    action: deny
+    protocol: ip
 ip_extcommunity_lists:
 - name: ECL-EVPN-SOO
   entries:

diff --git a/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site3-wan1.yml b/..._collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site3-wan1.yml
@@ -276,24 +276,24 @@ ip_access_lists:
   entries:
   - sequence: 1
     remark: 'Not for PRODUCTION: This ACL is built this way because the lab has an out-of-band interface'
-  - sequence: 10
+  - source: any
+    destination: 100.64.30.2
+    sequence: 10
     action: permit
     protocol: udp
-    source: any
-    destination: 100.64.30.2
     destination_ports_match: eq
     destination_ports:
     - isakmp
     - non500-isakmp
-  - sequence: 30
+  - source: any
+    destination: 100.64.30.2
+    sequence: 30
     action: permit
     protocol: icmp
-    source: any
-    destination: 100.64.30.2
-  - action: deny
-    protocol: ip
-    source: any
+  - source: any
     destination: any
+    action: deny
+    protocol: ip
 ip_extcommunity_lists:
 - name: ECL-EVPN-SOO
   entries:

diff --git a/...ista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER2.yml b/...ista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER2.yml
@@ -105,9 +105,9 @@ router_bgp:
         activate: true
     neighbors:
     - ip_address: 192.168.48.1
+      remote_as: '65201'
       description: TENANT_B_CPE_SITE3
       password: toZKiUFLVUTU4hdS5V8F4Q==
-      remote_as: '65201'
     updates:
       wait_install: true
   vlans:

diff --git a/...ista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LER1.yml b/...ista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE2-LER1.yml
@@ -101,9 +101,9 @@ router_bgp:
         activate: true
     neighbors:
     - ip_address: 192.168.48.3
+      remote_as: '65202'
       description: TENANT_B_CPE_SITE5
       password: OajzUG59/YF0NkgvOQyRnQ==
-      remote_as: '65202'
     updates:
       wait_install: true
   vlans:

diff --git a/.../eos_designs_unit_tests/intended/structured_configs/ignore-custom-keys-in-data-models.yml b/.../eos_designs_unit_tests/intended/structured_configs/ignore-custom-keys-in-data-models.yml
@@ -21,11 +21,11 @@ management_api_http:
   enable_https: true
 ip_igmp_snooping:
   globally_enabled: true
-_custom_key2:
-- custom_value2
 ethernet_interfaces:
 - name: Ethernet1
   switchport:
     enabled: true
   _custom_key3:
     custom_dict3: custom_value3
+_custom_key2:
+- custom_value2
diff --git a/...sta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/platform_settings.yml b/...sta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/platform_settings.yml
@@ -29,6 +29,6 @@ ip_igmp_snooping:
   globally_enabled: true
 ethernet_interfaces:
 - name: Ethernet12
+  description: Interface Created from platform_settings.structured_config
   switchport:
     enabled: true
-  description: Interface Created from platform_settings.structured_config
diff --git a/...ections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml b/...ections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml
@@ -104,35 +104,35 @@ router_bgp:
     remote_as: '65133'
   - ip_address: 123.1.1.10
     remote_as: '1234'
-    password: oBztv71m2uhR7hh58/OCNA==
+    local_as: '123'
     description: External IPv4 BGP peer
-    send_community: standard extended
-    maximum_routes: 0
+    password: oBztv71m2uhR7hh58/OCNA==
+    update_source: Loopback123
+    route_map_in: RM-123-1-1-10-IN
+    route_map_out: RM-Tenant_A_WAN_Zone-123.1.1.10-SET-NEXT-HOP-OUT
     default_originate:
       always: false
       route_map: RM-Tenant_A_WAN_Zone-123.1.1.10-SET-NEXT-HOP-OUT
-    update_source: Loopback123
+    send_community: standard extended
+    maximum_routes: 0
     ebgp_multihop: 3
-    route_map_in: RM-123-1-1-10-IN
-    route_map_out: RM-Tenant_A_WAN_Zone-123.1.1.10-SET-NEXT-HOP-OUT
-    local_as: '123'
   - ip_address: 123.1.1.11
     remote_as: '1234'
-    password: oBztv71m2uhR7hh58/OCNA==
+    local_as: '123'
     description: External IPv4 BGP peer
-    send_community: standard extended
-    maximum_routes: 0
-    default_originate:
-      always: false
+    password: oBztv71m2uhR7hh58/OCNA==
     update_source: Loopback123
-    ebgp_multihop: 3
     route_map_in: RM-123-1-1-11-IN
     route_map_out: RM-123-1-1-11-OUT
-    local_as: '123'
+    default_originate:
+      always: false
+    send_community: standard extended
+    maximum_routes: 0
+    ebgp_multihop: 3
   - ip_address: fd5a:fe45:8831:06c5::a
     remote_as: '12345'
-    send_community: all
     route_map_out: RM-Tenant_A_WAN_Zone-fd5a:fe45:8831:06c5::a-SET-NEXT-HOP-OUT
+    send_community: all
   - ip_address: fd5a:fe45:8831:06c5::b
     remote_as: '12345'
   address_family_evpn:

diff --git a/...sta/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml b/...sta/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-BL1A.yml
@@ -121,30 +121,30 @@ router_bgp:
     neighbors:
     - ip_address: 123.1.1.10
       remote_as: '1234'
-      password: oBztv71m2uhR7hh58/OCNA==
       description: External IPv4 BGP peer
+      password: oBztv71m2uhR7hh58/OCNA==
       send_community: standard extended
       maximum_routes: 0
       default_originate:
         always: false
         route_map: RM-Tenant_A_WAN_Zone-123.1.1.10-SET-NEXT-HOP-OUT
       update_source: Loopback123
       ebgp_multihop: 3
-      route_map_in: RM-123-1-1-10-IN
       route_map_out: RM-Tenant_A_WAN_Zone-123.1.1.10-SET-NEXT-HOP-OUT
+      route_map_in: RM-123-1-1-10-IN
       local_as: '123'
     - ip_address: 123.1.1.11
       remote_as: '1234'
-      password: oBztv71m2uhR7hh58/OCNA==
       description: External IPv4 BGP peer
+      password: oBztv71m2uhR7hh58/OCNA==
       send_community: standard extended
       maximum_routes: 0
       default_originate:
         always: false
       update_source: Loopback123
       ebgp_multihop: 3
-      route_map_in: RM-123-1-1-11-IN
       route_map_out: RM-123-1-1-11-OUT
+      route_map_in: RM-123-1-1-11-IN
       local_as: '123'
     - ip_address: fd5a:fe45:8831:06c5::a
       remote_as: '12345'
@@ -245,15 +245,15 @@ static_routes:
   gateway: 1.2.3.4
   vrf: Tenant_A_WAN_Zone
 - destination_address_prefix: 1.1.1.0/24
-  interface: vlan101
   gateway: 10.1.1.1
+  interface: vlan101
   vrf: Tenant_A_WAN_Zone
 - destination_address_prefix: 1.1.2.0/24
-  interface: vlan101
   gateway: 10.1.1.1
   distance: 200
   tag: 666
   name: RT-TO-FAKE-DMZ
+  interface: vlan101
   vrf: Tenant_A_WAN_Zone
 - destination_address_prefix: 10.3.5.0/24
   interface: Null0