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

Feat(eos_cli_config_gen): Additional interface TE options #4823

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

Feat(eos_cli_config_gen): Additional interface TE options #4823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88cb43e
Feat(eos_cli_config_gen): Additional interface TE options
emilarista Dec 17, 2024
9fac908
Merge branch 'devel' into feat/eos_cli_config_gen/interface-additiona…
gmuloc Jan 3, 2025
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
24 changes: 18 additions & 6 deletions ...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3796,9 +3796,9 @@ interface Dps1

#### Traffic Engineering

| Interface | Enabled | Administrative Groups |
| --------- | ------- | --------------------- |
| Ethernet81/3 | True | 3,15-29,testgrp |
| Interface | Administrative Groups | Metric | Max Reservable Bandwidth | Min-delay | SRLG |
| --------- | --------------------- | ------ | ------------------------ | --------- | ---- |
| Ethernet81/3 | 3,15-29,testgrp | 4 | 10 percent | 5 microseconds | TEST-SRLG |

#### Ethernet Interfaces Device Configuration

Expand Down Expand Up @@ -4789,14 +4789,22 @@ interface Ethernet81/3
no switchport
ip address 100.64.127.0/31
traffic-engineering
traffic-engineering bandwidth 10 percent
traffic-engineering administrative-group 3,15-29,testgrp
traffic-engineering srlg TEST-SRLG
traffic-engineering metric 4
traffic-engineering min-delay static 5 microseconds
!
interface Ethernet81/4
description Traffic Engineering Interface
no shutdown
no switchport
ip address 100.64.127.0/31
traffic-engineering bandwidth 100 mbps
traffic-engineering administrative-group 4,7-100,testgrp
traffic-engineering srlg 16
traffic-engineering metric 2
traffic-engineering min-delay static 2 milliseconds
!
interface Ethernet81/10
description isis_port_channel_member
Expand Down Expand Up @@ -5031,9 +5039,9 @@ interface Ethernet84

#### Traffic Engineering

| Interface | Enabled | Administrative Groups |
| --------- | ------- | --------------------- |
| Port-Channel136 | True | 7 |
| Interface | Administrative Groups | Metric | Max Reservable Bandwidth | Min-delay | SRLG |
| --------- | --------------------- | ------ | ------------------------ | --------- | ---- |
| Port-Channel136 | 7 | - | - | - | - |

#### Port-Channel Interfaces Device Configuration

