Rebased and resolved conflicts

aristanetworks · Nov 13, 2024 · 6783837 · 6783837
1 parent db75d9e
commit 6783837
Show file tree

Hide file tree

Showing 19 changed files with 102 additions and 116 deletions.
diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-ips.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-ips.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,12 +16,6 @@ hostname inband-mgmt-dualstack-ips
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
-no enable password
-no aaa root
-!
 vlan 105
    name INBAND_MGMT
 !
@@ -63,4 +58,7 @@ ip route 0.0.0.0/0 192.168.105.1
 !
 ipv6 route ::/0 2a00:105::1
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 end
diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-subnets.cfg b/...ta/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-dualstack-subnets.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,12 +16,6 @@ hostname inband-mgmt-dualstack-subnets
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
-no enable password
-no aaa root
-!
 vlan 104
    name INBAND_MGMT
 !
@@ -63,4 +58,7 @@ ip route 0.0.0.0/0 192.168.104.1
 !
 ipv6 route ::/0 2a00:104::1
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 end
diff --git a/...ollections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ip.cfg b/...ollections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ip.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,12 +16,6 @@ hostname inband-mgmt-ip
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
-no enable password
-no aaa root
-!
 vlan 103
    name MYVLANNAME
 !
@@ -60,4 +55,7 @@ interface Vlan103
    ip address 192.168.103.22/24
 no ip routing vrf MGMT
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 end
diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only-vrf.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only-vrf.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,12 +16,6 @@ hostname inband-mgmt-ipv6-only-vrf
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
-no enable password
-no aaa root
-!
 vlan 107
    name INBAND_MGMT
 !
@@ -61,4 +56,7 @@ no ip routing vrf MGMT
 !
 ipv6 route vrf INBANDMGMT ::/0 2a00:107::1
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 end
diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-ipv6-only.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,12 +16,6 @@ hostname inband-mgmt-ipv6-only
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
-no enable password
-no aaa root
-!
 vlan 106
    name INBAND_MGMT
 !
@@ -60,4 +55,7 @@ no ip routing vrf MGMT
 !
 ipv6 route ::/0 2a00:106::1
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 end
diff --git a/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-a.cfg b/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-a.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,9 +16,6 @@ hostname inband-mgmt-mlag-a
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
 no spanning-tree vlan-id 4094
 !
 vlan 101
@@ -167,4 +165,7 @@ mlag configuration
 !
 ip route 0.0.0.0/0 192.168.101.21
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 end
diff --git a/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-b.cfg b/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-mlag-b.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,9 +16,6 @@ hostname inband-mgmt-mlag-b
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
 no spanning-tree vlan-id 4094
 !
 vlan 101
@@ -167,4 +165,7 @@ mlag configuration
 !
 ip route 0.0.0.0/0 192.168.101.21
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 end
diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg b/...ta/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack1.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,9 +16,6 @@ hostname inband-mgmt-parent-dualstack1
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
 no spanning-tree vlan-id 4093-4094
 !
 vlan 104
@@ -230,6 +228,9 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !

diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg b/...ta/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-dualstack2.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,9 +16,6 @@ hostname inband-mgmt-parent-dualstack2
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
 no spanning-tree vlan-id 4093-4094
 !
 vlan 104
@@ -230,6 +228,9 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-1.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-1.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,9 +16,6 @@ hostname inband-mgmt-parent-ipv6-1
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
 no spanning-tree vlan-id 4093-4094
 !
 vlan 106
@@ -204,6 +202,9 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-2.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-ipv6-2.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,9 +16,6 @@ hostname inband-mgmt-parent-ipv6-2
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
 no spanning-tree vlan-id 4093-4094
 !
 vlan 106
@@ -204,6 +202,9 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-vrf.cfg b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/configs/inband-mgmt-parent-vrf.cfg
@@ -1,6 +1,7 @@
 !
 no enable password
 no aaa root
+!
 daemon TerminAttr
    exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
@@ -15,12 +16,6 @@ hostname inband-mgmt-parent-vrf
 ip name-server vrf MGMT 1.1.1.1
 ip name-server vrf MGMT 8.8.8.8
 !
-ntp server 2.2.2.55 prefer
-ntp server pool.ntp.org
-!
-no enable password
-no aaa root
-!
 vlan 101
    name INBAND_MGMT
 !
@@ -76,7 +71,7 @@ interface Port-Channel101
    port-channel lacp fallback timeout 30
 !
 interface Ethernet1
-   description P2P_LINK_TO_INBAND-MGMT-SPINE1-ZTP_Ethernet2
+   description P2P_inband-mgmt-spine1-ztp_Ethernet2
    no shutdown
    mtu 9214
    no switchport
@@ -169,6 +164,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
    seq 10 permit 10.0.255.0/24 eq 32
    seq 20 permit 10.0.254.0/24 eq 32
 !
+ntp server 2.2.2.55 prefer
+ntp server pool.ntp.org
+!
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 !
@@ -191,7 +189,7 @@ router bgp 65001
    neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
    neighbor 10.0.254.1 peer group EVPN-OVERLAY-PEERS
    neighbor 10.0.254.1 remote-as 64999
-   neighbor 10.0.254.1 description inband-mgmt-spine1-ztp
+   neighbor 10.0.254.1 description inband-mgmt-spine1-ztp_Loopback0
    neighbor 172.16.255.2 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.16.255.2 remote-as 64999
    neighbor 172.16.255.2 description inband-mgmt-spine1-ztp_Ethernet2