Moving inputs to ethernet interfaces

aristanetworks · Nov 5, 2024 · 580f192 · 580f192
1 parent b389f02
commit 580f192
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 11 deletions.
diff --git a/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md b/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md
@@ -1041,6 +1041,7 @@ interface Ethernet63
 interface Ethernet64
    description DHCP server interface
    no switchport
+   mac timestamp replace-fcs
    ip address 192.168.42.42/24
    dhcp server ipv4
    dhcp server ipv6
@@ -1086,6 +1087,7 @@ interface Ethernet67
    description Custom_Transceiver_Frequency
    no shutdown
    switchport
+   mac timestamp before-fcs
    transceiver frequency 190050.000
 !
 interface Ethernet67.1

diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg b/...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg
@@ -656,6 +656,7 @@ interface Ethernet63
 interface Ethernet64
    description DHCP server interface
    no switchport
+   mac timestamp replace-fcs
    ip address 192.168.42.42/24
    dhcp server ipv4
    dhcp server ipv6
@@ -701,6 +702,7 @@ interface Ethernet67
    description Custom_Transceiver_Frequency
    no shutdown
    switchport
+   mac timestamp before-fcs
    transceiver frequency 190050.000
 !
 interface Ethernet67.1

diff --git a/...ctions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml b/...ctions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml
@@ -1146,6 +1146,7 @@ ethernet_interfaces:
     ip_address: 192.168.42.42/24
     dhcp_server_ipv4: true
     dhcp_server_ipv6: true
+    mac_timestamp: replace-fcs
 
   - name: Ethernet69
     switchport:
@@ -1163,7 +1164,7 @@ ethernet_interfaces:
     ipv6_enable: true
     ipv6_address: 2001:db8::2/64
     ipv6_address_link_local: fe80::2/64
-    mac_timestamp_header: true
+    mac_timestamp: header
     vrrp_ids:
       - id: 1
         priority_level: 105
@@ -1237,6 +1238,7 @@ ethernet_interfaces:
     shutdown: false
     transceiver:
       frequency: 190050
+    mac_timestamp: before-fcs
 
   - name: Ethernet67.1
     description: Test_encapsulation_dot1q

diff --git a/...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md b/...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md
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
@@ -302,8 +302,14 @@ interface {{ ethernet_interface.name }}
 {%     if ethernet_interface.l2_protocol.encapsulation_dot1q_vlan is arista.avd.defined %}
    l2-protocol encapsulation dot1q vlan {{ ethernet_interface.l2_protocol.encapsulation_dot1q_vlan }}
 {%     endif %}
-{%     if ethernet_interface.mac_timestamp_header is arista.avd.defined(true) %}
+{%     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 %}
 {%     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
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
@@ -116,9 +116,13 @@ keys:
             forwarding_profile:
               type: str
               description: L2 protocol forwarding profile.
-        mac_timestamp_header:
-          type: bool
-          description: Insert timestamp in ethernet header.
+        mac_timestamp:
+          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.
+            replace-fcs: Replace fcs field with timestamp.
         trunk_groups:
           type: list
           items: