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): Adding improved model for interface link tracking groups #4610

Merged
merged 14 commits into from
Nov 11, 2024
Merged

Feat(eos_cli_config_gen): Adding improved model for interface link tracking groups #4610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
50355a5
Refactore(eos_cli_config_gen): Change the model to support only one d…
Vibhu-gslab Oct 17, 2024
dc985f2
fixing eos_designs code
Vibhu-gslab Oct 17, 2024
42dcf86
reverting back the changes
Vibhu-gslab Oct 18, 2024
c6370cd
adding new model for link tracking group
Vibhu-gslab Oct 18, 2024
87bf6cd
fixing errors
Vibhu-gslab Oct 18, 2024
5774461
addressing comments
Vibhu-gslab Oct 18, 2024
be90176
removing min_length
Vibhu-gslab Oct 18, 2024
9b3c15e
adding items and fixing description
Vibhu-gslab Oct 18, 2024
653f52f
addressing comment
Vibhu-gslab Oct 18, 2024
4beff5a
fixing doc comment
Vibhu-gslab Nov 4, 2024
7506a95
addressing comments
Vibhu-gslab Nov 7, 2024
0460638
Merge branch 'devel' into 4584
Vibhu-gslab Nov 11, 2024
c89ceab
fixing comments
Vibhu-gslab Nov 11, 2024
e2943cd
fixing rebase
Vibhu-gslab Nov 11, 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
6 changes: 6 additions & 0 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 @@ -1020,6 +1020,7 @@ interface Dps1
| Interface | Group Name | Direction |
| --------- | ---------- | --------- |
| Ethernet1 | EVPN_MH_ES1 | upstream |
| Ethernet1 | EVPN_MH_ES3, EVPN_MH_ES4 | upstream |
| Ethernet3 | EVPN_MH_ES2 | downstream |

##### Phone Interfaces
Expand Down Expand Up @@ -1253,6 +1254,8 @@ interface Ethernet1
switchport backup initial-mac-move-delay 10
switchport backup dest-macaddr 01:00:00:00:00:00
link tracking group EVPN_MH_ES1 upstream
link tracking group EVPN_MH_ES3 upstream
link tracking group EVPN_MH_ES4 upstream
comment
Comment created from eos_cli under ethernet_interfaces.Ethernet1
EOF
Expand Down Expand Up @@ -2190,6 +2193,7 @@ interface Ethernet81/10
| Interface | Group Name | Direction |
| --------- | ---------- | --------- |
| Port-Channel5 | EVPN_MH_ES1 | downstream |
| Port-Channel5 | EVPN_MH_ES3, EVPN_MH_ES4 | downstream |
| Port-Channel15 | EVPN_MH_ES2 | upstream |

##### IPv4
Expand Down Expand Up @@ -2275,6 +2279,8 @@ interface Port-Channel5
storm-control multicast level 1
storm-control unknown-unicast level 1
link tracking group EVPN_MH_ES1 downstream
link tracking group EVPN_MH_ES3 downstream
link tracking group EVPN_MH_ES4 downstream
comment
Comment created from eos_cli under port_channel_interfaces.Port-Channel5
EOF
Expand Down
4 changes: 4 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 @@ -363,6 +363,8 @@ interface Port-Channel5
storm-control multicast level 1
storm-control unknown-unicast level 1
link tracking group EVPN_MH_ES1 downstream
link tracking group EVPN_MH_ES3 downstream
link tracking group EVPN_MH_ES4 downstream
comment
Comment created from eos_cli under port_channel_interfaces.Port-Channel5
EOF
Expand Down Expand Up @@ -888,6 +890,8 @@ interface Ethernet1
switchport backup initial-mac-move-delay 10
switchport backup dest-macaddr 01:00:00:00:00:00
link tracking group EVPN_MH_ES1 upstream
link tracking group EVPN_MH_ES3 upstream
link tracking group EVPN_MH_ES4 upstream
comment
Comment created from eos_cli under ethernet_interfaces.Ethernet1
EOF
Expand Down
3 changes: 3 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 @@ -14,6 +14,9 @@ ethernet_interfaces:
link_tracking_groups:
- name: EVPN_MH_ES1
direction: upstream
link_tracking:
direction: upstream
groups: [EVPN_MH_ES3, EVPN_MH_ES4]
priority_flow_control:
enabled: true
priorities:
Expand Down
3 changes: 3 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 @@ -6,6 +6,9 @@ port_channel_interfaces:
link_tracking_groups:
- name: EVPN_MH_ES1
direction: downstream
link_tracking:
direction: downstream
groups: [EVPN_MH_ES3, EVPN_MH_ES4]
switchport:
enabled: true
mode: trunk
Expand Down
12 changes: 12 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.

