Feat(eos_designs): Improve ptp settings for p2p_links (aristanetw…

…orks#4612)
emilarista · Dec 17, 2024 · 278ba04 · 278ba04
1 parent 5bffcb4
commit 278ba04
Show file tree

Hide file tree

Showing 47 changed files with 848 additions and 92 deletions.
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
@@ -656,9 +656,9 @@ ethernet_interfaces:
     enabled: false
   shutdown: false
   ip_address: 11.1.0.38/31
-  description: P2P_DC2-POD1-LEAF1A_Ethernet7
   ptp:
     enable: true
+  description: P2P_DC2-POD1-LEAF1A_Ethernet7
 - 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
@@ -170,9 +170,9 @@ ethernet_interfaces:
     enabled: false
   shutdown: false
   ip_address: 200.200.200.101/24
-  description: P2P_DC2-POD1-SPINE2_Ethernet5
   ptp:
     enable: true
+  description: P2P_DC2-POD1-SPINE2_Ethernet5
 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
@@ -170,11 +170,11 @@ ethernet_interfaces:
     enabled: false
   shutdown: false
   ip_address: 11.1.2.0/31
+  ptp:
+    enable: true
   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
@@ -272,9 +272,9 @@ ethernet_interfaces:
     enabled: false
   shutdown: false
   ip_address: 11.1.0.39/31
-  description: P2P_DC1-POD1-LEAF2B_Ethernet7
   ptp:
     enable: true
+  description: P2P_DC1-POD1-LEAF2B_Ethernet7
 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
@@ -154,9 +154,9 @@ ethernet_interfaces:
     enabled: false
   shutdown: false
   ip_address: 200.200.200.201/24
-  description: P2P_DC1-POD2-SPINE2_Ethernet4
   ptp:
     enable: true
+  description: P2P_DC1-POD2-SPINE2_Ethernet4
 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
@@ -219,11 +219,11 @@ ethernet_interfaces:
     enabled: false
   shutdown: false
   ip_address: 11.1.2.1/31
+  ptp:
+    enable: true
   mac_security:
     profile: MACSEC_PROFILE
   description: P2P_DC1-SUPER-SPINE1_Ethernet6
-  ptp:
-    enable: true
 loopback_interfaces:
 - name: Loopback0
   description: ROUTER_ID

diff --git a/...le_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg b/...le_collections/arista/avd/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg
@@ -19,6 +19,27 @@ management api http-commands
    vrf MGMT
       no shutdown
 !
+interface Port-Channel1
+   description SERVER_OLD_SW-1/2_ENDPOINT_PORT_CHANNEL
+   no shutdown
+   switchport
+   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 SERVER_OLD_SW-1/2_Endpoint_port1
+   no shutdown
+   channel-group 1 mode active
+!
+interface Ethernet2
+   description SERVER_OLD_SW-1/2_ENDPOINT_PORT2
+   no shutdown
+   channel-group 1 mode active
+!
 interface Loopback0
    description CUSTOM_ROUTER_ID
    no shutdown

diff --git a/...ons/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml b/...ons/arista/avd/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml
@@ -100,3 +100,37 @@ vxlan_interface:
     vxlan:
       udp_port: 4789
       source_interface: Loopback1
+ethernet_interfaces:
+- name: Ethernet1
+  peer: OLD_SW-1/2
+  peer_interface: Endpoint_port1
+  peer_type: server
+  description: SERVER_OLD_SW-1/2_Endpoint_port1
+  shutdown: false
+  channel_group:
+    id: 1
+    mode: active
+- name: Ethernet2
+  peer: OLD_SW-1/2
+  peer_interface: ENDPOINT_PORT2
+  peer_type: server
+  description: SERVER_OLD_SW-1/2_ENDPOINT_PORT2
+  shutdown: false
+  channel_group:
+    id: 1
+    mode: active
+port_channel_interfaces:
+- name: Port-Channel1
+  description: SERVER_OLD_SW-1/2_ENDPOINT_PORT_CHANNEL
+  shutdown: false
+  ptp:
+    announce:
+      interval: 0
+      timeout: 3
+    delay_req: -3
+    sync_message:
+      interval: -3
+    transport: ipv4
+    enable: true
+  switchport:
+    enabled: true
diff --git a/...vd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/connected-endpoints.yml b/...vd/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/connected-endpoints.yml
@@ -0,0 +1,14 @@
+---
+# Test deprecated key endpoint_role - bmca
+servers:
+  - name: OLD_SW-1/2
+    adapters:
+      - switches: [host1, host1]
+        switch_ports: [Ethernet1, Ethernet2]
+        endpoint_ports: [Endpoint_port1, ENDPOINT_PORT2]
+        port_channel:
+          mode: "active"
+          endpoint_port_channel: ENDPOINT_PORT_CHANNEL
+        ptp:
+          enabled: true
+          endpoint_role: bmca
diff --git a/..._negative_unit_tests/inventory/host_vars/failure-p2p-links-ptp-profile-does-not-exist.yml b/..._negative_unit_tests/inventory/host_vars/failure-p2p-links-ptp-profile-does-not-exist.yml
@@ -0,0 +1,29 @@
+---
+type: l3leaf
+
+ptp_profiles:
+  - profile: PROFILE-1
+
+l3leaf:
+  defaults:
+    loopback_ipv4_pool: 10.254.1.0/27
+    vtep_loopback_ipv4_pool: 10.254.11.0/27
+  nodes:
+    - name: failure-p2p-links-ptp-profile-does-not-exist
+      id: 1
+      bgp_as: 65101
+      mgmt_ip: 192.168.0.101/24
+      ptp:
+        enabled: true
+
+l3_edge:
+  p2p_links:
+    - nodes: [failure-p2p-links-ptp-profile-does-not-exist, not-in-fabric]
+      interfaces: [Ethernet10, Ethernet11]
+      ip: [192.168.0.2/31, 192.168.0.3/31]
+      ptp:
+        enabled: true
+        profile: PROFILE DOES NOT EXIST
+
+expected_error_message: >-
+  PTP Profile 'PROFILE DOES NOT EXIST' referenced under l3_edge.p2p_links does not exist in `ptp_profiles`.
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml
@@ -107,6 +107,7 @@ all:
             failure-missing-evpn-multicast-peg-rps:
             failure-missing-evpn-multicast-with-pim:
             failure-network-port-ptp-profile-does-not-exist:
+            failure-p2p-links-ptp-profile-does-not-exist:
             failure-no-local-path-group-in-default-policy:
             failure-adapter-ptp-profile-does-not-exist:
             failure-svi-grandparent-profile-does-not-exist:

diff --git a/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg b/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg
@@ -10,6 +10,19 @@ service routing protocols model multi-agent
 !
 hostname core-1-isis-sr-ldp
 !
+ptp clock-identity 00:1C:73:7f:00:01
+ptp domain 127
+ptp mode boundary
+ptp priority1 127
+ptp priority2 1
+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
+!
 spanning-tree mode none
 !
 vrf instance MGMT
@@ -67,6 +80,12 @@ interface Port-Channel16
    mpls ldp igp sync
    mpls ldp interface
    mpls ip
+   ptp enable
+   ptp announce interval 0
+   ptp announce timeout 3
+   ptp delay-req interval -3
+   ptp sync-message interval -3
+   ptp transport ipv4
    isis enable CORE
    isis circuit-type level-2
    isis metric 60
@@ -194,6 +213,12 @@ interface Ethernet10
    mpls ldp igp sync
    mpls ldp interface
    mpls ip
+   ptp enable
+   ptp announce interval 0
+   ptp announce timeout 3
+   ptp delay-req interval -3
+   ptp sync-message interval -3
+   ptp transport ipv4
    isis enable CORE
    isis circuit-type level-2
    isis metric 50

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
@@ -10,6 +10,19 @@ service routing protocols model multi-agent
 !
 hostname core-2-ospf-ldp
 !
+ptp clock-identity 00:1C:73:7f:00:02
+ptp domain 127
+ptp mode boundary
+ptp priority1 127
+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
+!
 spanning-tree mode none
 !
 vrf instance MGMT
@@ -59,6 +72,12 @@ interface Port-Channel16
    mpls ip
    ip ospf network point-to-point
    ip ospf area 0.0.0.0
+   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_CORE-1-ISIS-SR-LDP_Ethernet1
@@ -154,6 +173,12 @@ interface Ethernet10
    mpls ip
    ip ospf network point-to-point
    ip ospf area 0.0.0.0
+   ptp enable
+   ptp announce interval 0
+   ptp announce timeout 3
+   ptp delay-req interval -3
+   ptp sync-message interval -3
+   ptp transport ipv4
 !
 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
@@ -10,6 +10,19 @@ service routing protocols model multi-agent
 !
 hostname l3_edge_bgp
 !
+ptp clock-identity 00:1C:73:14:00:01
+ptp domain 127
+ptp mode boundary
+ptp priority1 20
+ptp priority2 1
+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
+!
 spanning-tree mode none
 !
 vrf instance MGMT
@@ -44,6 +57,11 @@ interface ethernet1
    ip address 192.168.0.0/31
    mac security profile TEST-MACSEC-PROFILE
    ptp enable
+   ptp announce interval 0
+   ptp announce timeout 3
+   ptp delay-req interval -3
+   ptp sync-message interval -3
+   ptp transport ipv4
    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
@@ -10,6 +10,19 @@ service routing protocols model multi-agent
 !
 hostname l3_edge_isis
 !
+ptp clock-identity 00:1C:73:14:00:01
+ptp domain 127
+ptp mode boundary
+ptp priority1 20
+ptp priority2 1
+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
+!
 spanning-tree mode none
 !
 vrf instance MGMT
@@ -30,6 +43,11 @@ interface ethernet1
    ip address 192.168.0.0/31
    mac security profile TEST-MACSEC-PROFILE
    ptp enable
+   ptp announce interval 0
+   ptp announce timeout 3
+   ptp delay-req interval -3
+   ptp sync-message interval -3
+   ptp transport ipv4
    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
@@ -10,6 +10,19 @@ service routing protocols model multi-agent
 !
 hostname l3_edge_ospf
 !
+ptp clock-identity 00:1C:73:14:00:01
+ptp domain 127
+ptp mode boundary
+ptp priority1 20
+ptp priority2 1
+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
+!
 spanning-tree mode none
 !
 vrf instance MGMT
@@ -30,6 +43,11 @@ interface ethernet1
    ip address 192.168.0.0/31
    mac security profile TEST-MACSEC-PROFILE
    ptp enable
+   ptp announce interval 0
+   ptp announce timeout 3
+   ptp delay-req interval -3
+   ptp sync-message interval -3
+   ptp transport ipv4
    service-profile TEST-QOS-PROFILE
 !
 interface ethernet2

diff --git a/...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg b/...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg
@@ -193,7 +193,7 @@ interface Ethernet12
    channel-group 12 mode active
 !
 interface Ethernet13
-   description SERVER_bmca-endpoint_eth1
+   description SERVER_dynamic-endpoint_eth1
    no shutdown
    switchport access vlan 11
    switchport mode access