X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fvim_sdn.py;h=6593b4688cd1cf6d6b87f502518918cd0f65b587;hb=refs%2Fheads%2Ffeature7184;hp=27ed850ff2e656cda0cc6ecb19d71599d7005970;hpb=2f791320b15959e6cd6ec03c7f9cd71bb2d22166;p=osm%2FLCM.git diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py index 27ed850..6593b46 100644 --- a/osm_lcm/vim_sdn.py +++ b/osm_lcm/vim_sdn.py @@ -16,7 +16,6 @@ # under the License. ## -import asyncio import yaml import logging import logging.handlers @@ -24,6 +23,7 @@ from osm_lcm import ROclient 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 n2vc.exceptions import K8sException, N2VCException from osm_common.dbbase import DbException from copy import deepcopy @@ -35,7 +35,7 @@ class VimLcm(LcmBase): vim_config_encrypted = {"1.1": ("admin_password", "nsx_password", "vcenter_password"), "default": ("admin_password", "nsx_password", "vcenter_password", "vrops_password")} - def __init__(self, db, msg, fs, lcm_tasks, ro_config, loop): + def __init__(self, db, msg, fs, lcm_tasks, config, loop): """ Init, Connect to database, filesystem storage, and messaging :param config: two level dictionary with configuration. Top level should contain 'database', 'storage', @@ -45,7 +45,7 @@ class VimLcm(LcmBase): self.logger = logging.getLogger('lcm.vim') self.loop = loop self.lcm_tasks = lcm_tasks - self.ro_config = ro_config + self.ro_config = config["ro_config"] super().__init__(db, msg, fs, self.logger) @@ -385,7 +385,7 @@ class WimLcm(LcmBase): # values that are encrypted at wim config because they are passwords wim_config_encrypted = () - def __init__(self, db, msg, fs, lcm_tasks, ro_config, loop): + def __init__(self, db, msg, fs, lcm_tasks, config, loop): """ Init, Connect to database, filesystem storage, and messaging :param config: two level dictionary with configuration. Top level should contain 'database', 'storage', @@ -395,7 +395,7 @@ class WimLcm(LcmBase): self.logger = logging.getLogger('lcm.vim') self.loop = loop self.lcm_tasks = lcm_tasks - self.ro_config = ro_config + self.ro_config = config["ro_config"] super().__init__(db, msg, fs, self.logger) @@ -688,7 +688,7 @@ class WimLcm(LcmBase): class SdnLcm(LcmBase): - def __init__(self, db, msg, fs, lcm_tasks, ro_config, loop): + def __init__(self, db, msg, fs, lcm_tasks, config, loop): """ Init, Connect to database, filesystem storage, and messaging :param config: two level dictionary with configuration. Top level should contain 'database', 'storage', @@ -698,7 +698,7 @@ class SdnLcm(LcmBase): self.logger = logging.getLogger('lcm.sdn') self.loop = loop self.lcm_tasks = lcm_tasks - self.ro_config = ro_config + self.ro_config = config["ro_config"] super().__init__(db, msg, fs, self.logger) @@ -920,7 +920,7 @@ class SdnLcm(LcmBase): class K8sClusterLcm(LcmBase): - def __init__(self, db, msg, fs, lcm_tasks, vca_config, loop): + def __init__(self, db, msg, fs, lcm_tasks, config, loop): """ Init, Connect to database, filesystem storage, and messaging :param config: two level dictionary with configuration. Top level should contain 'database', 'storage', @@ -930,7 +930,7 @@ class K8sClusterLcm(LcmBase): self.logger = logging.getLogger('lcm.k8scluster') self.loop = loop self.lcm_tasks = lcm_tasks - self.vca_config = vca_config + self.vca_config = config["VCA"] self.fs = fs self.db = db @@ -971,7 +971,6 @@ class K8sClusterLcm(LcmBase): db_k8scluster = None db_k8scluster_update = {} - db_juju_k8scluster_update = {} exc = None operationState_HA = '' @@ -982,46 +981,44 @@ class K8sClusterLcm(LcmBase): 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"]) - - 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 + k8s_credentials = yaml.safe_dump(db_k8scluster.get("credentials")) + error_text_list = [] + # helm-chart + k8s_hc_id = None + try: + k8s_hc_id, uninstall_sw = await self.helm_k8scluster.init_env(k8s_credentials) + db_k8scluster_update["_admin.helm-chart.id"] = k8s_hc_id + db_k8scluster_update["_admin.helm-chart.created"] = uninstall_sw + except Exception as e: + error_text_list.append("Failing init helm-chart: {}".format(e)) + db_k8scluster_update["_admin.helm-chart.error_msg"] = str(e) + if isinstance(e, K8sException): + self.logger.error(logging_text + "Failing init helm-chart: {}".format(e)) + else: + self.logger.error(logging_text + "Failing init helm-chart: {}".format(e), exc_info=True) # 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"], k8s_hc_id) - self.logger.debug(logging_text + step) - 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(k8s_hc_id) - self.update_db_2("k8srepos", repo["_id"], repo) - - done = None - pending = None - if len(task_list) > 0: - self.logger.debug('Waiting for terminate pending tasks...') - done, pending = await asyncio.wait(task_list, timeout=3600) - if not pending: - self.logger.debug('All tasks finished...') + k8s_jb_id = None + try: + k8s_jb_id, uninstall_sw = await self.juju_k8scluster.init_env(k8s_credentials) + db_k8scluster_update["_admin.juju-bundle.id"] = k8s_jb_id + db_k8scluster_update["_admin.juju-bundle.created"] = uninstall_sw + except Exception as e: + error_text_list.append("Failing init juju-bundle: {}".format(e)) + db_k8scluster_update["_admin.juju-bundle.error_msg"] = str(e) + if isinstance(e, N2VCException): + self.logger.error(logging_text + "Failing init juju-bundle: {}".format(e)) else: - self.logger.info('There are pending tasks: {}'.format(pending)) - db_k8scluster_update["_admin.operationalState"] = "ENABLED" + self.logger.error(logging_text + "Failing init juju-bundle: {}".format(e), exc_info=True) + + # mark as an error if both helm-chart and juju-bundle have been failed + if k8s_hc_id or k8s_jb_id: + self.logger.debug(logging_text + " successfully created") + db_k8scluster_update["_admin.operationalState"] = "ENABLED" + else: + self.logger.debug(logging_text + " successfully created with errors") + db_k8scluster_update["_admin.operationalState"] = "ERROR" + db_k8scluster_update["_admin.detailed-status"] = ";".join(error_text_list) except Exception as e: self.logger.critical(logging_text + "Exit Exception {}".format(e), exc_info=True) @@ -1031,10 +1028,6 @@ class K8sClusterLcm(LcmBase): 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) @@ -1042,9 +1035,6 @@ class K8sClusterLcm(LcmBase): 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, @@ -1052,7 +1042,7 @@ class K8sClusterLcm(LcmBase): detailed_status=detailed_status_HA) except DbException as e: self.logger.error(logging_text + "Cannot update database: {}".format(e)) - self.lcm_tasks.remove("k8sclusters", k8scluster_id, order_id) + self.lcm_tasks.remove("k8scluster", k8scluster_id, order_id) async def delete(self, k8scluster_content, order_id): @@ -1091,19 +1081,18 @@ class K8sClusterLcm(LcmBase): 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) + # Try to remove from cluster_inserted to clean old versions + if k8s_hc_id and cluster_removed: + step = "Removing k8scluster='{}' from k8srepos".format(k8scluster_id) self.logger.debug(logging_text + step) - db_k8srepo_list = self.db.get_list("k8srepos", {}) + db_k8srepo_list = self.db.get_list("k8srepos", {"_admin.cluster-inserted": k8s_hc_id}) for k8srepo in db_k8srepo_list: - index = 0 - for cluster in k8srepo["_admin"]["cluster-inserted"]: - hc_id = deep_get(db_k8scluster, ("_admin", "helm-chart", "id")) - if hc_id == cluster: - del(k8srepo["_admin"]["cluster-inserted"][index]) - break - index += 1 - self.update_db_2("k8srepos", k8srepo["_id"], k8srepo) + try: + cluster_list = k8srepo["_admin"]["cluster-inserted"] + cluster_list.remove(k8s_hc_id) + self.update_db_2("k8srepos", k8srepo["_id"], {"_admin.cluster-inserted": cluster_list}) + except Exception as e: + self.logger.error("{}: {}".format(step, e)) self.db.del_one("k8sclusters", {"_id": k8scluster_id}) else: raise LcmException("An error happened during the reset of the k8s cluster '{}'".format(k8scluster_id)) @@ -1111,7 +1100,10 @@ class K8sClusterLcm(LcmBase): # raise Exception("K8scluster was not properly removed") except Exception as e: - self.logger.critical(logging_text + "Exit Exception {}".format(e), exc_info=True) + if isinstance(e, (LcmException, DbException)): + self.logger.error(logging_text + "Exit Exception {}".format(e)) + else: + self.logger.critical(logging_text + "Exit Exception {}".format(e), exc_info=True) exc = e finally: if exc and db_k8scluster: @@ -1130,12 +1122,12 @@ class K8sClusterLcm(LcmBase): detailed_status=detailed_status_HA) except DbException as e: self.logger.error(logging_text + "Cannot update database: {}".format(e)) - self.lcm_tasks.remove("k8sclusters", k8scluster_id, order_id) + self.lcm_tasks.remove("k8scluster", k8scluster_id, order_id) class K8sRepoLcm(LcmBase): - def __init__(self, db, msg, fs, lcm_tasks, vca_config, loop): + def __init__(self, db, msg, fs, lcm_tasks, config, loop): """ Init, Connect to database, filesystem storage, and messaging :param config: two level dictionary with configuration. Top level should contain 'database', 'storage', @@ -1145,7 +1137,7 @@ class K8sRepoLcm(LcmBase): self.logger = logging.getLogger('lcm.k8srepo') self.loop = loop self.lcm_tasks = lcm_tasks - self.vca_config = vca_config + self.vca_config = config["VCA"] self.fs = fs self.db = db @@ -1184,31 +1176,6 @@ class K8sRepoLcm(LcmBase): step = "Getting k8srepo-id='{}' from db".format(k8srepo_id) self.logger.debug(logging_text + step) db_k8srepo = self.db.get_one("k8srepos", {"_id": k8srepo_id}) - step = "Getting k8scluster_list from db" - self.logger.debug(logging_text + step) - db_k8scluster_list = self.db.get_list("k8sclusters", {}) - db_k8srepo_update["_admin.cluster-inserted"] = [] - task_list = [] - for k8scluster in db_k8scluster_list: - 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 - if len(task_list) > 0: - self.logger.debug('Waiting for terminate pending tasks...') - done, pending = await asyncio.wait(task_list, timeout=3600) - if not pending: - self.logger.debug('All tasks finished...') - else: - self.logger.info('There are pending tasks: {}'.format(pending)) db_k8srepo_update["_admin.operationalState"] = "ENABLED" except Exception as e: self.logger.critical(logging_text + "Exit Exception {}".format(e), exc_info=True) @@ -1249,33 +1216,13 @@ class K8sRepoLcm(LcmBase): db_k8srepo = None db_k8srepo_update = {} + exc = None operationState_HA = '' detailed_status_HA = '' try: step = "Getting k8srepo-id='{}' from db".format(k8srepo_id) self.logger.debug(logging_text + step) db_k8srepo = self.db.get_one("k8srepos", {"_id": k8srepo_id}) - step = "Getting k8scluster_list from db" - self.logger.debug(logging_text + step) - db_k8scluster_list = self.db.get_list("k8sclusters", {}) - - task_list = [] - for k8scluster in db_k8scluster_list: - 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 - if len(task_list) > 0: - self.logger.debug('Waiting for terminate pending tasks...') - done, pending = await asyncio.wait(task_list, timeout=3600) - if not pending: - self.logger.debug('All tasks finished...') - else: - self.logger.info('There are pending tasks: {}'.format(pending)) - self.db.del_one("k8srepos", {"_id": k8srepo_id}) except Exception as e: self.logger.critical(logging_text + "Exit Exception {}".format(e), exc_info=True) @@ -1295,6 +1242,7 @@ class K8sRepoLcm(LcmBase): self.lcm_tasks.register_HA('k8srepo', 'delete', op_id, operationState=operationState_HA, detailed_status=detailed_status_HA) + self.db.del_one("k8srepos", {"_id": k8srepo_id}) except DbException as e: self.logger.error(logging_text + "Cannot update database: {}".format(e)) self.lcm_tasks.remove("k8srepo", k8srepo_id, order_id)