12 changes: 12 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.

3 changes: 3 additions & 0 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 @@ -334,6 +334,9 @@
| {{ link_tracking_interface.name }} | {{ link_tracking_group.name }} | {{ link_tracking_group.direction }} |
{% endif %}
{% endfor %}
{% if link_tracking_interface.link_tracking.direction is arista.avd.defined and link_tracking_interface.link_tracking.groups is arista.avd.defined %}
| {{ link_tracking_interface.name }} | {{ link_tracking_interface.link_tracking.groups | join(', ') }} | {{ link_tracking_interface.link_tracking.direction }} |
{% endif %}
{% endfor %}
{% endif %}
{# Phone Interfaces #}
Expand Down
3 changes: 3 additions & 0 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 @@ -291,6 +291,9 @@
| {{ link_tracking_interface.name }} | {{ link_tracking_group.name }} | {{ link_tracking_group.direction }} |
{% endif %}
{% endfor %}
{% if link_tracking_interface.link_tracking.direction is arista.avd.defined and link_tracking_interface.link_tracking.groups is arista.avd.defined %}
| {{ link_tracking_interface.name }} | {{ link_tracking_interface.link_tracking.groups | join(', ') }} | {{ link_tracking_interface.link_tracking.direction }} |
{% endif %}
{% endfor %}
{% endif %}
{# IPv4 #}
Expand Down
5 changes: 5 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 @@ -907,6 +907,11 @@ interface {{ ethernet_interface.name }}
link tracking group {{ link_tracking_group.name }} {{ link_tracking_group.direction }}
{% endif %}
{% endfor %}
{% if ethernet_interface.link_tracking.direction is arista.avd.defined and ethernet_interface.link_tracking.groups is arista.avd.defined %}
{% for group_name in ethernet_interface.link_tracking.groups %}
link tracking group {{ group_name }} {{ ethernet_interface.link_tracking.direction }}
{% endfor %}
{% endif %}
{% if ethernet_interface.vmtracer is arista.avd.defined(true) %}
vmtracer vmware-esx
{% endif %}
Expand Down
5 changes: 5 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 @@ -726,6 +726,11 @@ interface {{ port_channel_interface.name }}
link tracking group {{ link_tracking_group.name }} {{ link_tracking_group.direction }}
{% endif %}
{% endfor %}
{% if port_channel_interface.link_tracking.direction is arista.avd.defined and port_channel_interface.link_tracking.groups is arista.avd.defined %}
{% for group_name in port_channel_interface.link_tracking.groups %}
link tracking group {{ group_name }} {{ port_channel_interface.link_tracking.direction }}
MaheshGSLAB marked this conversation as resolved.
Show resolved Hide resolved
{% endfor %}
{% endif %}
{% if port_channel_interface.vmtracer is arista.avd.defined(true) %}
vmtracer vmware-esx
{% endif %}
Expand Down
28 changes: 28 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.

12 changes: 12 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,18 @@ keys:
direction:
type: str
valid_values: ["upstream", "downstream"]
link_tracking:
type: dict
keys:
direction:
type: str
valid_values: ["upstream", "downstream"]
groups:
type: list
description: Link state group(s) an interface belongs to.
items:
type: str
description: Group names.
evpn_ethernet_segment:
type: dict
keys:
Expand Down
12 changes: 12 additions & 0 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 @@ -321,6 +321,18 @@ keys:
valid_values:
- upstream
- downstream
link_tracking:
type: dict
keys:
direction:
type: str
valid_values: ["upstream", "downstream"]
groups:
type: list
description: Link state group(s) an interface belongs to.
items:
type: str
description: Group names.
phone:
type: dict
deprecation:
Expand Down
Loading