Modification in code and tests

aristanetworks · Dec 18, 2024 · 1eea385 · 1eea385
1 parent abb0d46
commit 1eea385
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 87 deletions.
diff --git a/...ts/intended/configs/ptp-tests-l2leaf3.cfg → ...ests/intended/configs/ptp-tests-leaf3.cfg b/...ts/intended/configs/ptp-tests-l2leaf3.cfg → ...ests/intended/configs/ptp-tests-leaf3.cfg
@@ -8,7 +8,7 @@ transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
 !
-hostname ptp-tests-l2leaf3
+hostname ptp-tests-leaf3
 !
 ptp clock-identity 00:1C:73:1e:00:01
 ptp domain 127
@@ -73,7 +73,7 @@ interface Vlan11
    vrf VRF1
 !
 interface Vxlan1
-   description ptp-tests-l2leaf3_VTEP
+   description ptp-tests-leaf3_VTEP
    vxlan source-interface Loopback1
    vxlan udp-port 4789
    vxlan vlan 11 vni 10011

diff --git a/...ts/intended/configs/ptp-tests-l2leaf4.cfg → ...ests/intended/configs/ptp-tests-leaf4.cfg b/...ts/intended/configs/ptp-tests-l2leaf4.cfg → ...ests/intended/configs/ptp-tests-leaf4.cfg
@@ -8,7 +8,7 @@ transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
 !
-hostname ptp-tests-l2leaf4
+hostname ptp-tests-leaf4
 !
 ptp clock-identity 00:1C:73:1e:00:02
 ptp domain 127
@@ -79,7 +79,7 @@ interface Vlan11
    vrf VRF1
 !
 interface Vxlan1
-   description ptp-tests-l2leaf4_VTEP
+   description ptp-tests-leaf4_VTEP
    vxlan source-interface Loopback1
    vxlan udp-port 4789
    vxlan vlan 11 vni 10011

diff --git a/...ts/intended/configs/ptp-tests-l2leaf5.cfg → ...ests/intended/configs/ptp-tests-leaf5.cfg b/...ts/intended/configs/ptp-tests-l2leaf5.cfg → ...ests/intended/configs/ptp-tests-leaf5.cfg
@@ -8,7 +8,7 @@ transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
 !
-hostname ptp-tests-l2leaf5
+hostname ptp-tests-leaf5
 !
 ptp clock-identity 00:1C:73:1e:00:03
 ptp domain 127
@@ -79,7 +79,7 @@ interface Vlan11
    vrf VRF1
 !
 interface Vxlan1
-   description ptp-tests-l2leaf5_VTEP
+   description ptp-tests-leaf5_VTEP
    vxlan source-interface Loopback1
    vxlan udp-port 4789
    vxlan vlan 11 vni 10011

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
@@ -136,7 +136,7 @@ interface Ethernet9
    ptp transport ipv4
 !
 interface Ethernet15
-   description P2P_ptp-tests-l2leaf3_Ethernet1
+   description P2P_ptp-tests-leaf3_Ethernet1
    no shutdown
    mtu 9214
    no switchport
@@ -149,7 +149,7 @@ interface Ethernet15
    ptp transport ipv4
 !
 interface Ethernet16
-   description P2P_ptp-tests-l2leaf4_Ethernet1
+   description P2P_ptp-tests-leaf4_Ethernet1
    no shutdown
    mtu 9214
    no switchport
@@ -162,7 +162,7 @@ interface Ethernet16
    ptp transport ipv4
 !
 interface Ethernet17
-   description P2P_ptp-tests-l2leaf5_Ethernet1
+   description P2P_ptp-tests-leaf5_Ethernet1
    no shutdown
    mtu 9214
    no switchport
@@ -234,22 +234,22 @@ router bgp 65200
    neighbor 10.254.2.7 description ptp-tests-leaf2_Ethernet2
    neighbor 192.168.1.1 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.1 remote-as 65010
-   neighbor 192.168.1.1 description ptp-tests-l2leaf3_Ethernet1
+   neighbor 192.168.1.1 description ptp-tests-leaf3_Ethernet1
    neighbor 192.168.1.5 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.5 remote-as 65010
-   neighbor 192.168.1.5 description ptp-tests-l2leaf4_Ethernet1
+   neighbor 192.168.1.5 description ptp-tests-leaf4_Ethernet1
    neighbor 192.168.1.9 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.9 remote-as 65010
