Refactor(eos_cli_config_gen): Remove primary key of system.control_pl…

…ane.ipv4/6_access_group and make vrf key unique
aristanetworks · Sep 13, 2024 · c654f01 · c654f01
1 parent f6d38e7
commit c654f01
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 8 deletions.
diff --git a/...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md b/...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md
@@ -52,9 +52,11 @@ interface Management1
 | -------- | --- | ------------|
 | IPv4 | default | acl4_1 |
 | IPv4 | red | acl4_2 |
+| IPv4 | red_1 | acl4_2 |
 | IPv4 | default | acl4_3 |
 | IPv6 | default | acl6_1 |
 | IPv6 | blue | acl6_2 |
+| IPv6 | blue_1 | acl6_2 |
 | IPv6 | default | acl6_3 |
 
 #### System Control-Plane Device Configuration
@@ -65,9 +67,11 @@ system control-plane
    tcp mss ceiling ipv4 1344 ipv6 1366
    ip access-group acl4_1 in
    ip access-group acl4_2 vrf red in
+   ip access-group acl4_2 vrf red_1 in
    ip access-group acl4_3 vrf default in
    ipv6 access-group acl6_1 in
    ipv6 access-group acl6_2 vrf blue in
+   ipv6 access-group acl6_2 vrf blue_1 in
    ipv6 access-group acl6_3 vrf default in
 ```
 

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg
@@ -12,7 +12,9 @@ system control-plane
    tcp mss ceiling ipv4 1344 ipv6 1366
    ip access-group acl4_1 in
    ip access-group acl4_2 vrf red in
+   ip access-group acl4_2 vrf red_1 in
    ip access-group acl4_3 vrf default in
    ipv6 access-group acl6_1 in
    ipv6 access-group acl6_2 vrf blue in
+   ipv6 access-group acl6_2 vrf blue_1 in
    ipv6 access-group acl6_3 vrf default in
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/system.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/system.yml
@@ -7,12 +7,16 @@ system:
       - acl_name: "acl4_1"
       - acl_name: "acl4_2"
         vrf: red
+      - acl_name: "acl4_2"
+        vrf: red_1
       - acl_name: "acl4_3"
         vrf: default
     ipv6_access_groups:
       - acl_name: "acl6_1"
       - acl_name: "acl6_2"
         vrf: blue
+      - acl_name: "acl6_2"
+        vrf: blue_1
       - acl_name: "acl6_3"
         vrf: default
   l1:

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/system.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/system.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/system.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/system.schema.yml
@@ -24,24 +24,28 @@ keys:
                 description: Segment size.
           ipv4_access_groups:
             type: list
-            primary_key: acl_name
+            unique_keys:
+              - vrf
             items:
               type: dict
               keys:
                 acl_name:
                   type: str
+                  required: true
                 vrf:
                   type: str
                   convert_types:
                     - int
           ipv6_access_groups:
             type: list
-            primary_key: acl_name
+            unique_keys:
+              - vrf
             items:
               type: dict
               keys:
                 acl_name:
                   type: str
+                  required: true
                 vrf:
                   type: str
                   convert_types: