Address comments for tap-aggregation tests, ptp, sflow, daemon-termin…

…attr, cvx
aristanetworks · Jan 13, 2025 · 1d68108 · 1d68108
1 parent f35457a
commit 1d68108
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 103 deletions.
diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md b/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
@@ -2249,6 +2249,8 @@ tap aggregation
 | CCC | Management1 | - | - |
 | DDD | - | 10.6.75.62 | 6343 |
 | DDD | 1.1.1.1 | - | - |
+| EEE | - | 10.6.75.62 | 6343 |
+| EEE | 1.1.1.1 | - | - |
 | MGMT | - | 10.6.75.59 | 6343 |
 | MGMT | - | 10.6.75.62 | 123 |
 | MGMT | - | 10.6.75.63 | 333 |
@@ -2321,6 +2323,8 @@ sflow vrf CCC destination 10.6.75.62
 sflow vrf CCC source-interface Management1
 sflow vrf DDD destination 10.6.75.62
 sflow vrf DDD source 1.1.1.1
+sflow vrf EEE destination 10.6.75.62
+sflow vrf EEE source 1.1.1.1
 sflow vrf MGMT destination 10.6.75.59
 sflow vrf MGMT destination 10.6.75.62 123
 sflow vrf MGMT destination 10.6.75.63 333

diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host2.md b/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host2.md
@@ -462,7 +462,7 @@ dhcp relay
 ```eos
 !
 daemon TerminAttr
-   exec /usr/bin/TerminAttr -cvopt DC1.addr=10.20.20.1:9910 -cvopt DC1.auth=certs,/persist/secure/ssl/terminattr/DC1/certs/client.crt,/persist/secure/ssl/terminattr/DC1/keys/client.key,/persist/secure/ssl/terminattr/DC1/certs/ca.crt -cvopt DC1.vrf=mgt -cvopt DC1.sourceintf=Loopback10 -cvopt DC2.addr=10.30.30.1:9910 -cvopt DC2.auth=key,<removed> -cvopt DC2.vrf=mgt -cvopt DC2.sourceintf=Vlan500 -cvopt DC3.addr=10.40.40.1:9910 -cvopt DC3.auth=token,/tmp/tokenDC3 -cvopt DC3.vrf=mgt -cvopt DC3.sourceintf=Vlan500 -cvopt DC4.addr=10.40.40.1:9910 -cvopt DC4.auth=token-secure,/tmp/tokenDC4 -cvopt DC4.vrf=mgt -cvopt DC4.sourceip=10.10.10.10 -cvopt DC4.proxy=http://arista:[email protected]:3128 -cvopt DC4.obscurekeyfile=True -cvopt DC4.sourceintf=Vlan500 -cvopt DC5.addr=10.20.20.2:9910 -cvopt DC5.auth=certs,/persist/secure/ssl/terminattr/DC1/certs/client.crt,/persist/secure/ssl/terminattr/DC1/keys/client.key -cvopt DC5.vrf=mgt -cvopt DC5.sourceintf=Loopback11 -cvopt DC6.addr=10.20.20.3:9910 -cvaddr=apiserver.arista.io:443 -cvauth=key,<removed> -taillogs
+   exec /usr/bin/TerminAttr -cvopt DC1.addr=10.20.20.1:9910 -cvopt DC1.auth=certs,/persist/secure/ssl/terminattr/DC1/certs/client.crt,/persist/secure/ssl/terminattr/DC1/keys/client.key,/persist/secure/ssl/terminattr/DC1/certs/ca.crt -cvopt DC1.vrf=mgt -cvopt DC1.sourceintf=Loopback10 -cvopt DC2.addr=10.30.30.1:9910 -cvopt DC2.auth=key,<removed> -cvopt DC2.vrf=mgt -cvopt DC2.sourceintf=Vlan500 -cvopt DC3.addr=10.40.40.1:9910 -cvopt DC3.auth=token,/tmp/tokenDC3 -cvopt DC3.vrf=mgt -cvopt DC3.sourceintf=Vlan500 -cvopt DC4.addr=10.40.40.1:9910 -cvopt DC4.auth=token-secure,/tmp/tokenDC4 -cvopt DC4.vrf=mgt -cvopt DC4.sourceip=10.10.10.10 -cvopt DC4.proxy=http://arista:[email protected]:3128 -cvopt DC4.obscurekeyfile=True -cvopt DC4.sourceintf=Vlan500 -cvopt DC5.addr=10.20.20.2:9910 -cvopt DC5.auth=certs,/persist/secure/ssl/terminattr/DC1/certs/client.crt,/persist/secure/ssl/terminattr/DC1/keys/client.key -cvopt DC5.vrf=mgt -cvopt DC5.sourceintf=Loopback11 -cvopt DC6.addr=10.20.20.3:9910 -cvaddr=apiserver.arista.io:443 -cvauth=key,<removed> -taillogs -ipfix=false -sflow=false
    no shutdown
 ```
 