-   neighbor 192.168.1.9 description ptp-tests-l2leaf5_Ethernet1
+   neighbor 192.168.1.9 description ptp-tests-leaf5_Ethernet1
    neighbor 192.168.3.1 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.1 remote-as 65010
-   neighbor 192.168.3.1 description ptp-tests-l2leaf3_Loopback0
+   neighbor 192.168.3.1 description ptp-tests-leaf3_Loopback0
    neighbor 192.168.3.2 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.2 remote-as 65010
-   neighbor 192.168.3.2 description ptp-tests-l2leaf4_Loopback0
+   neighbor 192.168.3.2 description ptp-tests-leaf4_Loopback0
    neighbor 192.168.3.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.3 remote-as 65010
-   neighbor 192.168.3.3 description ptp-tests-l2leaf5_Loopback0
+   neighbor 192.168.3.3 description ptp-tests-leaf5_Loopback0
    redistribute connected route-map RM-CONN-2-BGP
    !
    address-family evpn

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
@@ -91,14 +91,14 @@ interface Ethernet9
    ptp transport ipv4
 !
 interface Ethernet15
-   description P2P_ptp-tests-l2leaf3_Ethernet2
+   description P2P_ptp-tests-leaf3_Ethernet2
    no shutdown
    mtu 9214
    no switchport
    ip address 192.168.1.2/31
 !
 interface Ethernet16
-   description P2P_ptp-tests-l2leaf4_Ethernet2
+   description P2P_ptp-tests-leaf4_Ethernet2
    no shutdown
    mtu 9214
    no switchport
@@ -111,7 +111,7 @@ interface Ethernet16
    ptp transport ipv4
 !
 interface Ethernet17
-   description P2P_ptp-tests-l2leaf5_Ethernet2
+   description P2P_ptp-tests-leaf5_Ethernet2
    no shutdown
    mtu 9214
    no switchport
@@ -165,22 +165,22 @@ router bgp 65200
    neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
    neighbor 192.168.1.3 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.3 remote-as 65010
-   neighbor 192.168.1.3 description ptp-tests-l2leaf3_Ethernet2
+   neighbor 192.168.1.3 description ptp-tests-leaf3_Ethernet2
    neighbor 192.168.1.7 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.7 remote-as 65010
-   neighbor 192.168.1.7 description ptp-tests-l2leaf4_Ethernet2
+   neighbor 192.168.1.7 description ptp-tests-leaf4_Ethernet2
    neighbor 192.168.1.11 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.11 remote-as 65010
-   neighbor 192.168.1.11 description ptp-tests-l2leaf5_Ethernet2
+   neighbor 192.168.1.11 description ptp-tests-leaf5_Ethernet2
    neighbor 192.168.3.1 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.1 remote-as 65010
-   neighbor 192.168.3.1 description ptp-tests-l2leaf3_Loopback0
+   neighbor 192.168.3.1 description ptp-tests-leaf3_Loopback0
    neighbor 192.168.3.2 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.2 remote-as 65010
-   neighbor 192.168.3.2 description ptp-tests-l2leaf4_Loopback0
+   neighbor 192.168.3.2 description ptp-tests-leaf4_Loopback0
    neighbor 192.168.3.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.3 remote-as 65010
-   neighbor 192.168.3.3 description ptp-tests-l2leaf5_Loopback0
+   neighbor 192.168.3.3 description ptp-tests-leaf5_Loopback0
    redistribute connected route-map RM-CONN-2-BGP
    !
    address-family evpn

diff --git a/.../structured_configs/ptp-tests-l2leaf3.yml → ...ed/structured_configs/ptp-tests-leaf3.yml b/.../structured_configs/ptp-tests-l2leaf3.yml → ...ed/structured_configs/ptp-tests-leaf3.yml
@@ -1,4 +1,4 @@
-hostname: ptp-tests-l2leaf3
+hostname: ptp-tests-leaf3
 is_deployed: true
 router_bgp:
   as: '65010'
@@ -200,7 +200,7 @@ vlan_interfaces:
   vrf: VRF1
 vxlan_interface:
   vxlan1:
-    description: ptp-tests-l2leaf3_VTEP
+    description: ptp-tests-leaf3_VTEP
     vxlan:
       udp_port: 4789
       source_interface: Loopback1

diff --git a/.../structured_configs/ptp-tests-l2leaf4.yml → ...ed/structured_configs/ptp-tests-leaf4.yml b/.../structured_configs/ptp-tests-l2leaf4.yml → ...ed/structured_configs/ptp-tests-leaf4.yml
@@ -1,4 +1,4 @@
-hostname: ptp-tests-l2leaf4
+hostname: ptp-tests-leaf4
 is_deployed: true
 router_bgp:
   as: '65010'
@@ -209,7 +209,7 @@ vlan_interfaces:
   vrf: VRF1
 vxlan_interface:
   vxlan1:
-    description: ptp-tests-l2leaf4_VTEP
+    description: ptp-tests-leaf4_VTEP
     vxlan:
       udp_port: 4789
       source_interface: Loopback1

diff --git a/.../structured_configs/ptp-tests-l2leaf5.yml → ...ed/structured_configs/ptp-tests-leaf5.yml b/.../structured_configs/ptp-tests-l2leaf5.yml → ...ed/structured_configs/ptp-tests-leaf5.yml
@@ -1,4 +1,4 @@
-hostname: ptp-tests-l2leaf5
+hostname: ptp-tests-leaf5
 is_deployed: true
 router_bgp:
   as: '65010'
@@ -209,7 +209,7 @@ vlan_interfaces:
   vrf: VRF1
 vxlan_interface:
   vxlan1:
-    description: ptp-tests-l2leaf5_VTEP
+    description: ptp-tests-leaf5_VTEP
     vxlan:
       udp_port: 4789
       source_interface: Loopback1

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
@@ -58,33 +58,18 @@ router_bgp:
   - ip_address: 192.168.1.1
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf3
-    description: ptp-tests-l2leaf3_Ethernet1
+    peer: ptp-tests-leaf3
+    description: ptp-tests-leaf3_Ethernet1
   - ip_address: 192.168.1.5
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf4
-    description: ptp-tests-l2leaf4_Ethernet1
+    peer: ptp-tests-leaf4
+    description: ptp-tests-leaf4_Ethernet1
   - ip_address: 192.168.1.9
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf5
-    description: ptp-tests-l2leaf5_Ethernet1
-  - ip_address: 192.168.3.1
-    peer_group: EVPN-OVERLAY-PEERS
-    peer: ptp-tests-l2leaf3
-    description: ptp-tests-l2leaf3_Loopback0
-    remote_as: '65010'
-  - ip_address: 192.168.3.2
-    peer_group: EVPN-OVERLAY-PEERS
-    peer: ptp-tests-l2leaf4
-    description: ptp-tests-l2leaf4_Loopback0
-    remote_as: '65010'
-  - ip_address: 192.168.3.3
-    peer_group: EVPN-OVERLAY-PEERS
-    peer: ptp-tests-l2leaf5
-    description: ptp-tests-l2leaf5_Loopback0
-    remote_as: '65010'
+    peer: ptp-tests-leaf5
+    description: ptp-tests-leaf5_Ethernet1
   - ip_address: 10.254.1.1
     peer_group: EVPN-OVERLAY-PEERS
     peer: ptp-tests-leaf1
@@ -95,6 +80,21 @@ router_bgp:
     peer: ptp-tests-leaf2
     description: ptp-tests-leaf2_Loopback0
     remote_as: '65102'
+  - ip_address: 192.168.3.1
+    peer_group: EVPN-OVERLAY-PEERS
+    peer: ptp-tests-leaf3
+    description: ptp-tests-leaf3_Loopback0
+    remote_as: '65010'
+  - ip_address: 192.168.3.2
+    peer_group: EVPN-OVERLAY-PEERS
+    peer: ptp-tests-leaf4
+    description: ptp-tests-leaf4_Loopback0
+    remote_as: '65010'
+  - ip_address: 192.168.3.3
+    peer_group: EVPN-OVERLAY-PEERS
+    peer: ptp-tests-leaf5
+    description: ptp-tests-leaf5_Loopback0
+    remote_as: '65010'
   address_family_evpn:
     peer_groups:
     - name: EVPN-OVERLAY-PEERS
@@ -230,10 +230,10 @@ ethernet_interfaces:
     enable: true
   ip_address: 10.254.2.6/31
 - name: Ethernet15
-  peer: ptp-tests-l2leaf3
+  peer: ptp-tests-leaf3
   peer_interface: Ethernet1
   peer_type: l3leaf
