diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md index e33ba6dafcd..9cb93dbe173 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md @@ -26,7 +26,7 @@ | [    l2_protocol](## "ethernet_interfaces.[].l2_protocol") | Dictionary | | | | | | [      encapsulation_dot1q_vlan](## "ethernet_interfaces.[].l2_protocol.encapsulation_dot1q_vlan") | Integer | | | | Vlan tag to configure on sub-interface. | | [      forwarding_profile](## "ethernet_interfaces.[].l2_protocol.forwarding_profile") | String | | | | L2 protocol forwarding profile. | - | [    mac_timestamp](## "ethernet_interfaces.[].mac_timestamp") | String | | | Valid Values:
- before-fcs
- replace-fcs
- header | header: Insert timestamp in ethernet header. Supports on platforms like 7500E/R and 7280E/R.
before-fcs: Insert timestamp before fcs field. Support on platforms like 7150.
replace-fcs: Replace fcs field with timestamp. | + | [    mac_timestamp](## "ethernet_interfaces.[].mac_timestamp") | String | | | Valid Values:
- before-fcs
- replace-fcs
- header | header: Insert timestamp in ethernet header. Supported on platforms like 7500E/R and 7280E/R.
before-fcs: Insert timestamp before fcs field. Supported on platforms like 7150.
replace-fcs: Replace fcs field with timestamp. | | [    trunk_groups](## "ethernet_interfaces.[].trunk_groups") deprecated | List, items: String | | | | This key is deprecated. Support will be removed in AVD version 6.0.0. Use switchport.trunk.groups instead. | | [      - <str>](## "ethernet_interfaces.[].trunk_groups.[]") | String | | | | | | [    type](## "ethernet_interfaces.[].type") deprecated | String | | | Valid Values:
- routed
- switched
- l3dot1q
- l2dot1q
- port-channel-member | l3dot1q and l2dot1q are used for sub-interfaces. The parent interface should be defined as routed.
The `type = switched/routed` should not be combined with `switchport`.
This key is deprecated. Support will be removed in AVD version 6.0.0. See [here](https://avd.arista.com/stable/docs/release-notes/5.x.x.html#removal-of-type-key-dependency-for-rendering-ethernetport-channel-interfaces-configuration-and-documentation) for details. | @@ -552,8 +552,8 @@ # L2 protocol forwarding profile. forwarding_profile: - # header: Insert timestamp in ethernet header. Supports on platforms like 7500E/R and 7280E/R. - # before-fcs: Insert timestamp before fcs field. Support on platforms like 7150. + # header: Insert timestamp in ethernet header. Supported on platforms like 7500E/R and 7280E/R. + # before-fcs: Insert timestamp before fcs field. Supported on platforms like 7150. # replace-fcs: Replace fcs field with timestamp. mac_timestamp: # This key is deprecated. diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 index c9c61e53f00..4da67bafade 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 @@ -303,13 +303,7 @@ interface {{ ethernet_interface.name }} l2-protocol encapsulation dot1q vlan {{ ethernet_interface.l2_protocol.encapsulation_dot1q_vlan }} {% endif %} {% if ethernet_interface.mac_timestamp is arista.avd.defined %} -{% if ethernet_interface.mac_timestamp == "header" %} - mac timestamp header -{% elif ethernet_interface.mac_timestamp == "before-fcs" %} - mac timestamp before-fcs -{% elif ethernet_interface.mac_timestamp == "replace-fcs" %} - mac timestamp replace-fcs -{% endif %} + mac timestamp {{ ethernet_interface.mac_timestamp }} {% endif %} {% if ethernet_interface.evpn_ethernet_segment is arista.avd.defined %} ! 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 e0e45afd468..745075993c2 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 @@ -2146,11 +2146,11 @@ keys: - before-fcs - replace-fcs - header - description: 'header: Insert timestamp in ethernet header. Supports on platforms - like 7500E/R and 7280E/R. + description: 'header: Insert timestamp in ethernet header. Supported on + platforms like 7500E/R and 7280E/R. - before-fcs: Insert timestamp before fcs field. Support on platforms like - 7150. + before-fcs: Insert timestamp before fcs field. Supported on platforms + like 7150. replace-fcs: Replace fcs field with timestamp.' trunk_groups: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml index db0c7ba89c4..32d30468d09 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml @@ -120,8 +120,8 @@ keys: type: str valid_values: ["before-fcs", "replace-fcs", "header"] description: |- - header: Insert timestamp in ethernet header. Supports on platforms like 7500E/R and 7280E/R. - before-fcs: Insert timestamp before fcs field. Support on platforms like 7150. + header: Insert timestamp in ethernet header. Supported on platforms like 7500E/R and 7280E/R. + before-fcs: Insert timestamp before fcs field. Supported on platforms like 7150. replace-fcs: Replace fcs field with timestamp. trunk_groups: type: list