X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=tests%2Fbase.py;h=912eab90567efcf375aaf331ab39768cf2b10e34;hp=3ae5f4f29f46b23ba8a47d7f38b17954050c6cfa;hb=b2a07f566be558a8b59b8b5dedfe8da5ae1b0132;hpb=29ad6453fb8cdece73b8c2f623cf81d5d730982d diff --git a/tests/base.py b/tests/base.py index 3ae5f4f..912eab9 100644 --- a/tests/base.py +++ b/tests/base.py @@ -22,17 +22,6 @@ logging.getLogger("urllib3").setLevel(logging.WARNING) here = os.path.dirname(os.path.realpath(__file__)) -def is_bootstrapped(): - result = subprocess.run(['juju', 'switch'], stdout=subprocess.PIPE) - return ( - result.returncode == 0 and len(result.stdout.decode().strip()) > 0) - - -bootstrapped = pytest.mark.skipif( - not is_bootstrapped(), - reason='bootstrapped Juju environment required') - - class CleanController(): """ Context manager that automatically connects and disconnects from @@ -130,6 +119,26 @@ def get_n2vc(loop=None): vca_charms = os.getenv('VCA_CHARMS', None) vca_secret = os.getenv('VCA_SECRET', None) + # Get the Juju Public key + juju_public_key = get_juju_public_key() + if juju_public_key: + debug("Reading Juju public key @ {}".format(juju_public_key)) + with open(juju_public_key, 'r') as f: + juju_public_key = f.read() + debug("Found public key: {}".format(juju_public_key)) + else: + raise Exception("No Juju Public Key found") + + # Get the ca-cert + # os.path.expanduser("~/.config/lxc") + # with open("{}/agent.conf".format(AGENT_PATH), "r") as f: + # try: + # y = yaml.safe_load(f) + # self.cacert = y['cacert'] + # except yaml.YAMLError as exc: + # log("Unable to find Juju ca-cert.") + # raise exc + client = n2vc.vnf.N2VC( log=log, server=vca_host, @@ -137,7 +146,8 @@ def get_n2vc(loop=None): user=vca_user, secret=vca_secret, artifacts=vca_charms, - loop=loop + loop=loop, + juju_public_key=juju_public_key, ) return client @@ -157,6 +167,9 @@ def create_lxd_container(public_key=None, name="test_name"): name = name.replace("_", "-").replace(".", "") client = get_lxd_client() + if not client: + raise Exception("Unable to connect to LXD") + test_machine = "test-{}-{}".format( uuid.uuid4().hex[-4:], name, @@ -230,6 +243,25 @@ def create_lxd_container(public_key=None, name="test_name"): ) ) + try: + waitcount = 0 + while waitcount <= 5: + if is_sshd_running(container): + break + waitcount += 1 + time.sleep(1) + if waitcount >= 5: + debug("couldn't detect sshd running") + raise Exception("Unable to verify container sshd") + + except Exception as ex: + debug( + "Error checking sshd status on {}: {}".format( + test_machine, + ex, + ) + ) + # HACK: We need to give sshd a chance to bind to the interface, # and pylxd's container.execute seems to be broken and fails and/or # hangs trying to properly check if the service is up. @@ -246,6 +278,28 @@ def create_lxd_container(public_key=None, name="test_name"): return container +def is_sshd_running(container): + """Check if sshd is running in the container. + + Check to see if the sshd process is running and listening on port 22. + + :param container: The container to check + :return boolean: True if sshd is running. + """ + debug("Container: {}".format(container)) + try: + (rc, stdout, stderr) = container.execute( + ["service", "ssh", "status"] + ) + # If the status is a) found and b) running, the exit code will be 0 + if rc == 0: + return True + except Exception as ex: + debug("Failed to check sshd service status: {}".format(ex)) + + return False + + def destroy_lxd_container(container): """Stop and delete a LXD container. @@ -348,7 +402,7 @@ def find_juju_ssh_keys(): """Find the Juju ssh keys.""" paths = [] - paths.append(os.path.expanduser("~/.local/share/juju/ssh/")) + paths.append(os.path.expanduser("~/.local/share/juju/ssh")) for path in paths: if os.path.exists(path): @@ -364,8 +418,41 @@ def get_juju_private_key(): return keys[0] -def get_lxd_client(host="127.0.0.1", port="8443", verify=False): +def get_juju_public_key(): + """Find the Juju public key.""" + paths = [] + + if 'VCA_PATH' in os.environ: + paths.append("{}/ssh".format(os.environ["VCA_PATH"])) + + paths.append(os.path.expanduser("~/.local/share/juju/ssh")) + paths.append("/root/.local/share/juju/ssh") + + for path in paths: + if os.path.exists(path): + public = os.path.expanduser("{}/juju_id_rsa.pub".format(path)) + if os.path.exists(public): + return public + return None + + +def get_lxd_client(host=None, port="8443", verify=False): """ Get the LXD client.""" + + if host is None: + if 'LXD_HOST' in os.environ: + host = os.environ['LXD_HOST'] + else: + host = '127.0.0.1' + + passwd = None + if 'LXD_SECRET' in os.environ: + passwd = os.environ['LXD_SECRET'] + + # debug("Connecting to LXD remote {} w/authentication ({})".format( + # host, + # passwd + # )) client = None (crt, key) = find_lxd_config() @@ -376,6 +463,16 @@ def get_lxd_client(host="127.0.0.1", port="8443", verify=False): verify=verify, ) + # If the LXD server has a pasword set, authenticate with it. + if not client.trusted and passwd: + try: + client.authenticate(passwd) + if not client.trusted: + raise Exception("Unable to authenticate with LXD remote") + except pylxd.exceptions.LXDAPIException as ex: + if 'Certificate already in trust store' in ex: + pass + return client @@ -388,9 +485,15 @@ class TestN2VC(object): """TODO: 1. Validator Validation - Automatically validate the descriptors we're using here, unless the test author explicitly wants to skip them. Useful to make sure tests aren't being run against invalid descriptors, validating functionality that may fail against a properly written descriptor. + Automatically validate the descriptors we're using here, unless the test + author explicitly wants to skip them. Useful to make sure tests aren't + being run against invalid descriptors, validating functionality that may + fail against a properly written descriptor. - We need to have a flag (instance variable) that controls this behavior. It may be necessary to skip validation and run against a descriptor implementing features that have not yet been released in the Information Model. + We need to have a flag (instance variable) that controls this behavior. It + may be necessary to skip validation and run against a descriptor + implementing features that have not yet been released in the Information + Model. """ """ @@ -440,6 +543,7 @@ class TestN2VC(object): # Build the charm(s) needed for this test for charm in self.get_charm_names(): + # debug("Building charm {}".format(charm)) self.get_charm(charm) # A bit of a hack, in order to allow the N2VC callback to run parallel @@ -545,11 +649,14 @@ class TestN2VC(object): Returns: The path to the built charm or None if `charm build` failed. """ - # Make sure the charm snap is installed + charm_cmd = None try: subprocess.check_call(['which', 'charm']) + charm_cmd = "charm build" except subprocess.CalledProcessError: + # charm_cmd = "charm-build" + # debug("Using legacy charm-build") raise Exception("charm snap not installed.") if charm not in self.artifacts: @@ -558,15 +665,21 @@ class TestN2VC(object): # Currently, the snap-installed command only has write access # to the $HOME (changing in an upcoming release) so writing to # /tmp isn't possible at the moment. - builds = get_charm_path() + builds = get_charm_path() if not os.path.exists("{}/builds/{}".format(builds, charm)): - cmd = "charm build --no-local-layers {}/{} -o {}/".format( + cmd = "{} --no-local-layers {}/{} -o {}/".format( + charm_cmd, get_layer_path(), charm, builds, ) - subprocess.check_call(shlex.split(cmd)) + # debug(cmd) + + env = os.environ.copy() + env["CHARM_BUILD_DIR"] = builds + + subprocess.check_call(shlex.split(cmd), env=env) except subprocess.CalledProcessError as e: # charm build will return error code 100 if the charm fails @@ -893,11 +1006,20 @@ class TestN2VC(object): self._running = False self._stopping = True + # Destroy the network service + try: + await self.n2vc.DestroyNetworkService(self.ns_name) + except Exception as e: + debug( + "Error Destroying Network Service \"{}\": {}".format( + self.ns_name, + e, + ) + ) + + # Wait for the applications to be removed and delete the containers for application in self.charms: try: - await self.n2vc.RemoveCharms(self.ns_name, application) - - await self.n2vc.DestroyNetworkService(self.ns_name) while True: # Wait for the application to be removed @@ -907,7 +1029,6 @@ class TestN2VC(object): application, ): break - await self.n2vc.DestroyNetworkService(self.ns_name) # Need to wait for the charm to finish, because native charms if self.state[application]['container']: @@ -1119,6 +1240,14 @@ class TestN2VC(object): debug("{} is done".format(application)) return + if status in ['error']: + # To test broken charms, if a charm enters an error state we should + # end the test + debug("{} is in an error state, stop the test.".format(application)) + # asyncio.ensure_future(self.stop()) + self.state[application]['done'] = True + assert False + if status in ["blocked"] and self.isproxy(application): if self.state[application]['phase'] == "deploy": debug("Configuring proxy charm for {}".format(application))