# contact with: nfvlabs@tid.es
##
import asyncio
+from typing import Union
import os
import yaml
:param kwargs: Additional parameters (None yet)
:return: True if successful
"""
- self.log.debug("installing {} in cluster {}".format(kdu_model, cluster_uuid))
+ _, cluster_id = self._get_namespace_cluster_id(cluster_uuid)
+ self.log.debug("installing {} in cluster {}".format(kdu_model, cluster_id))
# sync local dir
- self.fs.sync(from_path=cluster_uuid)
+ self.fs.sync(from_path=cluster_id)
# init env, paths
paths, env = self._init_paths_env(
- cluster_name=cluster_uuid, create_if_not_exist=True
+ cluster_name=cluster_id, create_if_not_exist=True
)
await self._install_impl(
- cluster_uuid,
+ cluster_id,
kdu_model,
paths,
env,
)
# sync fs
- self.fs.reverse_sync(from_path=cluster_uuid)
+ self.fs.reverse_sync(from_path=cluster_id)
self.log.debug("Returning kdu_instance {}".format(kdu_instance))
return True
)
command = (
- "{} --kubeconfig={} --tiller-namespace={} --home={} --service-account {} "
- " {} init"
+ "{} init --kubeconfig={} --tiller-namespace={} --home={} --service-account {} "
+ " {}"
).format(
self._helm_command,
paths["kube_config"],
):
self.log.info("Initializing helm in client: {}".format(cluster_id))
command = (
- "{} --kubeconfig={} --tiller-namespace={} "
- "--home={} init --client-only {} "
+ "{} init --kubeconfig={} --tiller-namespace={} "
+ "--home={} --client-only {} "
).format(
self._helm_command,
paths["kube_config"],
else:
self.log.info("Helm client already initialized")
- repo_list = await self.repo_list(cluster_id)
+ # remove old stable repo and add new one
+ cluster_uuid = "{}:{}".format(namespace, cluster_id)
+ repo_list = await self.repo_list(cluster_uuid)
for repo in repo_list:
if repo["name"] == "stable" and repo["url"] != self._stable_repo_url:
self.log.debug("Add new stable repo url: {}")
- await self.repo_remove(cluster_id, "stable")
+ await self.repo_remove(cluster_uuid, "stable")
if self._stable_repo_url:
- await self.repo_add(cluster_id, "stable", self._stable_repo_url)
+ await self.repo_add(cluster_uuid, "stable", self._stable_repo_url)
break
return n2vc_installed_sw
output, _rc = await self._local_async_exec(
command=command, raise_exception_on_error=False, env=env
)
- command = (
- "{} --kubeconfig={} --namespace {} delete serviceaccount/{}".format(
- self.kubectl_command,
- paths["kube_config"],
- namespace,
- self.service_account,
- )
+ command = "{} --kubeconfig={} --namespace kube-system delete serviceaccount/{}".format(
+ self.kubectl_command, paths["kube_config"], self.service_account
)
output, _rc = await self._local_async_exec(
command=command, raise_exception_on_error=False, env=env
cluster_id: str,
kdu_instance: str,
namespace: str = None,
+ yaml_format: 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)
env=env,
)
- if return_text:
+ if yaml_format:
return str(output)
if rc != 0:
)
status = await self._status_kdu(
- cluster_id=cluster_id, kdu_instance=kdu_instance, return_text=False
+ cluster_id=cluster_id, kdu_instance=kdu_instance, yaml_format=False
)
# extract info.status.resources-> str