import logging
import logging.handlers
from osm_lcm import ROclient
-from osm_lcm.lcm_utils import LcmException, LcmBase
+from osm_lcm.lcm_utils import LcmException, LcmBase, deep_get
from n2vc.k8s_helm_conn import K8sHelmConnector
+from n2vc.k8s_juju_conn import K8sJujuConnector
from osm_common.dbbase import DbException
from copy import deepcopy
self.fs = fs
self.db = db
- self.k8scluster = K8sHelmConnector(
+ self.helm_k8scluster = K8sHelmConnector(
kubectl_command=self.vca_config.get("kubectlpath"),
helm_command=self.vca_config.get("helmpath"),
fs=self.fs,
on_update_db=None
)
+ self.juju_k8scluster = K8sJujuConnector(
+ kubectl_command=self.vca_config.get("kubectlpath"),
+ juju_command=self.vca_config.get("jujupath"),
+ fs=self.fs,
+ log=self.logger,
+ db=self.db,
+ on_update_db=None
+ )
+
super().__init__(db, msg, fs, self.logger)
async def create(self, k8scluster_content, order_id):
db_k8scluster = None
db_k8scluster_update = {}
+ db_juju_k8scluster_update = {}
exc = None
operationState_HA = ''
db_k8scluster = self.db.get_one("k8sclusters", {"_id": k8scluster_id})
self.db.encrypt_decrypt_fields(db_k8scluster.get("credentials"), 'decrypt', ['password', 'secret'],
schema_version=db_k8scluster["schema_version"], salt=db_k8scluster["_id"])
- print(db_k8scluster.get("credentials"))
- print("\n\n\n FIN CREDENTIALS")
- print(yaml.safe_dump(db_k8scluster.get("credentials")))
- print("\n\n\n FIN OUTPUT")
- cluster_uuid, uninstall_sw = await self.k8scluster.init_env(yaml.safe_dump(db_k8scluster.
- get("credentials")))
- db_k8scluster_update["cluster-uuid"] = cluster_uuid
- if uninstall_sw:
- db_k8scluster_update["uninstall-sw"] = uninstall_sw
+
+ k8s_hc_id, uninstall_sw = await self.helm_k8scluster.init_env(
+ yaml.safe_dump(db_k8scluster.get("credentials"))
+ )
+ db_k8scluster_update["_admin.helm-chart.id"] = k8s_hc_id
+ db_k8scluster_update["_admin.helm-chart.created"] = uninstall_sw
+
+ # Juju/k8s cluster
+ k8s_jb_id, uninstall_sw = await self.juju_k8scluster.init_env(
+ yaml.safe_dump(db_k8scluster.get("credentials"))
+ )
+ db_k8scluster_update["_admin.juju-bundle.id"] = k8s_jb_id
+ db_k8scluster_update["_admin.juju-bundle.created"] = uninstall_sw
+
step = "Getting the list of repos"
self.logger.debug(logging_text + step)
task_list = []
db_k8srepo_list = self.db.get_list("k8srepos", {})
for repo in db_k8srepo_list:
- step = "Adding repo {} to cluster: {}".format(repo["name"], cluster_uuid)
+ step = "Adding repo {} to cluster: {}".format(repo["name"], k8s_hc_id)
self.logger.debug(logging_text + step)
- task = asyncio.ensure_future(self.k8scluster.repo_add(cluster_uuid=cluster_uuid,
- name=repo["name"], url=repo["url"],
- repo_type="chart"))
+ task = asyncio.ensure_future(self.helm_k8scluster.repo_add(cluster_uuid=k8s_hc_id,
+ name=repo["name"], url=repo["url"],
+ repo_type="chart"))
task_list.append(task)
if not repo["_admin"].get("cluster-inserted"):
repo["_admin"]["cluster-inserted"] = []
- repo["_admin"]["cluster-inserted"].append(cluster_uuid)
+ repo["_admin"]["cluster-inserted"].append(k8s_hc_id)
self.update_db_2("k8srepos", repo["_id"], repo)
done = None
if exc and db_k8scluster:
db_k8scluster_update["_admin.operationalState"] = "ERROR"
db_k8scluster_update["_admin.detailed-status"] = "ERROR {}: {}".format(step, exc)
+
+ if db_juju_k8scluster_update:
+ db_juju_k8scluster_update["_admin.operationalState"] = "ERROR"
+ db_juju_k8scluster_update["_admin.detailed-status"] = "ERROR {}: {}".format(step, exc)
+
# Mark the k8scluster 'create' HA task as erroneous
operationState_HA = 'FAILED'
detailed_status_HA = "ERROR {}: {}".format(step, exc)
try:
if db_k8scluster_update:
self.update_db_2("k8sclusters", k8scluster_id, db_k8scluster_update)
+
+ if db_juju_k8scluster_update:
+ self.update_db_2("k8sclusters", k8scluster_id, db_juju_k8scluster_update)
+
# Register the K8scluster 'create' HA task either
# succesful or erroneous, or do nothing (if legacy NBI)
self.lcm_tasks.register_HA('k8scluster', 'create', op_id,
step = "Getting k8scluster='{}' from db".format(k8scluster_id)
self.logger.debug(logging_text + step)
db_k8scluster = self.db.get_one("k8sclusters", {"_id": k8scluster_id})
- uninstall_sw = db_k8scluster.get("uninstall-sw")
- if uninstall_sw is False or uninstall_sw is None:
- uninstall_sw = False
- cluster_removed = await self.k8scluster.reset(cluster_uuid=db_k8scluster.get("cluster-uuid"),
- uninstall_sw=uninstall_sw)
+ k8s_hc_id = deep_get(db_k8scluster, ("_admin", "helm-chart", "id"))
+ k8s_jb_id = deep_get(db_k8scluster, ("_admin", "juju-bundle", "id"))
+
+ uninstall_sw = deep_get(db_k8scluster, ("_admin", "helm-chart", "created"))
+ cluster_removed = True
+ if k8s_hc_id:
+ uninstall_sw = uninstall_sw or False
+ cluster_removed = await self.helm_k8scluster.reset(cluster_uuid=k8s_hc_id, uninstall_sw=uninstall_sw)
+
+ if k8s_jb_id:
+ uninstall_sw = uninstall_sw or False
+ cluster_removed = await self.juju_k8scluster.reset(cluster_uuid=k8s_jb_id, uninstall_sw=uninstall_sw)
if cluster_removed:
step = "Removing k8scluster='{}' from db".format(k8scluster_id)
for k8srepo in db_k8srepo_list:
index = 0
for cluster in k8srepo["_admin"]["cluster-inserted"]:
- if db_k8scluster.get("cluster-uuid") == cluster:
+ hc_id = deep_get(db_k8scluster, ("_admin", "helm-chart", "id"))
+ if hc_id == cluster:
del(k8srepo["_admin"]["cluster-inserted"][index])
break
index += 1
db_k8srepo_update["_admin.cluster-inserted"] = []
task_list = []
for k8scluster in db_k8scluster_list:
- step = "Adding repo to cluster: {}".format(k8scluster["cluster-uuid"])
- self.logger.debug(logging_text + step)
- task = asyncio.ensure_future(self.k8srepo.repo_add(cluster_uuid=k8scluster["cluster-uuid"],
- name=db_k8srepo["name"], url=db_k8srepo["url"],
- repo_type="chart"))
- task_list.append(task)
- db_k8srepo_update["_admin.cluster-inserted"].append(k8scluster["cluster-uuid"])
+ hc_id = deep_get(k8scluster, ("_admin", "helm-chart", "id"))
+ if hc_id:
+ step = "Adding repo to cluster: {}".format(hc_id)
+ self.logger.debug(logging_text + step)
+ task = asyncio.ensure_future(self.k8srepo.repo_add(cluster_uuid=hc_id,
+ name=db_k8srepo["name"], url=db_k8srepo["url"],
+ repo_type="chart"))
+ task_list.append(task)
+ db_k8srepo_update["_admin.cluster-inserted"].append(hc_id)
done = None
pending = None
task_list = []
for k8scluster in db_k8scluster_list:
- task = asyncio.ensure_future(self.k8srepo.repo_remove(cluster_uuid=k8scluster["cluster-uuid"],
- name=db_k8srepo["name"]))
+ hc_id = deep_get(k8scluster, ("_admin", "helm-chart", "id"))
+ if hc_id:
+ task = asyncio.ensure_future(self.k8srepo.repo_remove(cluster_uuid=hc_id,
+ name=db_k8srepo["name"]))
task_list.append(task)
done = None
pending = None
projects / osm / LCM.git / blobdiff