Add comments to the files and rename host4_inline_jinja to host_inlin…

…e_jinja
aristanetworks · Dec 2, 2024 · 7bba8b1 · 7bba8b1
1 parent 3a9a7cc
commit 7bba8b1
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 41 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
@@ -1776,7 +1776,7 @@ boot secret 5 <removed>
 
 | CV Compression | CloudVision Servers | VRF | Authentication | Smash Excludes | Ingest Exclude | Bypass AAA |
 | -------------- | ------------------- | --- | -------------- | -------------- | -------------- | ---------- |
-| gzip | 10.10.10.8:9910,10.10.10.9:9910,10.10.10.10:9910 | mgt | key,magickey | ale,flexCounter,hardware,kni,pulse,strata | /Sysdb/cell/1/agent,/Sysdb/cell/2/agent | True |
+| gzip | 10.10.10.8:9910,10.10.10.9:9910,10.10.10.10:9910 | mgt | key,<removed> | ale,flexCounter,hardware,kni,pulse,strata | /Sysdb/cell/1/agent,/Sysdb/cell/2/agent | True |
 
 #### TerminAttr Daemon Device Configuration
 

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
@@ -374,15 +374,15 @@ dhcp relay
 | -------------- | ------------------- | --- | -------------- | -------------- | -------------- | ---------- |
 | gzip | 10.20.20.1:9910 | mgt | 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 | ale,flexCounter,hardware,kni,pulse,strata | /Sysdb/cell/1/agent,/Sysdb/cell/2/agent | False |
 | gzip | 10.30.30.1:9910 | mgt | key,<removed> | ale,flexCounter,hardware,kni,pulse,strata | /Sysdb/cell/1/agent,/Sysdb/cell/2/agent | False |
-| gzip | 10.40.40.1:9910 | mgt | token,/tmp/tokenDC2 | ale,flexCounter,hardware,kni,pulse,strata | /Sysdb/cell/1/agent,/Sysdb/cell/2/agent | False |
-| gzip | apiserver.arista.io:443 | - | key, | ale,flexCounter,hardware,kni,pulse,strata | /Sysdb/cell/1/agent,/Sysdb/cell/2/agent | False |
+| gzip | 10.40.40.1:9910 | mgt | token,/tmp/tokenDC3 | ale,flexCounter,hardware,kni,pulse,strata | /Sysdb/cell/1/agent,/Sysdb/cell/2/agent | False |
+| gzip | apiserver.arista.io:443 | - | key,<removed> | ale,flexCounter,hardware,kni,pulse,strata | /Sysdb/cell/1/agent,/Sysdb/cell/2/agent | False |
 
 #### TerminAttr Daemon Device Configuration
 
 ```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/tokenDC2 -cvopt DC3.vrf=mgt -cvopt DC3.sourceintf=Vlan500 -cvaddr=apiserver.arista.io:443 -cvauth=key,<removed> -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -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 -cvaddr=apiserver.arista.io:443 -cvauth=key,<removed> -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
 ```
 

diff --git a/...cumentation/devices/host4_inline_jinja.md → ...ocumentation/devices/host_inline_jinja.md b/...cumentation/devices/host4_inline_jinja.md → ...ocumentation/devices/host_inline_jinja.md
@@ -1,4 +1,4 @@
-# host4_inline_jinja
+# host_inline_jinja
 
 ## Table of Contents
 

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/tokenDC2 -cvopt DC3.vrf=mgt -cvopt DC3.sourceintf=Vlan500 -cvaddr=apiserver.arista.io:443 -cvauth=key, -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -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 -cvaddr=apiserver.arista.io:443 -cvauth=key, -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
    no shutdown
 !
 dhcp relay

diff --git a/...n/intended/configs/host4_inline_jinja.cfg → ...en/intended/configs/host_inline_jinja.cfg b/...n/intended/configs/host4_inline_jinja.cfg → ...en/intended/configs/host_inline_jinja.cfg
diff --git a/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/daemon-terminattr.yml b/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/daemon-terminattr.yml
@@ -5,16 +5,16 @@ daemon_terminattr:
     - 10.10.10.9:9910
     - 10.10.10.10:9910
   cvauth:
-    method: "key"
+    method: key
     key: magickey
   cvvrf: mgt
-  smashexcludes: "ale,flexCounter,hardware,kni,pulse,strata"
-  ingestexclude: "/Sysdb/cell/1/agent,/Sysdb/cell/2/agent"
+  smashexcludes: ale,flexCounter,hardware,kni,pulse,strata
+  ingestexclude: /Sysdb/cell/1/agent,/Sysdb/cell/2/agent
   cvgnmi: true
-  taillogs: "/var/log/messages,/var/log/agents/"
-  cvproxy: "http://arista:[email protected]:3128"
+  taillogs: /var/log/messages,/var/log/agents/
+  cvproxy: http://arista:[email protected]:3128
   disable_aaa: true
-  grpcaddr: "mgmt/0.0.0.0:6042"
+  grpcaddr: mgmt/0.0.0.0:6042
   grpcreadonly: true
   cvconfig: true
   cvsourceintf: Vlan100
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
@@ -1,36 +1,37 @@
 ---
+# Test multi-cluster certs
 daemon_terminattr:
   cvaddrs:
     - apiserver.arista.io:443
   cvauth:
-    method: "key"
+    method: key
     key: ""
   clusters:
     - name: DC1
       cvaddrs:
         - 10.20.20.1:9910
       cvauth:
-        method: "certs"
-        cert_file: "/persist/secure/ssl/terminattr/DC1/certs/client.crt"
-        key_file: "/persist/secure/ssl/terminattr/DC1/keys/client.key"
-        ca_file: "/persist/secure/ssl/terminattr/DC1/certs/ca.crt"
+        method: certs
+        cert_file: /persist/secure/ssl/terminattr/DC1/certs/client.crt
+        key_file: /persist/secure/ssl/terminattr/DC1/keys/client.key
+        ca_file: /persist/secure/ssl/terminattr/DC1/certs/ca.crt
       cvvrf: mgt
       cvsourceintf: Loopback10
     - name: DC2
       cvaddrs:
         - 10.30.30.1:9910
       cvauth:
-        method: "key"
-        key: "arista"
+        method: key
+        key: arista
       cvvrf: mgt
       cvsourceintf: Vlan500
     - name: DC3
       cvaddrs:
         - 10.40.40.1:9910
       cvauth:
-        method: "token"
-        token_file: "/tmp/tokenDC2"
+        method: token
+        token_file: /tmp/tokenDC3
       cvvrf: mgt
       cvsourceintf: Vlan500
-  smashexcludes: "ale,flexCounter,hardware,kni,pulse,strata"
-  ingestexclude: "/Sysdb/cell/1/agent,/Sysdb/cell/2/agent"
+  smashexcludes: ale,flexCounter,hardware,kni,pulse,strata
+  ingestexclude: /Sysdb/cell/1/agent,/Sysdb/cell/2/agent
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
@@ -1,11 +1,12 @@
 ---
+# Test CVaaS auth(Cloud)
 daemon_terminattr:
   cvaddrs:
     - apiserver.arista.io:443
   cvauth:
-    method: "token-secure"
-    key: "arastra"
-    token_file: "/tmp/cv-onboarding-token"
+    method: token-secure
+    key: arastra
+    token_file: /tmp/cv-onboarding-token
   cvvrf: mgt
-  smashexcludes: "ale,flexCounter,hardware,kni,pulse,strata"
-  ingestexclude: "/Sysdb/cell/1/agent,/Sysdb/cell/2/agent"
+  smashexcludes: ale,flexCounter,hardware,kni,pulse,strata
+  ingestexclude: /Sysdb/cell/1/agent,/Sysdb/cell/2/agent
diff --git a/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host4/daemon-terminattr.yml b/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host4/daemon-terminattr.yml
@@ -1,15 +1,16 @@
 ---
+# Test on-prem certs
 daemon_terminattr:
   cvaddrs:
     - 10.10.10.8:9910
     - 10.10.10.9:9910
     - 10.10.10.10:9910
   cvauth:
