X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_juju_conn.py;h=3316087d975889111ea4166a719babfee9472110;hp=895e82be1077389abc62a5dda6b28043d1d720cb;hb=45d9577cb2f06a73f63c8329a0893ba419f30f41;hpb=eee9eade49606c458fb247051dec55a5feb17c01 diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py index 895e82b..3316087 100644 --- a/n2vc/k8s_juju_conn.py +++ b/n2vc/k8s_juju_conn.py @@ -351,6 +351,8 @@ class K8sJujuConnector(K8sConnector): - """ + previous_workdir = os.getcwd() + bundle = kdu_model if kdu_model.startswith("cs:"): bundle = kdu_model @@ -358,12 +360,11 @@ class K8sJujuConnector(K8sConnector): # Download the file pass else: - # Local file + new_workdir = kdu_model.strip(kdu_model.split("/")[-1]) - # if kdu_model.endswith(".tar.gz") or kdu_model.endswith(".tgz") - # Uncompress temporarily - # bundle = - pass + os.chdir(new_workdir) + + bundle = "local:{}".format(kdu_model) if not bundle: # Raise named exception that the bundle could not be found @@ -396,6 +397,7 @@ class K8sJujuConnector(K8sConnector): self.log.debug("All units active.") except concurrent.futures._base.TimeoutError: + os.chdir(previous_workdir) self.log.debug("[install] Timeout exceeded; resetting cluster") await self.reset(cluster_uuid) return False @@ -405,6 +407,8 @@ class K8sJujuConnector(K8sConnector): self.log.debug("[install] Disconnecting model") await model.disconnect() + os.chdir(previous_workdir) + return kdu_instance raise Exception("Unable to install")