Fix

aristanetworks · Oct 30, 2024 · cf1360c · cf1360c
1 parent f89fb0f
commit cf1360c
Show file tree

Hide file tree

Showing 31 changed files with 40 additions and 20 deletions.
diff --git a/...molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md b/...molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md
@@ -358,6 +358,7 @@ interface Ethernet7
    no shutdown
    no switchport
    ip address 11.1.0.38/31
+   ptp enable
 !
 interface Ethernet11
    description P2P_DC1-POD1-SPINE1_Ethernet8

diff --git a/...molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md b/...molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md
@@ -214,6 +214,7 @@ interface Ethernet4
    no shutdown
    no switchport
    ip address 200.200.200.101/24
+   ptp enable
 ```
 
 ### Loopback Interfaces

diff --git a/...olecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE1.md b/...olecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-SUPER-SPINE1.md
@@ -203,6 +203,7 @@ interface Ethernet6
    no switchport
    ip address 11.1.2.0/31
    mac security profile MACSEC_PROFILE
+   ptp enable
 ```
 
 ### Loopback Interfaces

diff --git a/...molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md b/...molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md
@@ -262,6 +262,7 @@ interface Ethernet7
    no shutdown
    no switchport
    ip address 11.1.0.39/31
+   ptp enable
 ```
 
 ### Port-Channel Interfaces

diff --git a/...molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md b/...molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md
@@ -218,6 +218,7 @@ interface Ethernet5
    no shutdown
    no switchport
    ip address 200.200.200.201/24
+   ptp enable
 ```
 
 ### Loopback Interfaces

diff --git a/...olecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md b/...olecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md
@@ -214,6 +214,7 @@ interface Ethernet4
    no switchport
    ip address 11.1.2.1/31
    mac security profile MACSEC_PROFILE
+   ptp enable
 !
 interface Ethernet5
    description P2P_DC2-RS2_Ethernet1

diff --git a/...ns/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF2B.cfg b/...ns/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-LEAF2B.cfg
@@ -177,6 +177,7 @@ interface Ethernet7
    no shutdown
    no switchport
    ip address 11.1.0.38/31
+   ptp enable
 !
 interface Ethernet11
    description P2P_DC1-POD1-SPINE1_Ethernet8

diff --git a/...ns/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE2.cfg b/...ns/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD2-SPINE2.cfg
@@ -57,6 +57,7 @@ interface Ethernet4
    no shutdown
    no switchport
    ip address 200.200.200.101/24
+   ptp enable
 !
 interface Loopback0
    description ROUTER_ID

diff --git a/...s/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE1.cfg b/...s/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-SUPER-SPINE1.cfg
@@ -74,6 +74,7 @@ interface Ethernet6
    no switchport
    ip address 11.1.2.0/31
    mac security profile MACSEC_PROFILE
+   ptp enable
 !
 interface Loopback0
    description ROUTER_ID

diff --git a/...ns/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg b/...ns/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg
@@ -78,6 +78,7 @@ interface Ethernet7
    no shutdown
    no switchport
    ip address 11.1.0.39/31
+   ptp enable
 !
 interface Loopback0
    description ROUTER_ID

diff --git a/...ns/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg b/...ns/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg
@@ -62,6 +62,7 @@ interface Ethernet5
    no shutdown
    no switchport
    ip address 200.200.200.201/24
+   ptp enable
 !
 interface Loopback0
    description ROUTER_ID

diff --git a/...s/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE1.cfg b/...s/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-SUPER-SPINE1.cfg
@@ -54,6 +54,7 @@ interface Ethernet4
    no switchport
    ip address 11.1.2.1/31
    mac security profile MACSEC_PROFILE
+   ptp enable
 !
 interface Ethernet5
    description P2P_DC2-RS2_Ethernet1

diff --git a/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml b/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml
@@ -657,6 +657,8 @@ ethernet_interfaces:
   shutdown: false
   ip_address: 11.1.0.38/31
   description: P2P_DC2-POD1-LEAF1A_Ethernet7
+  ptp:
+    enable: true
 - name: Ethernet16
   peer: server-1
   peer_interface: Eth2

diff --git a/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE2.yml b/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE2.yml
@@ -171,6 +171,8 @@ ethernet_interfaces:
   shutdown: false
   ip_address: 200.200.200.101/24
   description: P2P_DC2-POD1-SPINE2_Ethernet5
+  ptp:
+    enable: true
 loopback_interfaces:
 - name: Loopback0
   description: ROUTER_ID

diff --git a/...d/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE1.yml b/...d/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE1.yml
@@ -173,6 +173,8 @@ ethernet_interfaces:
   mac_security:
     profile: MACSEC_PROFILE
   description: P2P_DC2-SUPER-SPINE1_Ethernet4
+  ptp:
+    enable: true
 loopback_interfaces:
 - name: Loopback0
   description: ROUTER_ID

diff --git a/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml b/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml
@@ -273,6 +273,8 @@ ethernet_interfaces:
   shutdown: false
   ip_address: 11.1.0.39/31
   description: P2P_DC1-POD1-LEAF2B_Ethernet7
+  ptp:
+    enable: true
 port_channel_interfaces:
 - name: Port-Channel3
   description: L2_DC2-POD1-L2LEAF1A_Port-Channel1

diff --git a/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml b/...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml
@@ -155,6 +155,8 @@ ethernet_interfaces:
   shutdown: false
   ip_address: 200.200.200.201/24
   description: P2P_DC1-POD2-SPINE2_Ethernet4
+  ptp:
+    enable: true
 loopback_interfaces:
 - name: Loopback0
   description: ROUTER_ID

