Cut(eos_cli_config_gen): Remove the deprecated keys for port-channel-…

…interfaces (#4297) Co-authored-by: Carl Buchmann <[email protected]> Co-authored-by: Claus Holbech <[email protected]>
aristanetworks · Aug 2, 2024 · 3ffe991 · 3ffe991
1 parent 61e6890
commit 3ffe991
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 85 deletions.
diff --git a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
@@ -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 |
+| 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 |

diff --git a/.../avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md b/.../avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md
@@ -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
@@ -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
@@ -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

diff --git a/...ections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg b/...ections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg
@@ -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
@@ -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

diff --git a/.../eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/port-channel-interfaces.yml b/.../eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/port-channel-interfaces.yml
@@ -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:
@@ -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:

diff --git a/...ions/arista/avd/roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md b/...ions/arista/avd/roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/port-channel-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/port-channel-interfaces.j2
@@ -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 %}
@@ -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, "-") %}
 {%             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 %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2
@@ -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 }}
@@ -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) %}

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/...-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/port_channel_interfaces.schema.yml b/...-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/port_channel_interfaces.schema.yml
@@ -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.
@@ -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"