-  description: P2P_ptp-tests-l2leaf3_Ethernet1
+  description: P2P_ptp-tests-leaf3_Ethernet1
   shutdown: false
   mtu: 9214
   switchport:
@@ -249,10 +249,10 @@ ethernet_interfaces:
     enable: true
   ip_address: 192.168.1.0/31
 - name: Ethernet16
-  peer: ptp-tests-l2leaf4
+  peer: ptp-tests-leaf4
   peer_interface: Ethernet1
   peer_type: l3leaf
-  description: P2P_ptp-tests-l2leaf4_Ethernet1
+  description: P2P_ptp-tests-leaf4_Ethernet1
   shutdown: false
   mtu: 9214
   switchport:
@@ -268,10 +268,10 @@ ethernet_interfaces:
     enable: true
   ip_address: 192.168.1.4/31
 - name: Ethernet17
-  peer: ptp-tests-l2leaf5
+  peer: ptp-tests-leaf5
   peer_interface: Ethernet1
   peer_type: l3leaf
-  description: P2P_ptp-tests-l2leaf5_Ethernet1
+  description: P2P_ptp-tests-leaf5_Ethernet1
   shutdown: false
   mtu: 9214
   switchport:

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
@@ -38,32 +38,32 @@ router_bgp:
   - ip_address: 192.168.1.3
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf3
-    description: ptp-tests-l2leaf3_Ethernet2
+    peer: ptp-tests-leaf3
+    description: ptp-tests-leaf3_Ethernet2
   - ip_address: 192.168.1.7
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf4
-    description: ptp-tests-l2leaf4_Ethernet2
+    peer: ptp-tests-leaf4
+    description: ptp-tests-leaf4_Ethernet2
   - ip_address: 192.168.1.11
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf5
-    description: ptp-tests-l2leaf5_Ethernet2
+    peer: ptp-tests-leaf5
+    description: ptp-tests-leaf5_Ethernet2
   - ip_address: 192.168.3.1
     peer_group: EVPN-OVERLAY-PEERS
-    peer: ptp-tests-l2leaf3
-    description: ptp-tests-l2leaf3_Loopback0
+    peer: ptp-tests-leaf3
+    description: ptp-tests-leaf3_Loopback0
     remote_as: '65010'
   - ip_address: 192.168.3.2
     peer_group: EVPN-OVERLAY-PEERS
-    peer: ptp-tests-l2leaf4
-    description: ptp-tests-l2leaf4_Loopback0
+    peer: ptp-tests-leaf4
+    description: ptp-tests-leaf4_Loopback0
     remote_as: '65010'
   - ip_address: 192.168.3.3
     peer_group: EVPN-OVERLAY-PEERS
-    peer: ptp-tests-l2leaf5
-    description: ptp-tests-l2leaf5_Loopback0
+    peer: ptp-tests-leaf5
+    description: ptp-tests-leaf5_Loopback0
     remote_as: '65010'
   address_family_evpn:
     peer_groups:
@@ -137,20 +137,20 @@ ptp:
         sync: 14
 ethernet_interfaces:
 - name: Ethernet15
-  peer: ptp-tests-l2leaf3
+  peer: ptp-tests-leaf3
   peer_interface: Ethernet2
   peer_type: l3leaf
-  description: P2P_ptp-tests-l2leaf3_Ethernet2
+  description: P2P_ptp-tests-leaf3_Ethernet2
   shutdown: false
   mtu: 9214
   switchport:
     enabled: false
   ip_address: 192.168.1.2/31
 - name: Ethernet16
-  peer: ptp-tests-l2leaf4
+  peer: ptp-tests-leaf4
   peer_interface: Ethernet2
   peer_type: l3leaf
-  description: P2P_ptp-tests-l2leaf4_Ethernet2
+  description: P2P_ptp-tests-leaf4_Ethernet2
   shutdown: false
   mtu: 9214
   switchport:
@@ -166,10 +166,10 @@ ethernet_interfaces:
     enable: true
   ip_address: 192.168.1.6/31
 - name: Ethernet17
-  peer: ptp-tests-l2leaf5
+  peer: ptp-tests-leaf5
   peer_interface: Ethernet2
   peer_type: l3leaf
-  description: P2P_ptp-tests-l2leaf5_Ethernet2
+  description: P2P_ptp-tests-leaf5_Ethernet2
   shutdown: false
   mtu: 9214
   switchport: