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 index 9ceaf8b4221..2350cfbc6e0 100644 --- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md +++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md @@ -82,6 +82,6 @@ The following data model keys have been removed from `eos_cli_config_gen` in v5. | old key 10.1(router_isis) | new key(TODO) | | old key 10.2(router_isis) | new key(TODO) | | old key 11(snmp_server) | new key(TODO) | -| old key 12(stun) | new key(TODO) | +| stun.server.local_interface | stun.server.local_interfaces | | old key 13.1(vlan_interfaces) | new key(TODO) | | old key 13.2(vlan_interfaces) | new key(TODO) | diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md index 70d7f2b39f1..4c4846a5cb7 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md @@ -81,9 +81,6 @@ - [QOS Class Maps](#qos-class-maps) - [QOS Policy Maps](#qos-policy-maps) - [QOS Profiles](#qos-profiles) -- [STUN](#stun) - - [STUN Server](#stun-server) - - [STUN Device Configuration](#stun-device-configuration) - [Maintenance Mode](#maintenance-mode) - [BGP Groups](#bgp-groups) - [Interface Groups](#interface-groups) @@ -1817,23 +1814,6 @@ qos profile test no priority ``` -## STUN - -### STUN Server - -| Server Local Interfaces | Bindings Timeout (s) | SSL Profile | SSL Connection Lifetime | Port | -| ----------------------- | -------------------- | ----------- | ----------------------- | ---- | -| Ethernet1 | - | - | - | 3478 | - -### STUN Device Configuration - -```eos -! -stun - server - local-interface Ethernet1 -``` - ## Maintenance Mode ### BGP Groups diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg index 72eda949fbc..fde4e258ced 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg @@ -615,10 +615,6 @@ management api gnmi vrf MONITORING provider eos-native ! -stun - server - local-interface Ethernet1 -! management ssh ! vrf mgt diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/stun.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/stun.yml deleted file mode 100644 index 34e7a156962..00000000000 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/stun.yml +++ /dev/null @@ -1,6 +0,0 @@ -### stun ---- -stun: - server: - # deprecated in favor of local_interfaces - local_interface: Ethernet1 diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/stun.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/stun.md index 4a2e66fe725..ff86db4f6b0 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/stun.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/stun.md @@ -15,7 +15,6 @@ | [        ssl_profile](## "stun.client.server_profiles.[].ssl_profile") | String | | | | SSL profile name. | | [        port](## "stun.client.server_profiles.[].port") | Integer | | | Min: 1
Max: 65535 | Destination port for the request STUN server (default - 3478). | | [  server](## "stun.server") | Dictionary | | | | STUN server settings. | - | [    local_interface](## "stun.server.local_interface") deprecated | String | | | | This key is deprecated. Support will be removed in AVD version v5.0.0. Use local_interfaces instead. | | [    local_interfaces](## "stun.server.local_interfaces") | List, items: String | | | Min Length: 1 | | | [      - <str>](## "stun.server.local_interfaces.[]") | String | | | | | | [    bindings_timeout](## "stun.server.bindings_timeout") | Integer | | | Min: 10
Max: 7200 | Timeout for bindings stored on STUN server in seconds. | @@ -24,6 +23,7 @@ | [      minutes](## "stun.server.ssl_connection_lifetime.minutes") | Integer | | | Min: 1
Max: 1440 | SSL connection lifetime in minutes (default - 120). | | [      hours](## "stun.server.ssl_connection_lifetime.hours") | Integer | | | Min: 1
Max: 24 | SSL connection lifetime in hours (default - 2). | | [    port](## "stun.server.port") | Integer | | | Min: 1
Max: 65535 | Listening port for STUN server (default - 3478). | + | [    local_interface](## "stun.server.local_interface") removed | String | | | | This key was removed. Support was removed in AVD version v5.0.0. Use local_interfaces instead. | === "YAML" @@ -47,10 +47,6 @@ # STUN server settings. server: - # This key is deprecated. - # Support will be removed in AVD version v5.0.0. - # Use local_interfaces instead. - local_interface: local_interfaces: # >=1 items - diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/stun.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/stun.j2 index 3dfee97995d..e58d3f6f887 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/stun.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/stun.j2 @@ -40,10 +40,6 @@ {% set lifetime = "-" %} {% endif %} {% set interface_list = stun.server.local_interfaces | arista.avd.natural_sort %} -{# Next is deprecated remove in v5.0.0 #} -{% if stun.server.local_interface is arista.avd.defined %} -{% do interface_list.append(stun.server.local_interface) %} -{% endif %} | {{ interface_list | join("
") }} | {{ bindings_timeout }} | {{ ssl_profile }} | {{ lifetime }} | {{ stun_port }} | {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/stun.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/stun.j2 index ea346637c25..4303568acef 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/stun.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/stun.j2 @@ -27,10 +27,6 @@ stun {% for local_interface in stun.server.local_interfaces | arista.avd.natural_sort %} local-interface {{ local_interface }} {% endfor %} -{# Next is deprecated remove in v5.0.0 #} -{% if stun.server.local_interface is arista.avd.defined %} - local-interface {{ stun.server.local_interface }} -{% endif %} {% if stun.server.port is arista.avd.defined %} port {{ stun.server.port }} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json index 2ecdb50f104..718cec0e82b 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json @@ -28921,10 +28921,6 @@ "type": "object", "description": "STUN server settings.", "properties": { - "local_interface": { - "type": "string", - "title": "Local Interface" - }, "local_interfaces": { "type": "array", "minItems": 1, 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 index 42bb75e440a..59ad074b6ad 100644 --- 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 @@ -17086,12 +17086,6 @@ keys: type: dict description: STUN server settings. keys: - local_interface: - type: str - deprecation: - warning: true - new_key: local_interfaces - remove_in_version: v5.0.0 local_interfaces: type: list min_length: 1 @@ -17134,6 +17128,13 @@ keys: max: 65535 convert_types: - str + local_interface: + type: str + deprecation: + removed: true + warning: true + new_key: local_interfaces + remove_in_version: v5.0.0 switchport_default: type: dict keys: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/stun.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/stun.schema.yml index 08250ee3447..00999ba4f45 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/stun.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/stun.schema.yml @@ -39,12 +39,6 @@ keys: type: dict description: STUN server settings. keys: - local_interface: - type: str - deprecation: - warning: true - new_key: local_interfaces - remove_in_version: v5.0.0 local_interfaces: type: list min_length: 1 @@ -87,3 +81,10 @@ keys: max: 65535 convert_types: - str + local_interface: + type: str + deprecation: + removed: true + warning: true + new_key: local_interfaces + remove_in_version: v5.0.0 diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json b/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json index 2029ea6519d..a48a1df3c22 100644 --- a/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json +++ b/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json @@ -46940,10 +46940,6 @@ "type": "object", "description": "STUN server settings.", "properties": { - "local_interface": { - "type": "string", - "title": "Local Interface" - }, "local_interfaces": { "type": "array", "minItems": 1,