X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_juju_conn.py;h=12da70058aeb89d9a74eea5efb161eee462e060e;hp=06ef7d91b703a80b82e76ecf66e5e498c76fead5;hb=4d9facc140ab76da587871590c550f5862103dd6;hpb=55ca1c7c8a9356929047296a2d97dfca5fc27357 diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py index 06ef7d9..12da700 100644 --- a/n2vc/k8s_juju_conn.py +++ b/n2vc/k8s_juju_conn.py @@ -335,8 +335,10 @@ class K8sJujuConnector(K8sConnector): in the package> - """ - - previous_workdir = os.getcwd() + try: + previous_workdir = os.getcwd() + except FileNotFoundError: + previous_workdir = "/app/storage" bundle = kdu_model if kdu_model.startswith("cs:"): @@ -689,6 +691,24 @@ class K8sJujuConnector(K8sConnector): return status + async def get_services(self, + cluster_uuid: str, + kdu_instance: str, + namespace: str = None) -> list: + """ + Returns empty list as currently add_repo is not implemented + """ + raise MethodNotImplemented + + async def get_service(self, + cluster_uuid: str, + service_name: str, + namespace: str = None) -> object: + """ + Returns empty list as currently add_repo is not implemented + """ + raise MethodNotImplemented + # Private methods async def add_k8s(self, cloud_name: str, credentials: str,) -> bool: """Add a k8s cloud to Juju @@ -745,9 +765,12 @@ class K8sJujuConnector(K8sConnector): "Adding model '{}' to cluster_uuid '{}'".format(model_name, cluster_uuid) ) try: - model = await self.controller.add_model( - model_name, config={"authorized-keys": self.juju_public_key} - ) + if self.juju_public_key is not None: + model = await self.controller.add_model( + model_name, config={"authorized-keys": self.juju_public_key} + ) + else: + model = await self.controller.add_model(model_name) except Exception as ex: self.log.debug(ex) self.log.debug("Caught exception: {}".format(ex))