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): Add support for mpls tunnel termination settings #4888

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

Feat(eos_cli_config_gen): Add support for mpls tunnel termination settings #4888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7671c5a
add_mpls_tunnel_termination
ccsnw Jan 16, 2025
ad6a3c4
add_mpls_tunnel_termination
ccsnw Jan 21, 2025
903a8ed
Merge branch 'devel' into add_mpls_tunnel_termination
gmuloc Jan 22, 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
4 changes: 4 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 @@ -9151,6 +9151,8 @@ router bfd
| LDP Interface Disabled Default | True |
| LDP Transport-Address Interface | Loopback0 |
| ICMP Fragmentation-Needed Tunneling Enabled | True |
| Tunnel Termination Model | ttl uniform dscp uniform |
| Tunnel Termination PHP Model | ttl pipe dscp pipe |

### MPLS Interfaces

Expand Down Expand Up @@ -9216,6 +9218,8 @@ router bfd
```eos
!
mpls ip
mpls tunnel termination model ttl uniform dscp uniform
mpls tunnel termination php model ttl pipe dscp pipe
!
mpls ldp
router-id 192.168.1.1
Expand Down
2 changes: 2 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 @@ -4486,6 +4486,8 @@ ipv6 route vrf TENANT_A_PROJECT01 2b01:cb04:4e6:a400::/64 Vlan102 2a01:cb04:4e6:
ipv6 route vrf TENANT_A_PROJECT01 2c01:cb04:4e6:a400::/64 Vlan102 201 tag 102 name No-Track-BFD
!
mpls ip
mpls tunnel termination model ttl uniform dscp uniform
mpls tunnel termination php model ttl pipe dscp pipe
!
mpls ldp
router-id 192.168.1.1
Expand Down
3 changes: 3 additions & 0 deletions ...ble_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/mpls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ mpls:
router_id: 192.168.1.1
shutdown: false
transport_address_interface: Loopback0
tunnel:
termination_model: ttl uniform dscp uniform
termination_php_model: ttl pipe dscp pipe
icmp:
fragmentation_needed_tunneling: true
rsvp:
Expand Down
18 changes: 18 additions & 0 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/mpls.md
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/mpls-and-ldp.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,10 @@
{% if mpls.icmp.ttl_exceeded_tunneling is arista.avd.defined %}
| ICMP TTL-Exceeded Tunneling Enabled | {{ mpls.icmp.ttl_exceeded_tunneling }} |
{% endif %}
{% if mpls.tunnel.termination_model is arista.avd.defined %}
| Tunnel Termination Model | {{ mpls.tunnel.termination_model }} |
{% endif %}
{% if mpls.tunnel.termination_php_model is arista.avd.defined %}
| Tunnel Termination PHP Model | {{ mpls.tunnel.termination_php_model }} |
{% endif %}
{% endif %}
6 changes: 6 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
!
mpls ip
{% endif %}
{% if mpls.tunnel.termination_model is arista.avd.defined %}
mpls tunnel termination model {{ mpls.tunnel.termination_model }}
{% endif %}
{% if mpls.tunnel.termination_php_model is arista.avd.defined %}
mpls tunnel termination php model {{ mpls.tunnel.termination_php_model }}
{% endif %}
{% if mpls.ldp is arista.avd.defined %}
!
mpls ldp
Expand Down
74 changes: 73 additions & 1 deletion python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py
View file
Open in desktop

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

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

28 changes: 28 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,3 +282,31 @@ keys:
shutdown:
type: bool
description: Make `shutdown` key false for `no shutdown` cli.
tunnel:
description: Configure tunnel termination model.
type: dict
keys:
termination_model:
type: str
description: |
TTL and DSCP configuration as a string.
Make sure to check for compatibility with your Platform.
Example:
- "ttl pipe dscp pipe"
valid_values:
- "ttl pipe dscp pipe"
- "ttl pipe dscp uniform"
- "ttl uniform dscp pipe"
- "ttl uniform dscp uniform"
termination_php_model:
type: str
description: |
TTL and DSCP configuration as a string.
Make sure to check for compatibility with your Platform.
Example:
- "ttl pipe dscp pipe"
valid_values:
- "ttl pipe dscp pipe"
- "ttl pipe dscp uniform"
- "ttl uniform dscp pipe"
- "ttl uniform dscp uniform"
Loading