Expand Down Expand Up @@ -5649,7 +5657,11 @@ interface Port-Channel137
description Traffic Engineering Interface
no switchport
ip address 100.64.127.4/31
traffic-engineering bandwidth 100 mbps
traffic-engineering administrative-group 4,7-100,testgrp
traffic-engineering srlg 16
traffic-engineering metric 2
traffic-engineering min-delay static 2 milliseconds
```

### Loopback Interfaces
Expand Down
12 changes: 12 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2234,7 +2234,11 @@ interface Port-Channel137
description Traffic Engineering Interface
no switchport
ip address 100.64.127.4/31
traffic-engineering bandwidth 100 mbps
traffic-engineering administrative-group 4,7-100,testgrp
traffic-engineering srlg 16
traffic-engineering metric 2
traffic-engineering min-delay static 2 milliseconds
Comment on lines 2236 to +2241
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This interface has no traffic-engineering command. Is that possible/valid? Is there a difference in EOS behavior having or not having that command? (If it is possible to not have it, I would expect it to be the "enabler" for the whole feature, and if so, we should keep the enabled flag in the doc table and set it properly depending on this.
We should also add a TODO for AVD 6.0.0 to set the enabled key as required in the schema.

!
interface Dps1
description Test DPS Interface
Expand Down Expand Up @@ -3231,14 +3235,22 @@ interface Ethernet81/3
no switchport
ip address 100.64.127.0/31
traffic-engineering
traffic-engineering bandwidth 10 percent
traffic-engineering administrative-group 3,15-29,testgrp
traffic-engineering srlg TEST-SRLG
traffic-engineering metric 4
traffic-engineering min-delay static 5 microseconds
!
interface Ethernet81/4
description Traffic Engineering Interface
no shutdown
no switchport
ip address 100.64.127.0/31
traffic-engineering bandwidth 100 mbps
traffic-engineering administrative-group 4,7-100,testgrp
traffic-engineering srlg 16
traffic-engineering metric 2
traffic-engineering min-delay static 2 milliseconds
!
interface Ethernet81/10
description isis_port_channel_member
Expand Down
16 changes: 16 additions & 0 deletions .../arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/ethernet-interfaces.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1874,6 +1874,14 @@ ethernet_interfaces:
- 3
- 15-29
- testgrp
srlg: TEST-SRLG
metric: 4
bandwidth:
number: 10
unit: percent
min_delay_static:
number: 5
unit: microseconds

- name: Ethernet81/4
description: Traffic Engineering Interface
Expand All @@ -1887,6 +1895,14 @@ ethernet_interfaces:
- 4
- 7-100
- testgrp
srlg: 16
metric: 2
bandwidth:
number: 100
unit: mbps
min_delay_static:
number: 2
unit: milliseconds

- name: Ethernet82
description: Switchport_tap_tool
Expand Down
8 changes: 8 additions & 0 deletions ...sta/avd/molecule/eos_cli_config_gen/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 @@ -1068,3 +1068,11 @@ port_channel_interfaces:
- 4
- 7-100
- testgrp
srlg: 16
metric: 2
bandwidth:
number: 100
unit: mbps
min_delay_static:
number: 2
unit: milliseconds
20 changes: 20 additions & 0 deletions ...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md
View file
Open in desktop

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

20 changes: 20 additions & 0 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.

19 changes: 15 additions & 4 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/ethernet-interfaces.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,12 +805,23 @@

#### Traffic Engineering

| Interface | Enabled | Administrative Groups |
| --------- | ------- | --------------------- |
| Interface | Administrative Groups | Metric | Max Reservable Bandwidth | Min-delay | SRLG |
| --------- | --------------------- | ------ | ------------------------ | --------- | ---- |
{% for te_interface in te_interfaces %}
{% set admin_groups = te_interface.traffic_engineering.administrative_groups | arista.avd.default (["-"]) | join(",") %}
{% set te_enabled = te_interface.traffic_engineering.enabled | arista.avd.default ("-") %}
| {{ te_interface.name }} | {{ te_enabled }} | {{ admin_groups }} |
{% set te_srlg = te_interface.traffic_engineering.srlg | arista.avd.default("-") %}
{% set te_metric = te_interface.traffic_engineering.metric | arista.avd.default("-") %}
{% if te_interface.traffic_engineering.bandwidth is arista.avd.defined %}
{% set te_bandwidth = te_interface.traffic_engineering.bandwidth.number ~ " " ~ te_interface.traffic_engineering.bandwidth.unit %}
{% else %}
{% set te_bandwidth = "-" %}
{% endif %}
{% if te_interface.traffic_engineering.min_delay_static is arista.avd.defined %}
{% set te_min_del = te_interface.traffic_engineering.min_delay_static.number ~ " " ~ te_interface.traffic_engineering.min_delay_static.unit %}
{% else %}
{% set te_min_del = "-" %}
{% endif %}
| {{ te_interface.name }} | {{ admin_groups }} | {{ te_metric }} | {{ te_bandwidth }} | {{ te_min_del }} | {{ te_srlg }} |
{% endfor %}
{% endif %}

Expand Down
21 changes: 16 additions & 5 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 @@ -421,12 +421,23 @@

#### Traffic Engineering

| Interface | Enabled | Administrative Groups |
| --------- | ------- | --------------------- |
| Interface | Administrative Groups | Metric | Max Reservable Bandwidth | Min-delay | SRLG |
| --------- | --------------------- | ------ | ------------------------ | --------- | ---- |
{% for po_te_interface in port_channel_te_interfaces %}
{% set admin_groups = po_te_interface.traffic_engineering.administrative_groups | arista.avd.default(["-"]) | join(",") %}
{% set te_enabled = po_te_interface.traffic_engineering.enabled | arista.avd.default("-") %}
| {{ po_te_interface.name }} | {{ te_enabled }} | {{ admin_groups }} |
{% set admin_groups = po_te_interface.traffic_engineering.administrative_groups | arista.avd.default (["-"]) | join(",") %}
{% set te_srlg = po_te_interface.traffic_engineering.srlg | arista.avd.default("-") %}
{% set te_metric = po_te_interface.traffic_engineering.metric | arista.avd.default("-") %}
{% if po_te_interface.traffic_engineering.bandwidth is arista.avd.defined %}
{% set te_bandwidth = po_te_interface.traffic_engineering.bandwidth.number ~ " " ~ po_te_interface.traffic_engineering.bandwidth.unit %}
{% else %}
{% set te_bandwidth = "-" %}
{% endif %}
{% if po_te_interface.traffic_engineering.min_delay_static is arista.avd.defined %}
{% set te_min_del = po_te_interface.traffic_engineering.min_delay_static.number ~ " " ~ po_te_interface.traffic_engineering.min_delay_static.unit %}
{% else %}
{% set te_min_del = "-" %}
{% endif %}
| {{ po_te_interface.name }} | {{ admin_groups }} | {{ te_metric }} | {{ te_bandwidth }} | {{ te_min_del }} | {{ te_srlg }} |
{% endfor %}
{% endif %}

Expand Down
12 changes: 12 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,9 +1124,21 @@ interface {{ ethernet_interface.name }}
{% if ethernet_interface.traffic_engineering.enabled is arista.avd.defined(true) %}
traffic-engineering
{% endif %}
{% if ethernet_interface.traffic_engineering.bandwidth is arista.avd.defined %}
traffic-engineering bandwidth {{ ethernet_interface.traffic_engineering.bandwidth.number }} {{ ethernet_interface.traffic_engineering.bandwidth.unit }}
{% endif %}
{% if ethernet_interface.traffic_engineering.administrative_groups is arista.avd.defined %}
traffic-engineering administrative-group {{ ethernet_interface.traffic_engineering.administrative_groups | join(",") }}
{% endif %}
{% if ethernet_interface.traffic_engineering.srlg is arista.avd.defined %}
traffic-engineering srlg {{ ethernet_interface.traffic_engineering.srlg }}
{% endif %}
{% if ethernet_interface.traffic_engineering.metric is arista.avd.defined %}
traffic-engineering metric {{ ethernet_interface.traffic_engineering.metric }}
{% endif %}
{% if ethernet_interface.traffic_engineering.min_delay_static is arista.avd.defined %}
traffic-engineering min-delay static {{ ethernet_interface.traffic_engineering.min_delay_static.number }} {{ ethernet_interface.traffic_engineering.min_delay_static.unit }}
{% endif %}
{% for link_tracking_group in ethernet_interface.link_tracking_groups | arista.avd.natural_sort %}
{% if link_tracking_group.name is arista.avd.defined and link_tracking_group.direction is arista.avd.defined %}
link tracking group {{ link_tracking_group.name }} {{ link_tracking_group.direction }}
Expand Down
12 changes: 12 additions & 0 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 @@ -926,9 +926,21 @@ interface {{ port_channel_interface.name }}
{% if port_channel_interface.traffic_engineering.enabled is arista.avd.defined(true) %}
traffic-engineering
{% endif %}
{% if port_channel_interface.traffic_engineering.bandwidth is arista.avd.defined %}
traffic-engineering bandwidth {{ port_channel_interface.traffic_engineering.bandwidth.number }} {{ port_channel_interface.traffic_engineering.bandwidth.unit }}
{% endif %}
{% if port_channel_interface.traffic_engineering.administrative_groups is arista.avd.defined %}
traffic-engineering administrative-group {{ port_channel_interface.traffic_engineering.administrative_groups | join(",") }}
{% endif %}
{% if port_channel_interface.traffic_engineering.srlg is arista.avd.defined %}
traffic-engineering srlg {{ port_channel_interface.traffic_engineering.srlg }}
{% endif %}
{% if port_channel_interface.traffic_engineering.metric is arista.avd.defined %}
traffic-engineering metric {{ port_channel_interface.traffic_engineering.metric }}
{% endif %}
{% if port_channel_interface.traffic_engineering.min_delay_static is arista.avd.defined %}
traffic-engineering min-delay static {{ port_channel_interface.traffic_engineering.min_delay_static.number }} {{ port_channel_interface.traffic_engineering.min_delay_static.unit }}
{% endif %}
{% for link_tracking_group in port_channel_interface.link_tracking_groups | arista.avd.natural_sort('name') %}
{% if link_tracking_group.name is arista.avd.defined and link_tracking_group.direction is arista.avd.defined %}
link tracking group {{ link_tracking_group.name }} {{ link_tracking_group.direction }}
Expand Down
Loading
Loading