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

Jump to bottom

Fix(eos_cli_config_gen): Remove primary key of system.control_plane.ipv4/6_access_group and make vrf key unique #4465

Merged
merged 1 commit into from
Sep 17, 2024
Merged

Fix(eos_cli_config_gen): Remove primary key of system.control_plane.ipv4/6_access_group and make vrf key unique #4465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions ...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
```

Expand Down
2 changes: 2 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/system.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/system.md
View file
Open in desktop

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

8 changes: 6 additions & 2 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.

8 changes: 6 additions & 2 deletions python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/system.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,28 @@ keys:
description: Segment size.
ipv4_access_groups:
type: list
primary_key: acl_name
unique_keys:
- vrf
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
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:
Expand Down
Loading