Removing new tests and adding ptp_settings key in old tests.

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg

@@ -106,20 +106,6 @@ interface Port-Channel14
    switchport mode trunk
    mlag 14
 !
-interface Port-Channel16
-   description PTP-TESTS-L2LEAF2-PTP-SETTINGS-KEY_Po1
-   no shutdown
-   switchport
-   switchport trunk allowed vlan 11
-   switchport mode trunk
-   mlag 16
-   ptp enable
-   ptp announce interval 0
-   ptp announce timeout 3
-   ptp delay-req interval -3
-   ptp sync-message interval -3
-   ptp transport ipv4
-!
 interface Ethernet1
    description P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet1
    no shutdown
@@ -218,11 +204,6 @@ interface Ethernet14
    no shutdown
    channel-group 14 mode active
 !
-interface Ethernet16
-   description PTP-TESTS-L2LEAF2-PTP-SETTINGS-KEY_Ethernet1
-   no shutdown
-   channel-group 16 mode active
-!
 interface Loopback0
    description EVPN_Overlay_Peering
    no shutdown

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf2.cfg

@@ -113,20 +113,6 @@ interface Port-Channel14
    switchport mode trunk
    mlag 14
 !
-interface Port-Channel16
-   description PTP-TESTS-L2LEAF2-PTP-SETTINGS-KEY_Po1
-   no shutdown
-   switchport
-   switchport trunk allowed vlan 11
-   switchport mode trunk
-   mlag 16
-   ptp enable
-   ptp announce interval 0
-   ptp announce timeout 3
-   ptp delay-req interval -3
-   ptp sync-message interval -3
-   ptp transport ipv4
-!
 interface Ethernet1
    description P2P_LINK_TO_PTP-TESTS-SPINE1_Ethernet3
    no shutdown
@@ -198,11 +184,6 @@ interface Ethernet14
    no shutdown
    channel-group 14 mode active
 !
-interface Ethernet16
-   description PTP-TESTS-L2LEAF2-PTP-SETTINGS-KEY_Ethernet2
-   no shutdown
-   channel-group 16 mode active
-!
 interface Loopback0
    description EVPN_Overlay_Peering
    no shutdown

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf1.yml

@@ -238,22 +238,6 @@ port_channel_interfaces:
   mode: trunk
   vlans: '11'
   mlag: 14
-- name: Port-Channel16
-  description: PTP-TESTS-L2LEAF2-PTP-SETTINGS-KEY_Po1
-  type: switched
-  shutdown: false
-  mode: trunk
-  vlans: '11'
-  mlag: 16
-  ptp:
-    announce:
-      interval: 0
-      timeout: 3
-    delay_req: -3
-    sync_message:
-      interval: -3
-    transport: ipv4
-    enable: true
 - name: Port-Channel6
   description: Endpoint-with-mpass
   type: switched
@@ -359,16 +343,6 @@ ethernet_interfaces:
   channel_group:
     id: 14
     mode: active
-- name: Ethernet16
-  peer: ptp-tests-l2leaf2-ptp-settings-key
-  peer_interface: Ethernet1
-  peer_type: l2leaf
-  description: PTP-TESTS-L2LEAF2-PTP-SETTINGS-KEY_Ethernet1
-  shutdown: false
-  type: port-channel-member
-  channel_group:
-    id: 16
-    mode: active
 - name: Ethernet13
   peer: bmca-endpoint
   peer_interface: eth1

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf2.yml

@@ -249,22 +249,6 @@ port_channel_interfaces:
   mode: trunk
   vlans: '11'
   mlag: 14
-- name: Port-Channel16
-  description: PTP-TESTS-L2LEAF2-PTP-SETTINGS-KEY_Po1
-  type: switched
-  shutdown: false
-  mode: trunk
-  vlans: '11'
-  mlag: 16
-  ptp:
-    announce:
-      interval: 0
-      timeout: 3
-    delay_req: -3
-    sync_message:
-      interval: -3
-    transport: ipv4
-    enable: true
 - name: Port-Channel6
   description: Endpoint-with-mpass
   type: switched
@@ -370,16 +354,6 @@ ethernet_interfaces:
   channel_group:
     id: 14
     mode: active
-- name: Ethernet16
-  peer: ptp-tests-l2leaf2-ptp-settings-key
-  peer_interface: Ethernet2
-  peer_type: l2leaf
-  description: PTP-TESTS-L2LEAF2-PTP-SETTINGS-KEY_Ethernet2
-  shutdown: false
-  type: port-channel-member
-  channel_group:
-    id: 16
-    mode: active
 - name: Ethernet5
   peer: video-endpoint
   peer_interface: PCI2

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_L2LEAFS.yml

@@ -36,11 +36,3 @@ l2leaf:
         enabled: true
       uplink_ptp:
         enable: false
-
-    - name: ptp-tests-l2leaf2-ptp-settings-key
-      id: 4
-      uplink_switch_interfaces:
-        - Ethernet16
-        - Ethernet16
-      ptp:
-        enabled: true

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/ptp-tests-leaf2.yml

@@ -3,3 +3,8 @@
 ptp_settings:
   enabled: true
   auto_clock_identity: false
+
+# Test `ptp_settings` setting overrides  `ptp` setting.
+ptp:
+  enabled: false
+  auto_clock_identity: true

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml

@@ -248,7 +248,6 @@ all:
                 ptp-tests-l2leaf1-ptp-disabled:
                 ptp-tests-l2leaf2-ptp-enabled:
                 ptp-tests-l2leaf2-ptp-enabled-uplink-disabled:
-                ptp-tests-l2leaf2-ptp-settings-key:
         SFLOW_TESTS:
           children:
             SFLOW_TESTS_SPINES:

python-avd/pyavd/_eos_designs/structured_config/base/__init__.py

@@ -657,10 +657,10 @@ def ptp(self) -> dict | None:
         PTP priority2 is set in the code below, calculated based on the node id:
             default_priority2 = self.id % 256
         """
-        if not self.shared_utils.ptp_enabled:
+        if not self.shared_utils.ptp_enabled and not get(self._hostvars, "ptp_settings.enabled"):
             # Since we have overlapping data model "ptp" between eos_designs and eos_cli_config_gen,
             # we need to overwrite the input dict if set but not enabled.
-            if get(self._hostvars, "ptp") is not None or get(self._hostvars, "ptp_settings") is not None:
+            if get(self._hostvars, "ptp") is not None:
                 return {}
             return None
         default_ptp_domain = default(get(self._hostvars, "ptp_settings.domain"), get(self._hostvars, "ptp.domain"), 127)