Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat(eos_designs): Improve ptp settings for p2p_links #4612

Open
wants to merge 27 commits into
base: devel
Choose a base branch
from
Open

Feat(eos_designs): Improve ptp settings for p2p_links #4612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
11fbf3d
Feat(eos_desings): Improve settings for
Oct 18, 2024
6738001
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 18, 2024
fd8cfee
Run molecule
Oct 18, 2024
9c23036
Handle ptp role
Oct 21, 2024
042269c
Update error msg and add negative test
Oct 21, 2024
cbfe896
Remove context from ethernet_interfaces.py
Oct 25, 2024
ec46b6a
Adding profile in ptp_profiles and fix the bugs observed
Oct 29, 2024
ad9fc53
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 29, 2024
ae695be
Adding tests for ptp settings through p2p_links_profiles and ptp_prof…
Oct 29, 2024
76293c6
Fix
Oct 30, 2024
1eef9ac
Fix CI.
Nov 15, 2024
3ac2b0d
Correct code for role settings
Nov 15, 2024
712dd67
Replace bmca to dynamic in connected endpoints role
Nov 15, 2024
abb0cdd
Remove ptp role dynamic from output
Nov 15, 2024
960abf0
Update python-avd/pyavd/_eos_designs/structured_config/connected_endp…
laxmikantchintakindi Nov 18, 2024
fccce51
Make role a list
Nov 18, 2024
442d4e3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 18, 2024
3220ed8
Address comments on schema and code
Nov 19, 2024
82310ad
Fixing ptp role code
Nov 19, 2024
397a12a
Fixing port-channel configuration for ptp
Nov 21, 2024
c47744a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 21, 2024
f029801
Fix CI
Nov 21, 2024
a0c1cc1
Final update
Nov 22, 2024
f5685d0
FIX CI
Nov 22, 2024
0bdcf83
Merge branch 'devel' into feat/ptp-p2p-links
Nov 22, 2024
a810616
Merge branch 'devel' into feat/ptp-p2p-links
laxmikantchintakindi Nov 22, 2024
4069c9b
Fix
Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-SPINE2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...d/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-SUPER-SPINE1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...vd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...d/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-SUPER-SPINE1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 29 additions & 0 deletions ..._negative_unit_tests/inventory/host_vars/failure-p2p-links-ptp-profile-does-not-exist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`.
1 change: 1 addition & 0 deletions ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
25 changes: 25 additions & 0 deletions ...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-1-isis-sr-ldp.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -192,6 +211,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
Expand Down
25 changes: 25 additions & 0 deletions ...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/core-2-ospf-ldp.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -152,6 +171,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
Expand Down
18 changes: 18 additions & 0 deletions ...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_bgp.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions ..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_isis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
18 changes: 18 additions & 0 deletions ..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_ospf.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...llections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions ...lections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ interface Ethernet6
mtu 9214
no switchport
ptp enable
ptp announce interval 0
ptp announce timeout 3
ptp delay-req interval -3
ptp sync-message interval -3
ptp announce interval 2
ptp announce timeout 10
ptp delay-req interval 2
ptp sync-message interval 2
ptp transport ipv4
!
interface Ethernet7
Expand All @@ -107,6 +107,7 @@ interface Ethernet7
ptp announce interval 0
ptp announce timeout 3
ptp delay-req interval -3
ptp role master
ptp sync-message interval -3
ptp transport ipv4
!
Expand Down
8 changes: 4 additions & 4 deletions ...lections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ interface Ethernet6
mtu 9214
no switchport
ptp enable
ptp announce interval 0
ptp announce timeout 3
ptp delay-req interval -3
ptp sync-message interval -3
ptp announce interval 2
ptp announce timeout 10
ptp delay-req interval 2
ptp sync-message interval 2
ptp transport ipv4
!
interface Ethernet7
Expand Down
Loading
Loading