Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor(eos_cli_config_gen): Deprecate community_lists data model #4396

Merged
merged 7 commits into from
Aug 28, 2024
Merged

Refactor(eos_cli_config_gen): Deprecate community_lists data model #4396

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e213bb
Cut(eos_cli_config_gen): Deprecated data model
Aug 27, 2024
92fa5c6
undo key removal.
Aug 27, 2024
05186d4
Minor change in comment.
Aug 27, 2024
5b28730
Remove the preference.
Aug 28, 2024
928e144
Address comment.
Aug 28, 2024
f19a9f3
Address comment.
Aug 28, 2024
556112f
Merge branch 'devel' into cut/community_list
gmuloc Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions ...sta/avd/molecule/eos_cli_config_gen/documentation/devices/ip-community-lists.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
- [Management](#management)
- [Management Interfaces](#management-interfaces)
- [Filters](#filters)
- [Community-lists](#community-lists)
- [IP Community-lists](#ip-community-lists-1)

## Management
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ...ollections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-community-lists.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:*
Expand Down
7 changes: 0 additions & 7 deletions ...ections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ip-community-lists.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
21 changes: 21 additions & 0 deletions .../avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
- [Interfaces](#interfaces)
- [Ethernet Interfaces](#ethernet-interfaces)
- [Port-Channel Interfaces](#port-channel-interfaces)
- [Filters](#filters)
- [Community-lists](#community-lists)

## Interfaces

Expand Down Expand Up @@ -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
```
3 changes: 3 additions & 0 deletions ...ections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions ...molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/community-lists.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
community_lists:
- name: TEST1
action: "permit 1000:1000"
- name: TEST2
action: "permit 2000:3000"
5 changes: 4 additions & 1 deletion ..._collections/arista/avd/roles/eos_cli_config_gen/docs/tables/community-lists.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/filters.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
## Filters
{## Community-lists #}
{% include 'documentation/community-lists.j2' %}
{## Community-lists, improved data model #}
{## IP community-lists #}
gmuloc marked this conversation as resolved.
Show resolved Hide resolved
{% include 'documentation/ip-community-lists.j2' %}
{## Peer Filters #}
{% include 'documentation/peer-filters.j2' %}
Expand Down
2 changes: 1 addition & 1 deletion python-avd/pyavd/_eos_cli_config_gen/j2templates/eos-intended-config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #}
gmuloc marked this conversation as resolved.
Show resolved Hide resolved
{% include 'eos/ip-community-lists.j2' %}
{# IP Extended Community Lists #}
{% include 'eos/ip-extcommunity-lists.j2' %}
Expand Down
4 changes: 4 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/community_lists.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Shivani-gslab marked this conversation as resolved.
Show resolved Hide resolved
items:
type: dict
keys:
Expand Down
Loading