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

Cut(eos_cli_config_gen): Remove the deprecated keys for port-channel-interfaces #4297

Merged
merged 6 commits into from
Aug 2, 2024
Merged

Cut(eos_cli_config_gen): Remove the deprecated keys for port-channel-interfaces #4297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
511d8d1
removed deprecated keys from port-channel-interfaces data model
MaheshGSLAB Jul 31, 2024
4e94d71
Update python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-chan…
carlbuchmann Aug 2, 2024
7c3f6e2
Update documentation descriptions
carlbuchmann Aug 2, 2024
35e1ce0
update schema
carlbuchmann Aug 2, 2024
263b14d
update docs
carlbuchmann Aug 2, 2024
63d7132
update schema
carlbuchmann Aug 2, 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
4 changes: 2 additions & 2 deletions ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ The following data model keys have been removed from `eos_cli_config_gen` in v5.
| management_api_gnmi.octa | management_api_gnmi.provider |
| management_security.entropy_source | management_security.entropy_sources |
| name_server | ip_name_servers |
| old key 7.1(port_channel_interfaces) | new key(TODO) |
| old key 7.2(port_channel_interfaces) | new key(TODO) |
| port_channel_interfaces.esi | port_channel_interfaces.evpn_ethernet_segment.identifier |
laxmikantchintakindi marked this conversation as resolved.
Show resolved Hide resolved
| port_channel_interfaces.rt | port_channel_interfaces.evpn_ethernet_segment.route_target |
| radius_servers | radius_server.hosts |
| router_bgp.peer_groups[].peer_filter | router_bgp.listen_ranges[].peer_filter |
| router_bgp.peer_groups[].bgp_listen_range_prefix | router_bgp.listen_ranges[].prefix |
Expand Down
8 changes: 1 addition & 7 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 @@ -555,7 +555,7 @@ interface Ethernet47

| Interface | Description | Type | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
| --------- | ----------- | ---- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
| Port-Channel1 | SRV01_bond0 | switched | trunk | 2-3000 | - | - | - | - | - | 0000:0000:0404:0404:0303 |
| Port-Channel1 | SRV01_bond0 | switched | trunk | 2-3000 | - | - | - | - | - | - |
| Port-Channel51 | ipv6_prefix | switched | trunk | 1-500 | - | - | - | - | - | - |

##### Flexible Encapsulation Interfaces
Expand All @@ -573,9 +573,6 @@ interface Port-Channel1
switchport
switchport trunk allowed vlan 2-3000
switchport mode trunk
evpn ethernet-segment
identifier 0000:0000:0404:0404:0303
route-target import 04:04:03:03:02:02
lacp system-id 0303.0202.0101
!
interface Port-Channel2
Expand All @@ -587,9 +584,6 @@ interface Port-Channel2.1000
vlan id 1000
encapsulation vlan
client dot1q 100 network client
evpn ethernet-segment
identifier 0000:0000:0303:0202:0101
route-target import 03:03:02:02:01:01
lacp system-id 0303.0202.0101
!
interface Port-Channel51
Expand Down
6 changes: 0 additions & 6 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 @@ -121,9 +121,6 @@ interface Port-Channel1
switchport
switchport trunk allowed vlan 2-3000
switchport mode trunk
evpn ethernet-segment
identifier 0000:0000:0404:0404:0303
route-target import 04:04:03:03:02:02
lacp system-id 0303.0202.0101
!
interface Port-Channel2
Expand All @@ -135,9 +132,6 @@ interface Port-Channel2.1000
vlan id 1000
encapsulation vlan
client dot1q 100 network client
evpn ethernet-segment
identifier 0000:0000:0303:0202:0101
route-target import 03:03:02:02:01:01
lacp system-id 0303.0202.0101
!
interface Port-Channel51
Expand Down
5 changes: 0 additions & 5 deletions .../eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/port-channel-interfaces.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
# Testing port_channel_interfaces as dict of dict
# Dict type is deprecated in 4.0.0. To be removed in 5.0.0
port_channel_interfaces:
# Testing deprecated esi and rt variables on port-channel interfaces/subinterfaces
Port-Channel1:
description: SRV01_bond0
vlans: 2-3000
mode: trunk
esi: 0000:0000:0404:0404:0303
rt: 04:04:03:03:02:02
lacp_id: 0303.0202.0101

Port-Channel2:
Expand All @@ -26,8 +23,6 @@ port_channel_interfaces:
vlan: 100
network:
client: true
esi: 0000:0000:0303:0202:0101
rt: 03:03:02:02:01:01
lacp_id: 0303.0202.0101

