add_mpls_tunnel_termination

aristanetworks · Jan 16, 2025 · 361877d · 361877d
1 parent 6be08f0
commit 361877d
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 1 deletion.
diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md b/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
@@ -9136,6 +9136,7 @@ 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 |
 
 ### MPLS Interfaces
 
@@ -9201,6 +9202,7 @@ router bfd
 ```eos
 !
 mpls ip
+mpls tunnel termination model ttl uniform dscp uniform
 !
 mpls ldp
    router-id 192.168.1.1

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
@@ -4473,6 +4473,7 @@ 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 ldp
    router-id 192.168.1.1

diff --git a/...ble_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/mpls.yml b/...ble_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/mpls.yml
@@ -6,6 +6,8 @@ mpls:
     router_id: 192.168.1.1
     shutdown: false
     transport_address_interface: Loopback0
+  tunnel:
+    termination_model: "ttl uniform dscp uniform"
   icmp:
     fragmentation_needed_tunneling: true
   rsvp:

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/mpls.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/mpls.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/mpls-and-ldp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/mpls-and-ldp.j2
@@ -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 %}
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2
@@ -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

diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py b/python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml
@@ -282,3 +282,26 @@ 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.
+              Example:
+              - "ttl pipe dscp pipe"
+            valid_values:
+              - "ttl pipe dscp pipe"
+              - "ttl uniform dscp pipe"
+              - "ttl uniform dscp uniform"
+          termination_php_model:
+            type: str
+            description: |
+              TTL and DSCP configuration as a string.
+              Example:
+              - "ttl pipe dscp pipe"
+            valid_values:
+              - "ttl pipe dscp pipe"
+              - "ttl uniform dscp pipe"