projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix black issues
[osm/N2VC.git]
/
n2vc
/
k8s_helm3_conn.py
diff --git
a/n2vc/k8s_helm3_conn.py
b/n2vc/k8s_helm3_conn.py
index
5e5766a
..
787be03
100644
(file)
--- a/
n2vc/k8s_helm3_conn.py
+++ b/
n2vc/k8s_helm3_conn.py
@@
-19,6
+19,7
@@
# For those usages not covered by the Apache License, Version 2.0 please
# contact with: nfvlabs@tid.es
##
# For those usages not covered by the Apache License, Version 2.0 please
# contact with: nfvlabs@tid.es
##
+from typing import Union
import os
import yaml
import os
import yaml
@@
-97,24
+98,24
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
:return: True if successful
"""
:return: True if successful
"""
-
- self.log.debug("installing {} in cluster {}".format(kdu_model, cluster_
uu
id))
+ _, cluster_id = self._get_namespace_cluster_id(cluster_uuid)
+ self.log.debug("installing {} in cluster {}".format(kdu_model, cluster_id))
# sync local dir
# sync local dir
- self.fs.sync(from_path=cluster_
uu
id)
+ self.fs.sync(from_path=cluster_id)
# init env, paths
paths, env = self._init_paths_env(
# init env, paths
paths, env = self._init_paths_env(
- cluster_name=cluster_
uu
id, create_if_not_exist=True
+ cluster_name=cluster_id, create_if_not_exist=True
)
# for helm3 if namespace does not exist must create it
if namespace and namespace != "kube-system":
)
# for helm3 if namespace does not exist must create it
if namespace and namespace != "kube-system":
- if not await self._namespace_exists(cluster_
uu
id, namespace):
+ if not await self._namespace_exists(cluster_id, namespace):
try:
try:
- await self._create_namespace(cluster_
uu
id, namespace)
+ await self._create_namespace(cluster_id, namespace)
except Exception as e:
except Exception as e:
- if not await self._namespace_exists(cluster_
uu
id, namespace):
+ if not await self._namespace_exists(cluster_id, namespace):
err_msg = (
"namespace {} does not exist in cluster_id {} "
"error message: ".format(namespace, e)
err_msg = (
"namespace {} does not exist in cluster_id {} "
"error message: ".format(namespace, e)
@@
-123,7
+124,7
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
raise K8sException(err_msg)
await self._install_impl(
raise K8sException(err_msg)
await self._install_impl(
- cluster_
uu
id,
+ cluster_id,
kdu_model,
paths,
env,
kdu_model,
paths,
env,
@@
-137,13
+138,12
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
)
# sync fs
)
# sync fs
- self.fs.reverse_sync(from_path=cluster_
uu
id)
+ self.fs.reverse_sync(from_path=cluster_id)
self.log.debug("Returning kdu_instance {}".format(kdu_instance))
return True
async def inspect_kdu(self, kdu_model: str, repo_url: str = None) -> str:
self.log.debug("Returning kdu_instance {}".format(kdu_instance))
return True
async def inspect_kdu(self, kdu_model: str, repo_url: str = None) -> str:
-
self.log.debug(
"inspect kdu_model {} from (optional) repo: {}".format(kdu_model, repo_url)
)
self.log.debug(
"inspect kdu_model {} from (optional) repo: {}".format(kdu_model, repo_url)
)
@@
-244,7
+244,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
return namespace in namespaces if namespaces else False
async def _get_namespaces(self, cluster_id: str):
return namespace in namespaces if namespaces else False
async def _get_namespaces(self, cluster_id: str):
-
self.log.debug("get namespaces cluster_id {}".format(cluster_id))
# init config, env
self.log.debug("get namespaces cluster_id {}".format(cluster_id))
# init config, env
@@
-266,7
+265,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
return namespaces
async def _create_namespace(self, cluster_id: str, namespace: str):
return namespaces
async def _create_namespace(self, cluster_id: str, namespace: str):
-
self.log.debug(f"create namespace: {cluster_id} for cluster_id: {namespace}")
# init config, env
self.log.debug(f"create namespace: {cluster_id} for cluster_id: {namespace}")
# init config, env
@@
-287,7
+285,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
async def _get_services(
self, cluster_id: str, kdu_instance: str, namespace: str, kubeconfig: str
):
async def _get_services(
self, cluster_id: str, kdu_instance: str, namespace: str, kubeconfig: str
):
-
# init config, env
paths, env = self._init_paths_env(
cluster_name=cluster_id, create_if_not_exist=True
# init config, env
paths, env = self._init_paths_env(
cluster_name=cluster_id, create_if_not_exist=True
@@
-314,10
+311,12
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
if namespace not in namespaces:
await self._create_namespace(cluster_id, namespace)
if namespace not in namespaces:
await self._create_namespace(cluster_id, namespace)
- repo_list = await self.repo_list(cluster_id)
+ # If default repo is not included add
+ cluster_uuid = "{}:{}".format(namespace, cluster_id)
+ repo_list = await self.repo_list(cluster_uuid)
stable_repo = [repo for repo in repo_list if repo["name"] == "stable"]
if not stable_repo and self._stable_repo_url:
stable_repo = [repo for repo in repo_list if repo["name"] == "stable"]
if not stable_repo and self._stable_repo_url:
- await self.repo_add(cluster_id, "stable", self._stable_repo_url)
+ await self.repo_add(cluster_
uu
id, "stable", self._stable_repo_url)
# Returns False as no software needs to be uninstalled
return False
# Returns False as no software needs to be uninstalled
return False
@@
-327,7
+326,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
pass
async def _instances_list(self, cluster_id: str):
pass
async def _instances_list(self, cluster_id: str):
-
# init paths, env
paths, env = self._init_paths_env(
cluster_name=cluster_id, create_if_not_exist=True
# init paths, env
paths, env = self._init_paths_env(
cluster_name=cluster_id, create_if_not_exist=True
@@
-357,10
+355,9
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
cluster_id: str,
kdu_instance: str,
namespace: str = None,
cluster_id: str,
kdu_instance: str,
namespace: str = None,
+ yaml_format: bool = False,
show_error_log: bool = False,
show_error_log: bool = False,
- return_text: bool = False,
- ):
-
+ ) -> Union[str, dict]:
self.log.debug(
"status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace)
)
self.log.debug(
"status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace)
)
@@
-383,7
+380,7
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
env=env,
)
env=env,
)
- if
return_tex
t:
+ if
yaml_forma
t:
return str(output)
if rc != 0:
return str(output)
if rc != 0:
@@
-419,7
+416,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
timeout: float,
kubeconfig: str,
) -> str:
timeout: float,
kubeconfig: str,
) -> str:
-
timeout_str = ""
if timeout:
timeout_str = "--timeout {}s".format(timeout)
timeout_str = ""
if timeout:
timeout_str = "--timeout {}s".format(timeout)
@@
-465,7
+461,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
timeout: float,
kubeconfig: str,
) -> str:
timeout: float,
kubeconfig: str,
) -> str:
-
timeout_str = ""
if timeout:
timeout_str = "--timeout {}s".format(timeout)
timeout_str = ""
if timeout:
timeout_str = "--timeout {}s".format(timeout)
@@
-511,7
+506,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
def _get_uninstall_command(
self, kdu_instance: str, namespace: str, kubeconfig: str
) -> str:
def _get_uninstall_command(
self, kdu_instance: str, namespace: str, kubeconfig: str
) -> str:
-
return "env KUBECONFIG={} {} uninstall {} --namespace={}".format(
kubeconfig, self._helm_command, kdu_instance, namespace
)
return "env KUBECONFIG={} {} uninstall {} --namespace={}".format(
kubeconfig, self._helm_command, kdu_instance, namespace
)