diff --git a/...d/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE1.yml b/...d/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE1.yml
@@ -222,6 +222,8 @@ ethernet_interfaces:
   mac_security:
     profile: MACSEC_PROFILE
   description: P2P_DC1-SUPER-SPINE1_Ethernet6
+  ptp:
+    enable: true
 loopback_interfaces:
 - name: Loopback0
   description: ROUTER_ID

diff --git a/...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg b/...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg
@@ -152,6 +152,7 @@ interface Ethernet10
    mpls ip
    ip ospf network point-to-point
    ip ospf area 0.0.0.0
+   ptp enable
 !
 interface Ethernet12
    description P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet12

diff --git a/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_bgp.cfg b/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_bgp.cfg
@@ -44,7 +44,6 @@ interface ethernet1
    ip address 192.168.0.0/31
    mac security profile TEST-MACSEC-PROFILE
    ptp enable
-   ptp role master
    service-policy type qos input TEST_POLICY
    service-profile TEST-QOS-PROFILE
    ! TEST RAW_EOS_CLI

diff --git a/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_isis.cfg b/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_isis.cfg
@@ -30,7 +30,6 @@ interface ethernet1
    ip address 192.168.0.0/31
    mac security profile TEST-MACSEC-PROFILE
    ptp enable
-   ptp role master
    service-profile TEST-QOS-PROFILE
 !
 interface ethernet2

diff --git a/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_ospf.cfg b/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_ospf.cfg
@@ -30,7 +30,6 @@ interface ethernet1
    ip address 192.168.0.0/31
    mac security profile TEST-MACSEC-PROFILE
    ptp enable
-   ptp role master
    service-profile TEST-QOS-PROFILE
 !
 interface ethernet2

diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml b/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-1-isis-sr-ldp.yml
@@ -257,8 +257,8 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 - name: Ethernet12
   peer: core-2-ospf-ldp
   peer_interface: Ethernet12

diff --git a/...rista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml b/...rista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/core-2-ospf-ldp.yml
@@ -188,6 +188,8 @@ ethernet_interfaces:
       igp_sync: true
   description: P2P_LINK_TO_CORE-1-ISIS-SR-LDP_Ethernet10
   speed: forced 1000full
+  ptp:
+    enable: true
 - name: Ethernet12
   peer: core-1-isis-sr-ldp
   peer_interface: Ethernet12

diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/custom-ptp-profile.yml b/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/custom-ptp-profile.yml
@@ -149,8 +149,8 @@ ethernet_interfaces:
     sync_message:
       interval: -7
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 vlans:
 - id: 11
   name: VLAN11

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_bgp.yml
@@ -109,7 +109,6 @@ ethernet_interfaces:
   speed: forced 10000full
   ptp:
     enable: true
-    role: master
   service_policy:
     qos:
       input: TEST_POLICY

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml
@@ -55,7 +55,6 @@ ethernet_interfaces:
   speed: forced 10000full
   ptp:
     enable: true
-    role: master
 - name: ethernet2
   peer: peer2
   peer_interface: ethernet2

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_ospf.yml
@@ -56,7 +56,6 @@ ethernet_interfaces:
   speed: forced 10000full
   ptp:
     enable: true
-    role: master
 - name: ethernet2
   peer: peer2
   peer_interface: ethernet2

diff --git a/...ista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml b/...ista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml
@@ -216,8 +216,8 @@ ethernet_interfaces:
     sync_message:
       interval: 2
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 - name: Ethernet7
   peer: ptp-tests-spine2
   peer_interface: Ethernet7
@@ -235,8 +235,8 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 - name: Ethernet8
   peer: ptp-tests-spine2
   peer_interface: Ethernet8
@@ -254,8 +254,8 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 - name: Ethernet9
   peer: ptp-tests-spine2
   peer_interface: Ethernet9
@@ -273,8 +273,8 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 loopback_interfaces:
 - name: Loopback0
   description: ROUTER_ID

diff --git a/...ista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml b/...ista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml
@@ -144,8 +144,8 @@ ethernet_interfaces:
     sync_message:
       interval: 2
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 - name: Ethernet7
   peer: ptp-tests-spine1
   peer_interface: Ethernet7
@@ -163,8 +163,8 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 - name: Ethernet8
   peer: ptp-tests-spine1
   peer_interface: Ethernet8
@@ -182,8 +182,8 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 - name: Ethernet9
   peer: ptp-tests-spine1
   peer_interface: Ethernet9
@@ -201,7 +201,7 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-    enable: true
     role: master
+    enable: true
 metadata:
   platform: vEOS-LAB
diff --git a/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/utils.py b/python-avd/pyavd/_eos_designs/structured_config/core_interfaces_and_l3_edge/utils.py
@@ -305,13 +305,12 @@ def _get_ethernet_cfg(self: AvdStructuredConfigCoreInterfacesAndL3Edge, p2p_link
                 msg = f"PTP Profile '{ptp_profile_name}' referenced under {self.data_model}.p2p_links does not exist in `ptp_profiles`."
                 ptp_config.update(get_item(self.shared_utils.ptp_profiles, "profile", ptp_profile_name, required=True, custom_error_msg=msg))
 
-            ptp_config["enable"] = True
-
             if get(p2p_link, "role") != "bmca":
                 ptp_config["role"] = "master"
 
-            ptp_config.pop("profile", None)
-            ethernet_cfg["ptp"] = ptp_config
+        ptp_config["enable"] = True
+        ptp_config.pop("profile", None)
+        ethernet_cfg["ptp"] = ptp_config
 
         return ethernet_cfg