From 4430730c33ceb11242926c724eb217c1c5dfeb95 Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Mon, 20 Jan 2025 15:10:18 +0530 Subject: [PATCH] Adding test on l3leaf --- .../intended/configs/ptp-tests-leaf3.cfg | 6 ++++ .../intended/configs/ptp-tests-leaf4.cfg | 25 ------------- .../intended/configs/ptp-tests-spine1.cfg | 6 ---- .../intended/configs/ptp-tests-spine2.cfg | 12 +++---- .../structured_configs/ptp-tests-leaf3.yml | 9 +++++ .../structured_configs/ptp-tests-leaf4.yml | 36 ------------------- .../structured_configs/ptp-tests-spine1.yml | 9 ----- .../structured_configs/ptp-tests-spine2.yml | 18 +++++----- .../group_vars/PTP_TESTS_UPLINKS.yml | 6 ++-- 9 files changed, 32 insertions(+), 95 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf3.cfg index 8ab742c6d19..f195688507b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf3.cfg +++ b/ansible_collections/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf4.cfg index d2cd92f2c84..5ac0783b6d8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf4.cfg +++ b/ansible_collections/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,12 +30,6 @@ 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 @@ -56,12 +37,6 @@ interface Ethernet2 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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg index e6bb84a7dd5..0b04e231663 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg +++ b/ansible_collections/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg index 3401ed9d7a6..22617ce55c9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg @@ -96,6 +96,12 @@ 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 @@ -103,12 +109,6 @@ interface Ethernet16 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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf3.yml index a41e074648b..566ea6373ec 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf3.yml +++ b/ansible_collections/arista/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf4.yml index d41f1155923..b6cf1f88a15 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf4.yml +++ b/ansible_collections/arista/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml index ed8d280e5b7..8a8dacc30af 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml +++ b/ansible_collections/arista/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml index 7f44189dfe9..56f793fe071 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml +++ b/ansible_collections/arista/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/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_UPLINKS.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_UPLINKS.yml index 28db24895fa..464d38c6e43 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_UPLINKS.yml +++ b/ansible_collections/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]