X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fvim_sdn.py;h=13b95c458bfc0e6def73573b5a589766c2bedb92;hb=a5ae90b046fc9760c542832e4543d4c4790f869a;hp=a5eff36a275ee3e096d0cdf86e9a49ec0bda9800;hpb=ba89cbb37502265011935fddbc04cb4304b14ca2;p=osm%2FLCM.git diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py index a5eff36..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,7 +142,6 @@ 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 @@ -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) @@ -318,31 +318,31 @@ 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") @@ -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): @@ -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): @@ -899,7 +899,7 @@ class SdnLcm(LcmBase): class K8sClusterLcm(LcmBase): 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,20 +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, - db=self.db, loop=self.loop, on_update_db=None, vca_config=self.vca_config, + db=self.db, + 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) @@ -963,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, @@ -1073,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 @@ -1086,10 +1096,17 @@ class K8sClusterLcm(LcmBase): 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: step = "Removing k8scluster='{}' from k8srepos".format(k8scluster_id) @@ -1138,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', @@ -1149,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"), @@ -1161,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: