X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fvim_sdn.py;h=13b95c458bfc0e6def73573b5a589766c2bedb92;hb=a7cb70b362dd95528deb64ab21ebad953009add6;hp=afdabc2cb9d0562275f4d07592ea599159fc3fcd;hpb=fa076c3067d3fffe36c0b5dcf00327523b400f81;p=osm%2FLCM.git diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py index afdabc2..13b95c4 100644 --- a/osm_lcm/vim_sdn.py +++ b/osm_lcm/vim_sdn.py @@ -23,6 +23,7 @@ import logging.handlers 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_helm3_conn import K8sHelm3Connector from n2vc.k8s_juju_conn import K8sJujuConnector from n2vc.exceptions import K8sException, N2VCException from osm_common.dbbase import DbException @@ -37,7 +38,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, config, loop): + def __init__(self, msg, 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', @@ -49,7 +50,7 @@ class VimLcm(LcmBase): self.lcm_tasks = lcm_tasks self.ro_config = config["ro_config"] - super().__init__(db, msg, fs, self.logger) + super().__init__(msg, self.logger) async def create(self, vim_content, order_id): @@ -141,11 +142,10 @@ class VimLcm(LcmBase): operation_state = 'COMPLETED' operation_details = 'Done' - # await asyncio.sleep(15) # TODO remove. This is for test self.logger.debug(logging_text + "Exit Ok VIM account created at RO_vim_account_id={}".format(desc["uuid"])) return - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, asyncio.CancelledError) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except Exception as e: @@ -227,7 +227,7 @@ class VimLcm(LcmBase): vim_RO.pop("vim_password", None) if RO_sdn_id: vim_RO["config"]["sdn-controller"] = RO_sdn_id - # TODO make a deep update of sdn-port-mapping + # TODO make a deep update of sdn-port-mapping if vim_RO: await RO.edit("vim", RO_vim_id, descriptor=vim_RO) @@ -272,7 +272,7 @@ class VimLcm(LcmBase): self.logger.debug(logging_text + "Exit Ok RO_vim_id={}".format(RO_vim_id)) return - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, asyncio.CancelledError) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except Exception as e: @@ -318,37 +318,37 @@ class VimLcm(LcmBase): try: # wait for any previous tasks in process await self.lcm_tasks.waitfor_related_HA('vim', 'delete', op_id) - - db_vim = self.db.get_one("vim_accounts", {"_id": vim_id}) - if db_vim.get("_admin") and db_vim["_admin"].get("deployed") and db_vim["_admin"]["deployed"].get("RO"): - RO_vim_id = db_vim["_admin"]["deployed"]["RO"] - RO = ROclient.ROClient(self.loop, **self.ro_config) - step = "Detaching vim from RO tenant" - try: - await RO.detach("vim_account", RO_vim_id) - except ROclient.ROClientException as e: - if e.http_code == 404: # not found - self.logger.debug(logging_text + "RO_vim_id={} already detached".format(RO_vim_id)) - else: - raise - - step = "Deleting vim from RO" - try: - await RO.delete("vim", RO_vim_id) - except ROclient.ROClientException as e: - if e.http_code == 404: # not found - self.logger.debug(logging_text + "RO_vim_id={} already deleted".format(RO_vim_id)) - else: - raise - else: - # nothing to delete - self.logger.error(logging_text + "Nothing to remove at RO") + if not self.ro_config.get("ng"): + db_vim = self.db.get_one("vim_accounts", {"_id": vim_id}) + if db_vim.get("_admin") and db_vim["_admin"].get("deployed") and db_vim["_admin"]["deployed"].get("RO"): + RO_vim_id = db_vim["_admin"]["deployed"]["RO"] + RO = ROclient.ROClient(self.loop, **self.ro_config) + step = "Detaching vim from RO tenant" + try: + await RO.detach("vim_account", RO_vim_id) + except ROclient.ROClientException as e: + if e.http_code == 404: # not found + self.logger.debug(logging_text + "RO_vim_id={} already detached".format(RO_vim_id)) + else: + raise + + step = "Deleting vim from RO" + try: + await RO.delete("vim", RO_vim_id) + except ROclient.ROClientException as e: + if e.http_code == 404: # not found + self.logger.debug(logging_text + "RO_vim_id={} already deleted".format(RO_vim_id)) + else: + raise + else: + # nothing to delete + self.logger.debug(logging_text + "Nothing to remove at RO") self.db.del_one("vim_accounts", {"_id": vim_id}) db_vim = None self.logger.debug(logging_text + "Exit Ok") return - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, asyncio.CancelledError) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except Exception as e: @@ -379,7 +379,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, config, loop): + def __init__(self, msg, 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', @@ -391,7 +391,7 @@ class WimLcm(LcmBase): self.lcm_tasks = lcm_tasks self.ro_config = config["ro_config"] - super().__init__(db, msg, fs, self.logger) + super().__init__(msg, self.logger) async def create(self, wim_content, order_id): @@ -465,7 +465,7 @@ class WimLcm(LcmBase): self.logger.debug(logging_text + "Exit Ok WIM account created at RO_wim_account_id={}".format(desc["uuid"])) return - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, asyncio.CancelledError) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except Exception as e: @@ -570,7 +570,7 @@ class WimLcm(LcmBase): self.logger.debug(logging_text + "Exit Ok RO_wim_id={}".format(RO_wim_id)) return - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, asyncio.CancelledError) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except Exception as e: @@ -645,7 +645,7 @@ class WimLcm(LcmBase): self.logger.debug(logging_text + "Exit Ok") return - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, asyncio.CancelledError) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except Exception as e: @@ -674,7 +674,7 @@ class WimLcm(LcmBase): class SdnLcm(LcmBase): - def __init__(self, db, msg, fs, lcm_tasks, config, loop): + def __init__(self, msg, 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', @@ -686,7 +686,7 @@ class SdnLcm(LcmBase): self.lcm_tasks = lcm_tasks self.ro_config = config["ro_config"] - super().__init__(db, msg, fs, self.logger) + super().__init__(msg, self.logger) async def create(self, sdn_content, order_id): @@ -734,7 +734,7 @@ class SdnLcm(LcmBase): operation_details = 'Done' return - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, asyncio.CancelledError) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except Exception as e: @@ -804,7 +804,7 @@ class SdnLcm(LcmBase): self.logger.debug(logging_text + "Exit Ok RO_sdn_id={}".format(RO_sdn_id)) return - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, asyncio.CancelledError) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except Exception as e: @@ -870,7 +870,7 @@ class SdnLcm(LcmBase): self.logger.debug("sdn_delete task sdn_id={} Exit Ok".format(sdn_id)) return - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, asyncio.CancelledError) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except Exception as e: @@ -897,9 +897,9 @@ class SdnLcm(LcmBase): class K8sClusterLcm(LcmBase): - timeout_create = 600 + timeout_create = 300 - def __init__(self, db, msg, fs, lcm_tasks, config, loop): + def __init__(self, msg, 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', @@ -910,12 +910,21 @@ class K8sClusterLcm(LcmBase): self.loop = loop self.lcm_tasks = lcm_tasks self.vca_config = config["VCA"] - self.fs = fs - self.db = db - self.helm_k8scluster = K8sHelmConnector( + super().__init__(msg, self.logger) + + self.helm2_k8scluster = K8sHelmConnector( kubectl_command=self.vca_config.get("kubectlpath"), helm_command=self.vca_config.get("helmpath"), + log=self.logger, + on_update_db=None, + db=self.db, + fs=self.fs + ) + + self.helm3_k8scluster = K8sHelm3Connector( + kubectl_command=self.vca_config.get("kubectlpath"), + helm_command=self.vca_config.get("helm3path"), fs=self.fs, log=self.logger, db=self.db, @@ -925,18 +934,20 @@ class K8sClusterLcm(LcmBase): self.juju_k8scluster = K8sJujuConnector( kubectl_command=self.vca_config.get("kubectlpath"), juju_command=self.vca_config.get("jujupath"), - fs=self.fs, log=self.logger, + loop=self.loop, + on_update_db=None, + vca_config=self.vca_config, db=self.db, - on_update_db=None + fs=self.fs ) + self.k8s_map = { - "helm-chart": self.helm_k8scluster, + "helm-chart": self.helm2_k8scluster, + "helm-chart-v3": self.helm3_k8scluster, "juju-bundle": self.juju_k8scluster, } - super().__init__(db, msg, fs, self.logger) - async def create(self, k8scluster_content, order_id): op_id = k8scluster_content.pop('op_id', None) @@ -961,7 +972,7 @@ class K8sClusterLcm(LcmBase): task2name = {} init_target = deep_get(db_k8scluster, ("_admin", "init")) step = "Launching k8scluster init tasks" - for task_name in ("helm-chart", "juju-bundle"): + for task_name in ("helm-chart", "juju-bundle", "helm-chart-v3"): if init_target and task_name not in init_target: continue task = asyncio.ensure_future(self.k8s_map[task_name].init_env(k8s_credentials, @@ -997,6 +1008,7 @@ class K8sClusterLcm(LcmBase): error_text_list.append("Failing init {}: {}".format(task_name, exc)) db_k8scluster_update["_admin.{}.error_msg".format(task_name)] = str(exc) db_k8scluster_update["_admin.{}.id".format(task_name)] = None + db_k8scluster_update["_admin.{}.operationalState".format(task_name)] = "ERROR" self.logger.error(logging_text + "{} init fail: {}".format(task_name, exc), exc_info=not isinstance(exc, (N2VCException, str))) else: @@ -1007,22 +1019,28 @@ class K8sClusterLcm(LcmBase): db_k8scluster_update["_admin.{}.error_msg".format(task_name)] = None db_k8scluster_update["_admin.{}.id".format(task_name)] = k8s_id db_k8scluster_update["_admin.{}.created".format(task_name)] = uninstall_sw - db_k8scluster_update["_admin.operationalState"] = "ENABLED" + db_k8scluster_update["_admin.{}.operationalState".format(task_name)] = "ENABLED" # update database step = "Updating database for " + task_name self.update_db_2("k8sclusters", k8scluster_id, db_k8scluster_update) - if not tasks_name_ok: + if tasks_name_ok: + operation_details = "ready for " + ", ".join(tasks_name_ok) + operation_state = "COMPLETED" + db_k8scluster_update["_admin.operationalState"] = "ENABLED" if not error_text_list else "DEGRADED" + operation_details += "; " + ";".join(error_text_list) + else: db_k8scluster_update["_admin.operationalState"] = "ERROR" operation_state = "FAILED" - else: - db_k8scluster_update["_admin.detailed-status"] = "ready for " + ", ;".join(tasks_name_ok) - operation_state = "COMPLETED" - operation_details = db_k8scluster_update["_admin.detailed-status"] = ";".join(error_text_list) + operation_details = ";".join(error_text_list) + db_k8scluster_update["_admin.detailed-status"] = operation_details self.logger.debug(logging_text + "Done. Result: " + operation_state) exc = None except Exception as e: - self.logger.critical(logging_text + "Exit Exception {}".format(e), exc_info=True) + if isinstance(e, (LcmException, DbException, K8sException, N2VCException, asyncio.CancelledError)): + 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: @@ -1064,6 +1082,7 @@ class K8sClusterLcm(LcmBase): self.logger.debug(logging_text + step) db_k8scluster = self.db.get_one("k8sclusters", {"_id": k8scluster_id}) k8s_hc_id = deep_get(db_k8scluster, ("_admin", "helm-chart", "id")) + k8s_h3c_id = deep_get(db_k8scluster, ("_admin", "helm-chart-v3", "id")) k8s_jb_id = deep_get(db_k8scluster, ("_admin", "juju-bundle", "id")) cluster_removed = True @@ -1072,12 +1091,21 @@ class K8sClusterLcm(LcmBase): uninstall_sw = deep_get(db_k8scluster, ("_admin", "juju-bundle", "created")) or False cluster_removed = await self.juju_k8scluster.reset(cluster_uuid=k8s_jb_id, uninstall_sw=uninstall_sw) db_k8scluster_update["_admin.juju-bundle.id"] = None + db_k8scluster_update["_admin.juju-bundle.operationalState"] = "DISABLED" if k8s_hc_id: step = "Removing helm-chart '{}'".format(k8s_hc_id) uninstall_sw = deep_get(db_k8scluster, ("_admin", "helm-chart", "created")) or False - cluster_removed = await self.helm_k8scluster.reset(cluster_uuid=k8s_hc_id, uninstall_sw=uninstall_sw) + cluster_removed = await self.helm2_k8scluster.reset(cluster_uuid=k8s_hc_id, uninstall_sw=uninstall_sw) db_k8scluster_update["_admin.helm-chart.id"] = None + db_k8scluster_update["_admin.helm-chart.operationalState"] = "DISABLED" + + if k8s_h3c_id: + step = "Removing helm-chart-v3 '{}'".format(k8s_hc_id) + uninstall_sw = deep_get(db_k8scluster, ("_admin", "helm-chart-v3", "created")) or False + cluster_removed = await self.helm3_k8scluster.reset(cluster_uuid=k8s_h3c_id, uninstall_sw=uninstall_sw) + db_k8scluster_update["_admin.helm-chart-v3.id"] = None + db_k8scluster_update["_admin.helm-chart-v3.operationalState"] = "DISABLED" # Try to remove from cluster_inserted to clean old versions if k8s_hc_id and cluster_removed: @@ -1096,7 +1124,7 @@ class K8sClusterLcm(LcmBase): self.logger.debug(logging_text + "Done") except Exception as e: - if isinstance(e, (LcmException, DbException, K8sException, N2VCException)): + if isinstance(e, (LcmException, DbException, K8sException, N2VCException, asyncio.CancelledError)): self.logger.error(logging_text + "Exit Exception {}".format(e)) else: self.logger.critical(logging_text + "Exit Exception {}".format(e), exc_info=True) @@ -1127,7 +1155,7 @@ class K8sClusterLcm(LcmBase): class K8sRepoLcm(LcmBase): - def __init__(self, db, msg, fs, lcm_tasks, config, loop): + def __init__(self, msg, 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', @@ -1138,8 +1166,8 @@ class K8sRepoLcm(LcmBase): self.loop = loop self.lcm_tasks = lcm_tasks self.vca_config = config["VCA"] - self.fs = fs - self.db = db + + super().__init__(msg, self.logger) self.k8srepo = K8sHelmConnector( kubectl_command=self.vca_config.get("kubectlpath"), @@ -1150,8 +1178,6 @@ class K8sRepoLcm(LcmBase): on_update_db=None ) - super().__init__(db, msg, fs, self.logger) - async def create(self, k8srepo_content, order_id): # HA tasks and backward compatibility: @@ -1178,7 +1204,9 @@ class K8sRepoLcm(LcmBase): db_k8srepo = self.db.get_one("k8srepos", {"_id": k8srepo_id}) db_k8srepo_update["_admin.operationalState"] = "ENABLED" except Exception as e: - self.logger.critical(logging_text + "Exit Exception {}".format(e), exc_info=True) + self.logger.error(logging_text + "Exit Exception {}".format(e), + exc_info=not isinstance(e, (LcmException, DbException, K8sException, N2VCException, + asyncio.CancelledError))) exc = e finally: if exc and db_k8srepo: @@ -1225,7 +1253,9 @@ class K8sRepoLcm(LcmBase): db_k8srepo = self.db.get_one("k8srepos", {"_id": k8srepo_id}) except Exception as e: - self.logger.critical(logging_text + "Exit Exception {}".format(e), exc_info=True) + self.logger.error(logging_text + "Exit Exception {}".format(e), + exc_info=not isinstance(e, (LcmException, DbException, K8sException, N2VCException, + asyncio.CancelledError))) exc = e finally: if exc and db_k8srepo: