updated gitconfiglet (#697) (#699)

added regen of certs and added cvp volume  mount

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

@@ -71,6 +71,7 @@ services:
       - PYTHONUNBUFFERED=1
     volumes:
       - /etc/atd:/etc/atd:ro
+      - /home/arista/arista-dir/cvp:/home/arista/cvp:ro
       - /opt/atd:/opt/atd:ro
       - cvp_dir:/home/arista/CVP_DATA:rw
   kvmbuilder:

nested-labvm/atd-docker/gitConfigletSync/Dockerfile

@@ -11,7 +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
 

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

@@ -6,11 +6,18 @@
 import yaml
 from ruamel.yaml import YAML
 from rcvpapi.rcvpapi import *
+from cvprac.cvp_client import CvpClient
+from paramiko import SSHClient
+from paramiko import AutoAddPolicy
+from scp import SCPClient
+from os import path
 from datetime import datetime
 import urllib3
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
 ACCESS = '/etc/atd/ACCESS_INFO.yaml'
+REPO_PATH = '/opt/atd/'
+REPO_TOPO = REPO_PATH + 'topologies/'
 CVP_CONFIG_FIILE = os.path.expanduser('~/CVP_DATA/.cvpState.txt')
 sleep_delay = 30
 
@@ -36,6 +43,45 @@ def syncConfiglet(cvpClient,configletName,configletConfig):
 
 ##### End of syncConfiglet
 
+def getTopoInfo(yaml_file):
+    """
+    Function that parses the supplied YAML file to build the CVP topology.
+    """
+    topoInfo = open(yaml_file,'r')
+    topoYaml = YAML().load(topoInfo)
+    topoInfo.close()
+    return(topoYaml)
+
+def checkConnected(cvp_clnt, NODES):
+    """
+    Function to check if all nodes have connected and
+    are reachable via ping
+    Parameters:
+    cvp_clnt = CVP rCVPAPI client (object)
+    NODES = EOS Node yaml (dict)
+    """
+    tmp_device_count = len(cvp_clnt.inventory)
+    while len(NODES) > tmp_device_count:
+        pS("INFO", "Only {0} out of {1} nodes have registered to CVP. Sleeping {2} seconds.".format(tmp_device_count, len(NODES), sleep_delay))
+        sleep(sleep_delay)
+        cvp_clnt.getDeviceInventory()
+        tmp_device_count = len(cvp_clnt.inventory)
+    pS("OK", "All {0} out of {1} nodes have registered to CVP.".format(tmp_device_count, len(NODES)))
+    pS("INFO", "Checking to see if all nodes are reachable")
+    # Make sure all nodes are up and reachable
+    for vnode in cvp_clnt.inventory:
+        while True:
+            vresponse = cvp_clnt.ipConnectivityTest(cvp_clnt.inventory[vnode]['ipAddress'])
+            if 'data' in vresponse:
+                if vresponse['data'] == 'success':
+                    pS("OK", "{0} is up and reachable at {1}".format(vnode, cvp_clnt.inventory[vnode]['ipAddress']))
+                    break
+            else:
+                pS("INFO", "{0} is NOT reachable at {1}. Sleeping {2} seconds.".format(vnode, cvp_clnt.inventory[vnode]['ipAddress'], sleep_delay))
+                sleep(sleep_delay)
+    pS("OK", "All Devices are registered and reachable.")
+    return(True)
+
 def pS(mstat,mtype):
     """
     Function to send output from service file to Syslog
@@ -88,6 +134,7 @@ def main():
 
    # rcvpapi clnt var container
    cvp_clnt = ""
+   cvprc_clnt = ""
 
    # Adding new connection to CVP via rcvpapi
    while not cvp_clnt:
@@ -106,6 +153,49 @@ def main():
       else:
          pS("INFO", "Local copy is missing....Waiting 1 minute for it to become available")
          time.sleep(60)
+   while not cvprc_clnt:
+      try:
+         cvprac_clnt = CvpClient()
+         cvprac_clnt.api.request_timeout = 180
+         cvprac_clnt.connect([accessinfo['nodes']['cvp'][0]['ip']], cvpUsername, cvpPassword)
+         cvprc_clnt = CVPCON(accessinfo['nodes']['cvp'][0]['ip'], cvpUsername, cvpPassword)
+         pS("OK","Connected to CVP at {0}".format(accessinfo['nodes']['cvp'][0]['ip']))
+      except:
+         pS("ERROR","CVP is currently unavailable....Retrying in {0} seconds.".format(sleep_delay))
+         sleep(sleep_delay)
+
+   # ==========================================
+   # 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]}")
+   build_yaml = getTopoInfo(REPO_TOPO + accessinfo['topology'] + '/topo_build.yml')
+   # Perform check if it is a cEOS based topo and 2022.2 or later CVP
+   if _version_major >= 2022.2 and accessinfo['eos_type'] == 'ceos':
+      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'])
+      # EOS_DEV = []
+      for dev in build_yaml['nodes']:
+         devn = list(dev.keys())[0]
+         _eos_ip = dev[devn]['ip_addr']
+         with SSHClient() as ssh:
+            ssh.set_missing_host_key_policy(AutoAddPolicy())
+            ssh.connect(_eos_ip, username=cvpUsername, password=cvpPassword,)
+            with SCPClient(ssh.get_transport()) as scp:
+               pS("INFO", f"Transferring token to {devn}")
+               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
+   # ==========================================
+   checkConnected(cvp_clnt, build_yaml['nodes'])
 
    configlets = os.listdir(gitTempPath + configletPath)