Refactor(eos_cli_config_gen): Deprecate community_lists data model (#…

…4396)
aristanetworks · Aug 28, 2024 · 92118f7 · 92118f7
1 parent 7cd121d
commit 92118f7
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 31 deletions.
diff --git a/...sta/avd/molecule/eos_cli_config_gen/documentation/devices/ip-community-lists.md b/...sta/avd/molecule/eos_cli_config_gen/documentation/devices/ip-community-lists.md
@@ -5,7 +5,6 @@
 - [Management](#management)
   - [Management Interfaces](#management-interfaces)
 - [Filters](#filters)
-  - [Community-lists](#community-lists)
   - [IP Community-lists](#ip-community-lists-1)
 
 ## Management
@@ -38,23 +37,6 @@ interface Management1
 
 ## Filters
 
-### Community-lists
-
-#### Community-lists Summary
-
-| Name | Action |
-| -------- | ------ |
-| TEST1 | permit 1000:1000 |
-| TEST2 | permit 2000:3000 |
-
-#### Community-lists Device Configuration
-
-```eos
-!
-ip community-list TEST1 permit 1000:1000
-ip community-list TEST2 permit 2000:3000
-```
-
 ### IP Community-lists
 
 #### IP Community-lists Summary

diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-community-lists.cfg b/...ollections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-community-lists.cfg
@@ -4,9 +4,6 @@ interface Management1
    vrf MGMT
    ip address 10.73.255.122/24
 !
-ip community-list TEST1 permit 1000:1000
-ip community-list TEST2 permit 2000:3000
-!
 ip community-list IP_CL_TEST1 permit 1001:1001 1002:1002
 ip community-list IP_CL_TEST1 deny 1010:1010
 ip community-list regexp IP_CL_TEST1 permit 20:*

diff --git a/...ections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ip-community-lists.yml b/...ections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ip-community-lists.yml
@@ -1,11 +1,4 @@
 ### IP community lists ###
-
-community_lists:
-  - name: TEST1
-    action: "permit 1000:1000"
-  - name: TEST2
-    action: "permit 2000:3000"
-
 ip_community_lists:
   - name: IP_CL_TEST1
     entries:

diff --git a/.../avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md b/.../avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md
@@ -5,6 +5,8 @@
 - [Interfaces](#interfaces)
   - [Ethernet Interfaces](#ethernet-interfaces)
   - [Port-Channel Interfaces](#port-channel-interfaces)
+- [Filters](#filters)
+  - [Community-lists](#community-lists)
 
 ## Interfaces
 
@@ -135,3 +137,22 @@ interface Port-Channel5
    switchport vlan translation out 25 49
    switchport vlan translation 34 60
 ```
+
+## Filters
+
+### Community-lists
+
+#### Community-lists Summary
+
+| Name | Action |
+| -------- | ------ |
+| TEST1 | permit 1000:1000 |
+| TEST2 | permit 2000:3000 |
+
+#### Community-lists Device Configuration
+
+```eos
+!
+ip community-list TEST1 permit 1000:1000
+ip community-list TEST2 permit 2000:3000
+```
diff --git a/...ections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg b/...ections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg
@@ -53,3 +53,6 @@ interface Ethernet4
    switchport
    switchport trunk private-vlan secondary
    switchport pvlan mapping 2,3,4
+!
+ip community-list TEST1 permit 1000:1000
+ip community-list TEST2 permit 2000:3000
diff --git a/...molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/community-lists.yml b/...molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/community-lists.yml
@@ -0,0 +1,5 @@
+community_lists:
+  - name: TEST1
+    action: "permit 1000:1000"
+  - name: TEST2
+    action: "permit 2000:3000"
diff --git a/..._collections/arista/avd/roles/eos_cli_config_gen/docs/tables/community-lists.md b/..._collections/arista/avd/roles/eos_cli_config_gen/docs/tables/community-lists.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/filters.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/filters.j2
@@ -18,7 +18,7 @@
 ## Filters
 {## Community-lists #}
 {%     include 'documentation/community-lists.j2' %}
-{## Community-lists, improved data model #}
+{## IP Community Lists #}
 {%     include 'documentation/ip-community-lists.j2' %}
 {## Peer Filters #}
 {%     include 'documentation/peer-filters.j2' %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos-intended-config.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos-intended-config.j2
@@ -235,7 +235,7 @@
 {% include 'eos/priority-flow-control.j2' %}
 {# Community-lists #}
 {% include 'eos/community-lists.j2' %}
-{# Community-lists, improved data model #}
+{# IP Community Lists #}
 {% include 'eos/ip-community-lists.j2' %}
 {# IP Extended Community Lists #}
 {% include 'eos/ip-extcommunity-lists.j2' %}

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/community_lists.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/community_lists.schema.yml
@@ -10,6 +10,10 @@ keys:
     type: list
     primary_key: name
     display_name: Community Lists (legacy model)
+    deprecation:
+      warning: true
+      remove_in_version: 6.0.0
+      new_key: ip_community_lists
     items:
       type: dict
       keys: