Adding test on l3leaf

aristanetworks · Jan 22, 2025 · e87a4e4 · e87a4e4
1 parent 86b19fc
commit e87a4e4
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 95 deletions.
diff --git a/...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf3.cfg b/...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf3.cfg
@@ -56,6 +56,12 @@ interface Ethernet2
    mtu 9214
    no switchport
    ip address 192.168.1.3/31
+   ptp enable
+   ptp announce interval 0
+   ptp announce timeout 3
+   ptp delay-req interval -3
+   ptp sync-message interval -3
+   ptp transport ipv4
 !
 interface Loopback0
    description ROUTER_ID

diff --git a/...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf4.cfg b/...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf4.cfg
@@ -10,19 +10,6 @@ service routing protocols model multi-agent
 !
 hostname ptp-tests-leaf4
 !
-ptp clock-identity 00:1C:73:1e:00:02
-ptp domain 127
-ptp mode boundary
-ptp priority1 30
-ptp priority2 2
-ptp monitor threshold offset-from-master 250
-ptp monitor threshold mean-path-delay 1500
-ptp monitor sequence-id
-ptp monitor threshold missing-message sync 3 sequence-ids
-ptp monitor threshold missing-message follow-up 3 sequence-ids
-ptp monitor threshold missing-message delay-resp 3 sequence-ids
-ptp monitor threshold missing-message announce 3 sequence-ids
-!
 vlan 11
    name VLAN11
 !
@@ -43,25 +30,13 @@ interface Ethernet1
    mtu 9214
    no switchport
    ip address 192.168.1.5/31
-   ptp enable
-   ptp announce interval 0
-   ptp announce timeout 3
-   ptp delay-req interval -3
-   ptp sync-message interval -3
-   ptp transport ipv4
 !
 interface Ethernet2
    description P2P_ptp-tests-spine2_Ethernet16
    no shutdown
    mtu 9214
    no switchport
    ip address 192.168.1.7/31
-   ptp enable
-   ptp announce interval 0
-   ptp announce timeout 3
-   ptp delay-req interval -3
-   ptp sync-message interval -3
-   ptp transport ipv4
 !
 interface Loopback0
    description ROUTER_ID

diff --git a/...lections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg b/...lections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg
@@ -154,12 +154,6 @@ interface Ethernet16
    mtu 9214
    no switchport
    ip address 192.168.1.4/31
-   ptp enable
-   ptp announce interval 0
-   ptp announce timeout 3
-   ptp delay-req interval -3
-   ptp sync-message interval -3
-   ptp transport ipv4
 !
 interface Ethernet17
    description P2P_ptp-tests-leaf5_Ethernet1

diff --git a/...lections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg b/...lections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg
@@ -96,19 +96,19 @@ interface Ethernet15
    mtu 9214
    no switchport
    ip address 192.168.1.2/31
+   ptp enable
+   ptp announce interval 0
+   ptp announce timeout 3
+   ptp delay-req interval -3
+   ptp sync-message interval -3
+   ptp transport ipv4
 !
 interface Ethernet16
    description P2P_ptp-tests-leaf4_Ethernet2
    no shutdown
    mtu 9214
    no switchport
    ip address 192.168.1.6/31
-   ptp enable
-   ptp announce interval 0
-   ptp announce timeout 3
-   ptp delay-req interval -3
-   ptp sync-message interval -3
-   ptp transport ipv4
 !
 interface Ethernet17
    description P2P_ptp-tests-leaf5_Ethernet2

diff --git a/...rista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf3.yml b/...rista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf3.yml
@@ -28,6 +28,15 @@ ethernet_interfaces:
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.3/31
+  ptp:
+    enable: true
+    announce:
+      interval: 0
+      timeout: 3
+    delay_req: -3
+    sync_message:
+      interval: -3
+    transport: ipv4
   peer: ptp-tests-spine2
   peer_interface: Ethernet15
   peer_type: spine

diff --git a/...rista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf4.yml b/...rista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf4.yml
@@ -9,15 +9,6 @@ ethernet_interfaces:
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.5/31
-  ptp:
-    enable: true
-    announce:
-      interval: 0
-      timeout: 3
-    delay_req: -3
-    sync_message:
-      interval: -3
-    transport: ipv4
   peer: ptp-tests-spine1
   peer_interface: Ethernet16
   peer_type: spine
@@ -28,15 +19,6 @@ ethernet_interfaces:
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.7/31
-  ptp:
-    enable: true
-    announce:
-      interval: 0
-      timeout: 3
-    delay_req: -3
-    sync_message:
-      interval: -3
-    transport: ipv4
   peer: ptp-tests-spine2
   peer_interface: Ethernet16
   peer_type: spine
@@ -69,24 +51,6 @@ prefix_lists:
     action: permit 192.168.3.0/24 eq 32
   - sequence: 20
     action: permit 192.168.2.0/24 eq 32
-ptp:
-  mode: boundary
-  clock_identity: 00:1C:73:1e:00:02
-  priority1: 30
-  priority2: 2
-  domain: 127
-  monitor:
-    enabled: true
-    threshold:
-      offset_from_master: 250
-      mean_path_delay: 1500
-    missing_message:
-      sequence_ids:
-        enabled: true
-        announce: 3
-        delay_resp: 3
-        follow_up: 3
-        sync: 3
 route_maps:
 - name: RM-CONN-2-BGP
   sequence_numbers:

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
@@ -104,15 +104,6 @@ ethernet_interfaces:
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.4/31
-  ptp:
-    enable: true
-    announce:
-      interval: 0
-      timeout: 3
-    delay_req: -3
-    sync_message:
-      interval: -3
-    transport: ipv4
   peer: ptp-tests-leaf4
   peer_interface: Ethernet1
   peer_type: l3leaf

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
@@ -9,6 +9,15 @@ ethernet_interfaces:
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.2/31
+  ptp:
+    enable: true
+    announce:
+      interval: 0
+      timeout: 3
+    delay_req: -3
+    sync_message:
+      interval: -3
+    transport: ipv4
   peer: ptp-tests-leaf3
   peer_interface: Ethernet2
   peer_type: l3leaf
@@ -19,15 +28,6 @@ ethernet_interfaces:
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.6/31
-  ptp:
-    enable: true
-    announce:
-      interval: 0
-      timeout: 3
-    delay_req: -3
-    sync_message:
-      interval: -3
-    transport: ipv4
   peer: ptp-tests-leaf4
   peer_interface: Ethernet2
   peer_type: l3leaf

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_UPLINKS.yml b/...ons/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_UPLINKS.yml
@@ -17,14 +17,12 @@ l3leaf:
       ptp:
         enabled: true
         # PTP configured on below interfaces.
-        uplinks: ['Ethernet1']
+        uplinks: [Ethernet1, Ethernet2]
     - name: ptp-tests-leaf4
       id: 2
       uplink_switch_interfaces: [Ethernet16, Ethernet16]
       ptp:
-        enabled: true
-        uplinks: ['Ethernet1', 'Ethernet2']
-      # PTP configured on all uplinks when 'ptp.uplinks' is not set.
+        enabled: false
     - name: ptp-tests-leaf5
       id: 3
       uplink_switch_interfaces: [Ethernet17, Ethernet17]