Port-Channel51:
Expand Down
18 changes: 2 additions & 16 deletions ...ions/arista/avd/roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/port-channel-interfaces.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{% set lacp_fallback_timeout = port_channel_interface.lacp_fallback_timeout | arista.avd.default("-") %}
{% set lacp_fallback_mode = port_channel_interface.lacp_fallback_mode | arista.avd.default("-") %}
{% set mlag = port_channel_interface.mlag | arista.avd.default("-") %}
{% set esi = port_channel_interface.evpn_ethernet_segment.identifier | arista.avd.default(port_channel_interface.esi, "-") %}
{% set esi = port_channel_interface.evpn_ethernet_segment.identifier | arista.avd.default("-") %}
| {{ port_channel_interface.name }} | {{ description }} | {{ type }} | {{ mode }} | {{ vlans }} | {{ native_vlan }} | {{ l2.trunk_groups }} | {{ lacp_fallback_timeout }} | {{ lacp_fallback_mode }} | {{ mlag }} | {{ esi }} |
{% endif %}
{% endfor %}
Expand Down Expand Up @@ -171,7 +171,7 @@
{% for evpn_es_po_interface in evpn_es_po_interfaces | arista.avd.natural_sort('name') %}
{% set esi = evpn_es_po_interface.evpn_ethernet_segment.identifier | arista.avd.default(evpn_es_po_interface.esi, "-") %}
laxmikantchintakindi marked this conversation as resolved.
Show resolved Hide resolved
{% set redundancy = evpn_es_po_interface.evpn_ethernet_segment.redundancy | arista.avd.default("all-active") %}
{% set rt = evpn_es_po_interface.evpn_ethernet_segment.route_target | arista.avd.default(evpn_es_po_interface.rt, "-") %}
{% set rt = evpn_es_po_interface.evpn_ethernet_segment.route_target | arista.avd.default("-") %}
| {{ evpn_es_po_interface.name }} | {{ esi }} | {{ redundancy }} | {{ rt }} |
{% endfor %}
{% if evpn_dfe_po_interfaces | length > 0 %}
Expand Down
10 changes: 5 additions & 5 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ interface {{ port_channel_interface.name }}
{% if port_channel_interface.flow_tracker.sampled is arista.avd.defined %}
flow tracker sampled {{ port_channel_interface.flow_tracker.sampled }}
{% endif %}
{% if port_channel_interface.evpn_ethernet_segment.identifier | arista.avd.default(port_channel_interface.esi) is arista.avd.defined or port_channel_interface.evpn_ethernet_segment is arista.avd.defined %}
{% if port_channel_interface.evpn_ethernet_segment is arista.avd.defined %}
evpn ethernet-segment
{% if port_channel_interface.evpn_ethernet_segment.identifier | arista.avd.default(port_channel_interface.esi) is arista.avd.defined %}
identifier {{ port_channel_interface.evpn_ethernet_segment.identifier | arista.avd.default(port_channel_interface.esi) }}
{% if port_channel_interface.evpn_ethernet_segment.identifier is arista.avd.defined %}
identifier {{ port_channel_interface.evpn_ethernet_segment.identifier }}
{% endif %}
{% if port_channel_interface.evpn_ethernet_segment.redundancy is arista.avd.defined %}
redundancy {{ port_channel_interface.evpn_ethernet_segment.redundancy }}
Expand Down Expand Up @@ -157,8 +157,8 @@ interface {{ port_channel_interface.name }}
{% if port_channel_interface.evpn_ethernet_segment.mpls.shared_index is arista.avd.defined %}
mpls shared index {{ port_channel_interface.evpn_ethernet_segment.mpls.shared_index }}
{% endif %}
{% if port_channel_interface.evpn_ethernet_segment.route_target | arista.avd.default(port_channel_interface.rt) is arista.avd.defined %}
route-target import {{ port_channel_interface.evpn_ethernet_segment.route_target | arista.avd.default(port_channel_interface.rt) }}
{% if port_channel_interface.evpn_ethernet_segment.route_target is arista.avd.defined %}
route-target import {{ port_channel_interface.evpn_ethernet_segment.route_target }}
{% endif %}
{% endif %}
{% if port_channel_interface.snmp_trap_link_change is arista.avd.defined(false) %}
Expand Down
44 changes: 20 additions & 24 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.

36 changes: 18 additions & 18 deletions ...-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/port_channel_interfaces.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,24 +502,6 @@ keys:
route_target:
type: str
description: EVPN Route Target for ESI with format xx:xx:xx:xx:xx:xx.
esi:
type: str
description: |
EVPN Ethernet Segment Identifier (Type 1 format).
If both "esi" and "evpn_ethernet_segment.identifier" are defined, the new variable takes precedence.
deprecation:
warning: true
new_key: evpn_ethernet_segment.identifier
remove_in_version: "5.0.0"
rt:
type: str
description: |
EVPN Route Target for ESI with format xx:xx:xx:xx:xx:xx.
If both "rt" and "evpn_ethernet_segment.route_target" are defined, the new variable takes precedence.
deprecation:
warning: true
new_key: evpn_ethernet_segment.route_target
remove_in_version: "5.0.0"
lacp_id:
type: str
description: LACP ID with format xxxx.xxxx.xxxx.
Expand Down Expand Up @@ -854,3 +836,21 @@ keys:
eos_cli:
type: str
description: Multiline EOS CLI rendered directly on the port-channel interface in the final EOS configuration.
esi:
type: str
description: |
EVPN Ethernet Segment Identifier (Type 1 format).
deprecation:
removed: true
warning: true
new_key: evpn_ethernet_segment.identifier
remove_in_version: "5.0.0"
rt:
type: str
description: |
EVPN Route Target for ESI with format xx:xx:xx:xx:xx:xx.
deprecation:
removed: true
warning: true
new_key: evpn_ethernet_segment.route_target
remove_in_version: "5.0.0"
Loading