Refactoring more in shared_utils

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

Hide file tree

Showing 39 changed files with 274 additions and 338 deletions.
diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1A.yml
@@ -650,32 +650,32 @@ vlans:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Ethernet12
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.10.40.10
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.10.40.10
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Ethernet13.10
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.10.40.20
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.10.40.20
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Ethernet12
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.10.40.10
+  - source: 10.10.40.10
     destination: any
+    action: permit
+    protocol: ip
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Ethernet13.10
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.10.40.20
+  - source: 10.10.40.20
     destination: any
+    action: permit
+    protocol: ip
 ip_igmp_snooping:
   globally_enabled: true
 ip_virtual_router_mac_address: 00:dc:00:00:00:0a

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-BL1B.yml
@@ -618,32 +618,32 @@ vlans:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Ethernet12
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.10.50.10
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.10.50.10
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Ethernet13.10
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.10.50.20
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.10.50.20
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Ethernet12
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.10.50.10
+  - source: 10.10.50.10
     destination: any
+    action: permit
+    protocol: ip
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Ethernet13.10
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.10.50.20
+  - source: 10.10.50.20
     destination: any
+    action: permit
+    protocol: ip
 ip_igmp_snooping:
   globally_enabled: true
 ip_virtual_router_mac_address: 00:dc:00:00:00:0a

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml
@@ -978,18 +978,18 @@ vlans:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Vlan110
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.1.10.1
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.1.10.1
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Vlan110
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.1.10.1
+  - source: 10.1.10.1
     destination: any
+    action: permit
+    protocol: ip
 ip_igmp_snooping:
   globally_enabled: true
   vlans:

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml
@@ -923,18 +923,18 @@ vlans:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Vlan110
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.1.10.1
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.1.10.1
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Vlan110
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.1.10.1
+  - source: 10.1.10.1
     destination: any
+    action: permit
+    protocol: ip
 ip_igmp_snooping:
   globally_enabled: true
   vlans:

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml
@@ -1679,18 +1679,18 @@ router_bfd:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Vlan110
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.1.10.1
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.1.10.1
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Vlan110
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.1.10.1
+  - source: 10.1.10.1
     destination: any
+    action: permit
+    protocol: ip
 ip_igmp_snooping:
   globally_enabled: true
   vlans:

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml
@@ -1628,18 +1628,18 @@ router_bfd:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Vlan110
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.1.10.1
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.1.10.1
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Vlan110
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.1.10.1
+  - source: 10.1.10.1
     destination: any
+    action: permit
+    protocol: ip
 ip_igmp_snooping:
   globally_enabled: true
   vlans:

diff --git a/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml b/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml
@@ -1009,18 +1009,18 @@ router_bfd:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Vlan110
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.1.10.1
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.1.10.1
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Vlan110
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.1.10.1
+  - source: 10.1.10.1
     destination: any
+    action: permit
+    protocol: ip
 ip_igmp_snooping:
   globally_enabled: true
   vlans:

diff --git a/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml b/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml
@@ -1009,18 +1009,18 @@ router_bfd:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Vlan110
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.1.10.1
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.1.10.1
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Vlan110
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.1.10.1
+  - source: 10.1.10.1
     destination: any
+    action: permit
+    protocol: ip
 ip_igmp_snooping:
   globally_enabled: true
   vlans:

diff --git a/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml b/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge1.yml
@@ -365,39 +365,39 @@ agents:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Ethernet1_49.3
   entries:
-  - sequence: 15
+  - source: any
+    destination: 172.24.49.3
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
+  - source: 172.24.49.2
     destination: 172.24.49.3
-  - action: permit
+    action: permit
     protocol: ip
-    source: 172.24.49.2
-    destination: 172.24.49.3
 - name: ACL-NAT-IE-DIRECT
   entries:
-  - sequence: 10
+  - source: any
+    destination: 5.0.0.0/24
+    sequence: 10
     action: deny
     protocol: ip
-    source: any
-    destination: 5.0.0.0/24
-  - sequence: 20
+  - source: any
+    destination: any
+    sequence: 20
     action: permit
     protocol: ip
-    source: any
-    destination: any
 - name: ACL-NAT-IE-ZSCALER
   entries:
-  - sequence: 10
+  - source: any
+    destination: 10.0.0.0/24
+    sequence: 10
     action: permit
     protocol: ip
-    source: any
-    destination: 10.0.0.0/24
-  - sequence: 20
+  - source: any
+    destination: any
+    sequence: 20
     action: deny
     protocol: ip
-    source: any
-    destination: any
 ip_extcommunity_lists:
 - name: ECL-EVPN-SOO
   entries:

diff --git a/...lecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml b/...lecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml
@@ -666,18 +666,18 @@ vlans:
 ip_access_lists:
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-IN_Vlan110
   entries:
-  - sequence: 15
+  - source: any
+    destination: 10.1.10.1
+    sequence: 15
     action: deny
     protocol: ip
-    source: any
-    destination: 10.1.10.1
 - name: TEST-IPV4-ACL-WITH-IP-FIELDS-OUT_Vlan110
   entries:
   - remark: Some remark will not require source and destination fields.
-  - action: permit
-    protocol: ip
-    source: 10.1.10.1
+  - source: 10.1.10.1
     destination: any
+    action: permit
+    protocol: ip
 ip_igmp_snooping:
   globally_enabled: true
   vlans: