Cut(eos_designs): Remove deprecated key adapter_config.port_channel.s…

…hort_esi

ansible_collections/arista/avd/docs/porting-guides/5.x.x.md

@@ -53,7 +53,7 @@ The following data model keys have been removed from `eos_designs` in v5.0.0.
 | Removed key | New key |
 | ----------- | ------- |
 | old key 1(cvp_instance_ip) | new key(TODO) |
-| old key 2(defs_adapter_config) | new key(TODO) |
+| adapter_config.port_channel.short_esi | adapter_config.port_channel.ethernet_segment.short_esi |
 | old key 3.1(defs_node_type) | new key(TODO) |
 | old key 3.2(defs_node_type) | new key(TODO) |
 | old key 4(defs_svi_settings) | new key(TODO) |

ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg

@@ -30,42 +30,11 @@ no aaa root
 !
 vrf instance MGMT
 !
-interface Port-Channel12
-   description server01_ESI_PortChanne1
-   no shutdown
-   switchport
-   switchport trunk allowed vlan 110-111,210-211
-   switchport mode trunk
-   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-Channel13
-   description server01_ESI_PortChanne1
-   no shutdown
-   mtu 1601
-   switchport
-   evpn ethernet-segment
-      identifier 0000:0000:0303:0202:0102
-      route-target import 03:03:02:02:01:02
-   lacp system-id 0303.0202.0102
-!
 interface Ethernet10
    description ROUTER01_Eth1
    no shutdown
    switchport
 !
-interface Ethernet12
-   description server01_ESI_Eth1
-   no shutdown
-   channel-group 12 mode active
-!
-interface Ethernet13
-   description server01_ESI_Eth6
-   no shutdown
-   channel-group 13 mode active
-!
 interface Loopback0
    description EVPN_Overlay_Peering
    no shutdown

ansible_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml

@@ -117,27 +117,6 @@ vxlan_interface:
       udp_port: 4789
       source_interface: Loopback1
 ethernet_interfaces:
-- name: Ethernet12
-  peer: server01_ESI
-  peer_interface: Eth1
-  peer_type: server
-  port_profile: TENANT_A_B
-  description: server01_ESI_Eth1
-  shutdown: false
-  type: port-channel-member
-  channel_group:
-    id: 12
-    mode: active
-- name: Ethernet13
-  peer: server01_ESI
-  peer_interface: Eth6
-  peer_type: server
-  description: server01_ESI_Eth6
-  shutdown: false
-  type: port-channel-member
-  channel_group:
-    id: 13
-    mode: active
 - name: Ethernet10
   peer: ROUTER01
   peer_interface: Eth1
@@ -146,23 +125,3 @@ ethernet_interfaces:
   description: ROUTER01_Eth1
   shutdown: false
   type: switched
-port_channel_interfaces:
-- name: Port-Channel12
-  description: server01_ESI_PortChanne1
-  type: switched
-  shutdown: false
-  mode: trunk
-  vlans: 110-111,210-211
-  evpn_ethernet_segment:
-    identifier: 0000:0000:0303:0202:0101
-    route_target: 03:03:02:02:01:01
-  lacp_id: 0303.0202.0101
-- name: Port-Channel13
-  description: server01_ESI_PortChanne1
-  type: switched
-  shutdown: false
-  mtu: 1601
-  evpn_ethernet_segment:
-    identifier: 0000:0000:0303:0202:0102
-    route_target: 03:03:02:02:01:02
-  lacp_id: 0303.0202.0102

python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_adapter_config.schema.yml

@@ -474,13 +474,6 @@ $defs:
               When MPASS is enabled on an MLAG port-channel, MLAG peers coordinate to function as a single PTP logical device.
               Arista PTP enabled devices always place PTP messages on the same physical link within the port-channel.
               Hence, MPASS is needed only on MLAG port-channels connected to non-Arista devices.
-          short_esi:
-            type: str
-            description: In format xxxx:xxxx:xxxx or "auto".
-            deprecation:
-              warning: true
-              remove_in_version: "5.0.0"
-              new_key: ethernet_segment.short_esi
           lacp_fallback:
             type: dict
             description: LACP fallback configuration.
@@ -570,6 +563,14 @@ $defs:
             documentation_options:
               hide_keys: true
             $ref: "eos_cli_config_gen#/keys/port_channel_interfaces/items"
+          short_esi:
+            type: str
+            description: In format xxxx:xxxx:xxxx or "auto".
+            deprecation:
+              removed: true
+              warning: true
+              remove_in_version: "5.0.0"
+              new_key: ethernet_segment.short_esi
       validate_state:
         type: bool
         description: Set to false to disable interface validation by the `eos_validate_state` role.