@@ -564,26 +564,15 @@ tap aggregation
 
 #### SFlow Summary
 
-| VRF | SFlow Source | SFlow Destination | Port |
-| --- | ------------ | ----------------- | ---- |
-| DDD | - | 10.6.75.62 | 6343 |
-| DDD | 1.1.1.1 | - | - |
-| default | 1.1.1.1 | - | - |
-
 sFlow is disabled.
 
-sFlow is disabled on all interfaces by default.
-
 Egress sFlow is enabled on all interfaces by default.
 
 #### SFlow Device Configuration
 
 ```eos
 !
-sflow vrf DDD destination 10.6.75.62
-sflow vrf DDD source 1.1.1.1
 sflow source 1.1.1.1
-sflow interface disable default
 sflow interface egress enable default
 ```
 

diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host3.md b/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host3.md
@@ -4,16 +4,13 @@
 
 - [Management](#management)
   - [Management Interfaces](#management-interfaces)
-  - [PTP](#ptp)
   - [Management SSH](#management-ssh)
 - [CVX](#cvx)
-  - [CVX Services](#cvx-services)
   - [CVX Device Configuration](#cvx-device-configuration)
 - [Monitoring](#monitoring)
   - [TerminAttr Daemon](#terminattr-daemon)
   - [Logging](#logging)
   - [MCS Client Summary](#mcs-client-summary)
-  - [Tap Aggregation](#tap-aggregation)
 - [Spanning Tree](#spanning-tree)
   - [Spanning Tree Summary](#spanning-tree-summary)
   - [Spanning Tree Device Configuration](#spanning-tree-device-configuration)
@@ -56,21 +53,6 @@ interface Management1
    ip address 10.73.255.122/24
 ```
 
-### PTP
-
-#### PTP Summary
-
-| Clock ID | Source IP | Priority 1 | Priority 2 | TTL | Domain | Mode | Forward Unicast |
-| -------- | --------- | ---------- | ---------- | --- | ------ | ---- | --------------- |
-| - | - | - | - | - | - | - | - |
-
-#### PTP Device Configuration
-
-```eos
-!
-no ptp monitor
-```
-
 ### Management SSH
 
 #### SSH Timeout and Management
@@ -108,21 +90,11 @@ management ssh
 
 ## CVX
 
-CVX is enabled
-
-### CVX Services
-
-| Service | Enabled | Settings |
-| ------- | ------- | -------- |
-| MCS | - | Redis Password Set |
-| VXLAN | - | VTEP MAC learning: control-plane |
-
 ### CVX Device Configuration
 
 ```eos
 !
 cvx
-   no shutdown
    !
    service mcs
       redis password 7 <removed>
@@ -146,7 +118,7 @@ cvx
 ```eos
 !
 daemon TerminAttr
-   exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=mgt -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs -ipfix=false -sflow=false
+   exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=mgt -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
 ```
 
@@ -156,7 +128,6 @@ daemon TerminAttr
 
 | Type | Level |
 | -----| ----- |
-| Console | disabled |
 
 | Format Type | Setting |
 | ----------- | ------- |
@@ -169,7 +140,6 @@ daemon TerminAttr
 
 ```eos
 !
-no logging console
 logging format timestamp traditional year timezone
 ```
 
@@ -191,26 +161,6 @@ mcs client
    cvx secondary default
 ```
 
-### Tap Aggregation
-
-#### Tap Aggregation Summary
-
-| Settings | Values |
-| -------- | ------ |
-| Mode Exclusive | True |
-| Mac Timestamp | Replace Source-Mac |
-| Mac FCS Error | pass-through |
-
-#### Tap Aggregation Device Configuration
-
-```eos
-!
-tap aggregation
-   mode exclusive
-   mac timestamp replace source-mac
-   mac fcs-error pass-through
-```
-
 ## Spanning Tree
 
 ### Spanning Tree Summary

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
@@ -954,6 +954,8 @@ sflow vrf CCC destination 10.6.75.62
 sflow vrf CCC source-interface Management1
 sflow vrf DDD destination 10.6.75.62
 sflow vrf DDD source 1.1.1.1
+sflow vrf EEE destination 10.6.75.62
+sflow vrf EEE source 1.1.1.1
 sflow vrf MGMT destination 10.6.75.59
 sflow vrf MGMT destination 10.6.75.62 123
 sflow vrf MGMT destination 10.6.75.63 333

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host2.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host2.cfg
@@ -5,7 +5,7 @@ enable password 5 $6$nXycSRhVPaxRINPL$tM1MNjjRCbFD5di4XWsj8CPkm8Pdwmf9fVqRV015y3
 prompt Test
 !
 daemon TerminAttr
-   exec /usr/bin/TerminAttr -cvopt DC1.addr=10.20.20.1:9910 -cvopt DC1.auth=certs,/persist/secure/ssl/terminattr/DC1/certs/client.crt,/persist/secure/ssl/terminattr/DC1/keys/client.key,/persist/secure/ssl/terminattr/DC1/certs/ca.crt -cvopt DC1.vrf=mgt -cvopt DC1.sourceintf=Loopback10 -cvopt DC2.addr=10.30.30.1:9910 -cvopt DC2.auth=key,arista -cvopt DC2.vrf=mgt -cvopt DC2.sourceintf=Vlan500 -cvopt DC3.addr=10.40.40.1:9910 -cvopt DC3.auth=token,/tmp/tokenDC3 -cvopt DC3.vrf=mgt -cvopt DC3.sourceintf=Vlan500 -cvopt DC4.addr=10.40.40.1:9910 -cvopt DC4.auth=token-secure,/tmp/tokenDC4 -cvopt DC4.vrf=mgt -cvopt DC4.sourceip=10.10.10.10 -cvopt DC4.proxy=http://arista:[email protected]:3128 -cvopt DC4.obscurekeyfile=True -cvopt DC4.sourceintf=Vlan500 -cvopt DC5.addr=10.20.20.2:9910 -cvopt DC5.auth=certs,/persist/secure/ssl/terminattr/DC1/certs/client.crt,/persist/secure/ssl/terminattr/DC1/keys/client.key -cvopt DC5.vrf=mgt -cvopt DC5.sourceintf=Loopback11 -cvopt DC6.addr=10.20.20.3:9910 -cvaddr=apiserver.arista.io:443 -cvauth=key, -taillogs
+   exec /usr/bin/TerminAttr -cvopt DC1.addr=10.20.20.1:9910 -cvopt DC1.auth=certs,/persist/secure/ssl/terminattr/DC1/certs/client.crt,/persist/secure/ssl/terminattr/DC1/keys/client.key,/persist/secure/ssl/terminattr/DC1/certs/ca.crt -cvopt DC1.vrf=mgt -cvopt DC1.sourceintf=Loopback10 -cvopt DC2.addr=10.30.30.1:9910 -cvopt DC2.auth=key,arista -cvopt DC2.vrf=mgt -cvopt DC2.sourceintf=Vlan500 -cvopt DC3.addr=10.40.40.1:9910 -cvopt DC3.auth=token,/tmp/tokenDC3 -cvopt DC3.vrf=mgt -cvopt DC3.sourceintf=Vlan500 -cvopt DC4.addr=10.40.40.1:9910 -cvopt DC4.auth=token-secure,/tmp/tokenDC4 -cvopt DC4.vrf=mgt -cvopt DC4.sourceip=10.10.10.10 -cvopt DC4.proxy=http://arista:[email protected]:3128 -cvopt DC4.obscurekeyfile=True -cvopt DC4.sourceintf=Vlan500 -cvopt DC5.addr=10.20.20.2:9910 -cvopt DC5.auth=certs,/persist/secure/ssl/terminattr/DC1/certs/client.crt,/persist/secure/ssl/terminattr/DC1/keys/client.key -cvopt DC5.vrf=mgt -cvopt DC5.sourceintf=Loopback11 -cvopt DC6.addr=10.20.20.3:9910 -cvaddr=apiserver.arista.io:443 -cvauth=key, -taillogs -ipfix=false -sflow=false
    no shutdown
 !
 dhcp relay
@@ -79,10 +79,7 @@ router adaptive-virtual-topology
 router l2-vpn
    arp proxy prefix-list pl-router-l2-vpn
 !
-sflow vrf DDD destination 10.6.75.62
-sflow vrf DDD source 1.1.1.1
 sflow source 1.1.1.1
-sflow interface disable default
 sflow interface egress enable default
 !
 no snmp-server enable traps

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host3.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host3.cfg
@@ -1,18 +1,15 @@
 !
 daemon TerminAttr
-   exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=mgt -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs -ipfix=false -sflow=false
+   exec /usr/bin/TerminAttr -cvaddr=apiserver.arista.io:443 -cvauth=token-secure,/tmp/cv-onboarding-token -cvvrf=mgt -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
 !
-no logging console
 logging format timestamp traditional year timezone
 !
 mcs client
    shutdown
    !
    cvx secondary default
 !
-no ptp monitor
-!
 spanning-tree mode mstp
 spanning-tree mst pvst border
 spanning-tree mst 0 priority 4096
@@ -25,13 +22,7 @@ spanning-tree mst configuration
    instance 3 vlan 15
    instance 4 vlan 200-300
 !
-tap aggregation
-   mode exclusive
-   mac timestamp replace source-mac
-   mac fcs-error pass-through
-!
 cvx
-   no shutdown
    !
    service mcs
       redis password 7 01150F165E1C07032D

diff --git a/...le_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/sflow.yml b/...le_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/sflow.yml
@@ -30,6 +30,10 @@ sflow:
       destinations:
         - destination: 10.6.75.62
       source: 1.1.1.1
+    - name: EEE
+      destinations:
+        - destination: 10.6.75.62
+      source: 1.1.1.1
   destinations:
     - destination: 10.6.75.62
       port: 123

diff --git a/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host2/daemon-terminattr.yml b/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host2/daemon-terminattr.yml
@@ -6,6 +6,8 @@ daemon_terminattr:
   cvauth:
     method: key
     key: ""
+  ipfix: false
+  sflow: false
   clusters:
     - name: DC1
       cvaddrs:

diff --git a/...rs/host2/management-ssh-custom-cipher.yml → ...entory/host_vars/host2/management-ssh.yml b/...rs/host2/management-ssh-custom-cipher.yml → ...entory/host_vars/host2/management-ssh.yml
diff --git a/...le_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host2/sflow.yml b/...le_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host2/sflow.yml
@@ -1,14 +1,7 @@
 ---
 sflow:
-  vrfs:
-    - name: DDD
-      destinations:
-        - destination: 10.6.75.62
-      source: 1.1.1.1
   run: false
   interface:
-    disable:
-      default: true
     egress:
       enable_default: true
       unmodified: false

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/cvx.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/cvx.yml
@@ -1,7 +1,6 @@
 ---
 ### CVX ###
 cvx:
-  shutdown: false
   services:
     mcs:
       redis:

diff --git a/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/daemon-terminattr.yml b/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/daemon-terminattr.yml
@@ -10,5 +10,3 @@ daemon_terminattr:
   cvvrf: mgt
   smashexcludes: ale,flexCounter,hardware,kni,pulse,strata
   ingestexclude: /Sysdb/cell/1/agent,/Sysdb/cell/2/agent
-  ipfix: false
-  sflow: false
diff --git a/..._collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/logging.yml b/..._collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/logging.yml
@@ -1,5 +1,4 @@
 ---
 logging:
-  console: disabled
   format:
     timestamp: traditional year timezone
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/ptp.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/ptp.yml
diff --git a/...ions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/tap-aggregation.yml b/...ions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host3/tap-aggregation.yml
diff --git a/python-avd/tests/pyavd/schema/data_merging_schema_class.py b/python-avd/tests/pyavd/schema/data_merging_schema_class.py
@@ -3,9 +3,9 @@
 # that can be found in the LICENSE file.
 
 from __future__ import annotations
-from pyavd._schema.models.eos_cli_config_gen_root_model import EosCliConfigGenRootModel
 from typing import ClassVar
 from typing import Any
+from pyavd._schema.models.eos_cli_config_gen_root_model import EosCliConfigGenRootModel
 from typing import TYPE_CHECKING
 
 from pyavd._schema.models.avd_indexed_list import AvdIndexedList