-    method: "certs"
-    cert_file: "/persist/secure/ssl/terminattr/primary/certs/client.crt"
-    key_file: "/persist/secure/ssl/terminattr/primary/keys/client.key"
-    ca_file: "/persist/secure/ssl/terminattr/primary/certs/ca.crt"
+    method: certs
+    cert_file: /persist/secure/ssl/terminattr/primary/certs/client.crt
+    key_file: /persist/secure/ssl/terminattr/primary/keys/client.key
+    ca_file: /persist/secure/ssl/terminattr/primary/certs/ca.crt
   cvvrf: mgt
-  smashexcludes: "ale,flexCounter,hardware,kni,pulse,strata"
-  ingestexclude: "/Sysdb/cell/1/agent,/Sysdb/cell/2/agent"
+  smashexcludes: ale,flexCounter,hardware,kni,pulse,strata
+  ingestexclude: /Sysdb/cell/1/agent,/Sysdb/cell/2/agent
   disable_aaa: true
diff --git a/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host5/daemon-terminattr.yml b/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host5/daemon-terminattr.yml
@@ -1,12 +1,13 @@
 ---
+# Test on-prem token
 daemon_terminattr:
   cvaddrs:
     - 192.0.2.1:9910
     - 192.0.2.2:9910
     - 192.0.2.3:9910
   cvauth:
-    method: "token"
-    token_file: "/tmp/token"
+    method: token
+    token_file: /tmp/token
   cvvrf: mgt
-  smashexcludes: "ale,flexCounter,hardware,kni,pulse,strata"
-  ingestexclude: "/Sysdb/cell/1/agent,/Sysdb/cell/2/agent"
+  smashexcludes: ale,flexCounter,hardware,kni,pulse,strata
+  ingestexclude: /Sysdb/cell/1/agent,/Sysdb/cell/2/agent
diff --git a/...s/host4_inline_jinja/custom-templates.yml → ...rs/host_inline_jinja/custom-templates.yml b/...s/host4_inline_jinja/custom-templates.yml → ...rs/host_inline_jinja/custom-templates.yml
diff --git a/...ars/host4_inline_jinja/tacacs-servers.yml → ...vars/host_inline_jinja/tacacs-servers.yml b/...ars/host4_inline_jinja/tacacs-servers.yml → ...vars/host_inline_jinja/tacacs-servers.yml
diff --git a/..._vars/host4_inline_jinja/tcam-profile.yml → ...t_vars/host_inline_jinja/tcam-profile.yml b/..._vars/host4_inline_jinja/tcam-profile.yml → ...t_vars/host_inline_jinja/tcam-profile.yml
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.yml
@@ -3,13 +3,13 @@ test_hosts:
   children:
     IGNORE_IN_PYTEST:
       hosts:
-        host4_inline_jinja:
+        host_inline_jinja:
   hosts:
+    host_inline_jinja:
     host1:
     host2:
     host3:
     host4:
-    host4_inline_jinja:
     host5:
     host6:
     mpls:

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/daemon-terminattr.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/daemon-terminattr.j2
@@ -36,7 +36,7 @@
 {%     if daemon_terminattr.cvaddrs is arista.avd.defined %}
 {%         set url = daemon_terminattr.cvaddrs | arista.avd.default([]) | join(',') %}
 {%         if daemon_terminattr.cvauth.method is arista.avd.defined('key') %}
-{%             set auth = 'key,' ~ daemon_terminattr.cvauth.key | arista.avd.default('') %}
+{%             set auth = 'key,' ~ daemon_terminattr.cvauth.key | arista.avd.default('') | arista.avd.hide_passwords(hide_passwords) %}
 {%         elif daemon_terminattr.cvauth.method is arista.avd.defined('token') and daemon_terminattr.cvauth.token_file is arista.avd.defined %}
 {%             set auth = 'token,' ~ daemon_terminattr.cvauth.token_file %}
 {%         elif daemon_terminattr.cvauth.method is arista.avd.defined('token-secure') and daemon_terminattr.cvauth.token_file is arista.avd.defined %}