Sasa l7 part2 v3 files added

nested-labvm/atd-docker/coder/Dockerfile

@@ -5,7 +5,7 @@ RUN sudo apt update && \
 
 RUN sudo pip3 install --upgrade pip
 
-RUN sudo pip3 install pyeapi jsonrpclib-pelix shyaml
+RUN sudo pip3 install pyeapi jsonrpclib-pelix shyaml ansible-pylibssh
 
 RUN wget --quiet https://raw.githubusercontent.com/aristanetworks/ansible-avd/devel/ansible_collections/arista/avd/requirements.txt
 
@@ -16,7 +16,7 @@ RUN wget --quiet https://raw.githubusercontent.com/aristanetworks/ansible-avd/de
 RUN sudo pip3 install -r requirements-dev.txt
 
 # Install arista.avd, community.general and ansible.posix ansible-galaxy collections with upgrade flag if already exists
-RUN ansible-galaxy collection install arista.avd --upgrade
+RUN ansible-galaxy collection install arista.avd --force
 
 RUN ansible-galaxy collection install community.general --upgrade
 

nested-labvm/atd-docker/cvpUpdater/Dockerfile

@@ -9,8 +9,9 @@ RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.5/fixuid-0.
     printf "user: arista\ngroup: arista\npaths:\n   - /home/arista\n   - /home/arista/CVP_DATA\n" > /etc/fixuid/config.yml
 
 RUN pip install rcvpapi \
-    ruamel.yaml
-
+    ruamel.yaml \
+    cvprac paramiko scp
+
 RUN mkdir -p /home/arista/CVP_DATA
 
 WORKDIR /home/arista

nested-labvm/atd-docker/cvpUpdater/src/cvpUpdater.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python
 
-
+from cvprac.cvp_client import CvpClient
 from ruamel.yaml import YAML
 from rcvpapi.rcvpapi import *
-import requests, json
+from paramiko import SSHClient
+from paramiko import AutoAddPolicy
+from scp import SCPClient
 from os import path, listdir, system
 from sys import exit
 from time import sleep
@@ -20,6 +22,7 @@
 # Temporary file_path location for CVP Custom info
 cvp_file = '/home/arista/cvp/cvp_info.yaml'
 
+
 # ==================================
 # Start of Global Functions
 # ==================================
@@ -198,6 +201,9 @@ def main():
     cvpPassword = atd_yaml['login_info']['jump_host']['pw']
     while not cvp_clnt:
         try:
+            cvprac_clnt = CvpClient()
+            cvprac_clnt.api.request_timeout = 180
+            cvprac_clnt.connect([atd_yaml['nodes']['cvp'][0]['ip']], cvpUsername, cvpPassword)
             cvp_clnt = CVPCON(atd_yaml['nodes']['cvp'][0]['ip'], cvpUsername, cvpPassword)
             pS("OK","Connected to CVP at {0}".format(atd_yaml['nodes']['cvp'][0]['ip']))
         except:
@@ -220,6 +226,30 @@ def main():
             pS("INFO", "CVP will be bare and no configuration.")
             return(True)
     if cvp_clnt:
+        # ==========================================
+        # Check the current version to see if a 
+        # token needs to be generated
+        # ==========================================
+        _version = cvprac_clnt.api.get_cvp_info()
+        _version = _version['version'].split('.')
+        _version_major = float(f"{_version[0]}.{_version[1]}")
+        # Perform check if it is a cEOS based topo and 2022.2 or later CVP
+        if _version_major >= 2022.2 and (atd_yaml['eos_type'] == 'ceos' or atd_yaml['eos_type'] == 'container-labs'):
+            pS("INFO", "Generating a token for onboarding...")
+            _token_response = cvprac_clnt.api.create_enroll_token("24h")
+            _token_path = path.expanduser(f"~/token")
+            with open(f"{_token_path}", 'w') as token_out:
+                    token_out.write(_token_response['data'])
+            for _node in eos_info:
+                with SSHClient() as ssh:
+                    ssh.set_missing_host_key_policy(AutoAddPolicy())
+                    ssh.connect(_node.ip, username=cvpUsername, password=cvpPassword,)
+                    with SCPClient(ssh.get_transport()) as scp:
+                        pS("INFO", f"Transferring token to {_node.hostname}")
+                        scp.put(f"{_token_path}", "/tmp/token")
+        else:
+            pS("INFO", f"Version does not require a token for onboarding...")
+
         # ==========================================
         # Check to see how many nodes have connected
         # ==========================================
@@ -391,4 +421,4 @@ def main():
     else:
         pS("OK","CVP is already configured")
     while True:
-          sleep(600)
+          sleep(600)

nested-labvm/atd-docker/docker-compose.yml

@@ -24,7 +24,7 @@ services:
       - /home/arista/arista-dir:/home/arista:rw
   login:
     container_name: atd-login
-    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_login:1.0.5
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_login:1.0.16
     user: $ArID:$ArGD
     restart: always
     hostname: devbox
@@ -41,7 +41,7 @@ services:
       - /var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock:ro
   cvpupdater:
     container_name: atd-cvpupdater
-    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_cvpupdater:1.0.0
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_cvpupdater:2.0.2
     user: $ArID:$ArGD
     restart: always
     environment:
@@ -53,7 +53,7 @@ services:
       - cvp_dir:/home/arista/CVP_DATA:rw
   gitconfigletsync:
     container_name: atd-gitconfigletsync
-    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_gitconfigletsync:1.0.0
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_gitconfigletsync:2.0.0
     user: $ArID:$ArGD
     restart: always
     environment:
@@ -85,25 +85,69 @@ services:
       - /opt/ceos:/opt/ceos:rw
   uilanding:
     container_name: atd-uilanding
-    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_uilanding:1.0.0
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_uilanding:1.0.16
     restart: always
     environment:
       - PYTHONUNBUFFERED=1
     volumes:
       - /etc/atd:/etc/atd:ro
       - /opt/atd:/opt/atd:ro
       - /home/arista/arista-dir/apps/uilanding:/opt/modules:ro
+      - /home/arista/arista-dir/menus:/opt/menus:rw
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:
       - atd_nginx
   labguides:
     container_name: atd-labguides
-    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_labguides:1.0.0
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_labguides:1.0.1
     restart: always
     environment:
       - PYTHONUNBUFFERED=1
     volumes:
       - /etc/atd:/etc/atd:ro
       - /opt/atd:/opt/atd:ro
+      - /opt/labguides/web/:/root/labguides/web/:rw
+    networks:
+      - atd_nginx
+
+  labguides-v2:
+    container_name: atd-labguides-v2
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_labguides-v2:1.0.2
+    restart: on-failure
+    environment:
+      - PYTHONUNBUFFERED=1
+    volumes:
+      - /etc/atd:/etc/atd:ro
+      - /opt/atd:/opt/atd:ro
+      - /opt/labguides/web/:/html/:rw
+      - /etc/atd/ACCESS_INFO.yaml:/ACCESS_INFO.yaml:ro
+    networks:
+      - atd_nginx
+
+  syslog:
+    container_name: atd-syslog
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_syslog:1.0.1
+    restart: always
+    environment:
+      - PYTHONUNBUFFERED=1
+    volumes:
+      - /home/arista/arista-dir/apps/syslog/:/var/log/remote/:rw
+    ports:
+      - "1514:1514"
+      - "1514:1514/udp"
+    networks:
+      - atd_nginx
+  tacacs:
+    container_name: atd-tacacs
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_tacacs:1.0.0
+    restart: always
+    environment:
+      - PYTHONUNBUFFERED=1
+    volumes:
+      - /home/arista/arista-dir/apps/tacacs/config:/etc/tac_plus/tac_user.cfg:ro
+      - /home/arista/arista-dir/apps/tacacs/tac.log:/var/log/tac_plus.log:rw
+    ports:
+      - "49:49"
     networks:
       - atd_nginx
   freerad:
@@ -117,7 +161,7 @@ services:
       - "1813:1813/udp"
   nginx:
     container_name: atd-nginx
-    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_nginx:1.0.2
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_nginx:1.0.5
     restart: always
     depends_on:
       - uilanding
@@ -158,7 +202,7 @@ services:
       - ./jenkins/src/groovy/users.groovy.override:/usr/share/jenkins/ref/init.groovy.d/users.groovy.override:rw
   coder:
     container_name: atd-coder
-    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_coder:1.0.1
+    image: us.gcr.io/atd-testdrivetraining-dev/atddocker_coder:1.0.2
     restart: always
     user: $ArID:$ArGD
     command: /home/coder/project

nested-labvm/atd-docker/docker_run.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "Starting one-time containers"
+
+docker run -d --rm -e PYTHONUNBUFFERED=1 --name atd-vtepinfo -v /etc/atd:/etc/atd:rw us.gcr.io/atd-testdrivetraining-dev/atddocker_vtepinfo:0.1.9

nested-labvm/atd-docker/gitConfigletSync/Dockerfile

@@ -11,8 +11,9 @@ RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.5/fixuid-0.
 RUN pip install rcvpapi \
     cvprac \
     Pyyaml \
-    ruamel.yaml
-
+    ruamel.yaml \
+    paramiko \
+    scp
 RUN mkdir -p /home/arista/CVP_DATA
 
 WORKDIR /home/arista