From: Felipe Vicens Date: Sat, 1 Dec 2018 03:40:48 +0000 (+0100) Subject: Supporting VLDs for Netslice X-Git-Tag: v5.0.2 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=63c056b6c40157f3adb3731b3cc8af039b14f4e2;p=osm%2FLCM.git Supporting VLDs for Netslice Change-Id: I3f273734db4119b8c2c5d57f27c91612dd2317f4 Signed-off-by: Felipe Vicens --- diff --git a/osm_lcm/netslice.py b/osm_lcm/netslice.py index 6f742c2..282757f 100644 --- a/osm_lcm/netslice.py +++ b/osm_lcm/netslice.py @@ -5,15 +5,33 @@ import logging import logging.handlers import traceback import ns +import ROclient from lcm_utils import LcmException, LcmBase from osm_common.dbbase import DbException from time import time +from http import HTTPStatus +from copy import deepcopy + __author__ = "Felipe Vicens, Pol Alemany, Alfonso Tierno" +def get_iterable(in_dict, in_key): + """ + Similar to .get(), but if value is None, False, ..., An empty tuple is returned instead + :param in_dict: a dictionary + :param in_key: the key to look for at in_dict + :return: in_dict[in_var] or () if it is None or not present + """ + if not in_dict.get(in_key): + return () + return in_dict[in_key] + + class NetsliceLcm(LcmBase): + total_deploy_timeout = 2 * 3600 # global timeout for deployment + def __init__(self, db, msg, fs, lcm_tasks, ro_config, vca_config, loop): """ Init, Connect to database, filesystem storage, and messaging @@ -25,10 +43,10 @@ class NetsliceLcm(LcmBase): self.loop = loop self.lcm_tasks = lcm_tasks self.ns = ns.NsLcm(db, msg, fs, lcm_tasks, ro_config, vca_config, loop) + self.ro_config = ro_config super().__init__(db, msg, fs, self.logger) - # TODO: check logging_text within the self.logger.info/debug async def instantiate(self, nsir_id, nsilcmop_id): logging_text = "Task netslice={} instantiate={} ".format(nsir_id, nsilcmop_id) self.logger.debug(logging_text + "Enter") @@ -39,6 +57,48 @@ class NetsliceLcm(LcmBase): db_nsir_update = {"_admin.nsilcmop": nsilcmop_id} db_nsilcmop_update = {} nsilcmop_operation_state = None + vim_2_RO = {} + RO = ROclient.ROClient(self.loop, **self.ro_config) + start_deploy = time() + + def vim_account_2_RO(vim_account): + """ + Translate a RO vim_account from OSM vim_account params + :param ns_params: OSM instantiate params + :return: The RO ns descriptor + """ + if vim_account in vim_2_RO: + return vim_2_RO[vim_account] + + db_vim = self.db.get_one("vim_accounts", {"_id": vim_account}) + if db_vim["_admin"]["operationalState"] != "ENABLED": + raise LcmException("VIM={} is not available. operationalState={}".format( + vim_account, db_vim["_admin"]["operationalState"])) + RO_vim_id = db_vim["_admin"]["deployed"]["RO"] + vim_2_RO[vim_account] = RO_vim_id + return RO_vim_id + + def nsi_update_nsir(self, nsi_update_nsir, db_nsir, nsir_desc_RO): + """ + Updates database nsir with the RO info for the created vld + :param nsi_update_nsir: dictionary to be filled with the updated info + :param db_nsir: content of db_nsir. This is also modified + :param nsir_desc_RO: nsir descriptor from RO + :return: Nothing, LcmException is raised on errors + """ + + for vld_index, vld in enumerate(get_iterable(db_nsir, "vld")): + for net_RO in get_iterable(nsir_desc_RO, "nets"): + if vld["id"] != net_RO.get("ns_net_osm_id"): + continue + vld["vim-id"] = net_RO.get("vim_net_id") + vld["name"] = net_RO.get("vim_name") + vld["status"] = net_RO.get("status") + vld["status-detailed"] = net_RO.get("error_msg") + nsi_update_nsir["vld.{}".format(vld_index)] = vld + break + else: + raise LcmException("ns_update_nsir: Not found vld={} at RO info".format(vld["id"])) try: step = "Getting nsir={} from db".format(nsir_id) @@ -59,7 +119,7 @@ class NetsliceLcm(LcmBase): # Empty list to keep track of network service records status in the netslice nsir_admin = db_nsir["_admin"] - + nsir_vlds = nsir_admin["netslice-vld"] nsir_admin["nsrs-detailed-list"] = [] # Slice status Creating @@ -67,6 +127,89 @@ class NetsliceLcm(LcmBase): db_nsir_update["operational-status"] = "init" self.update_db_2("nsis", nsir_id, db_nsir_update) + # TODO: Multiple VIMs networks: datacenters + nets = [] + for netslice_vld in nsir_vlds: + RO_ns_params = {} + RO_ns_params["name"] = db_nsir["name"] + if netslice_vld.get("vim-network-name"): + if not isinstance(netslice_vld["vim-network-name"], str): + name = netslice_vld["vim-network-name"][netslice_vld["vimAccountId"]] + nets.append({"name": name, "external": False, "type": "bridge"}) + else: + nets.append({"name": netslice_vld["vim-network-name"], "external": False, "type": "bridge"}) + else: + nets.append({"name": "default", "external": False, "type": "bridge"}) + RO_ns_params["scenario"] = {"nets": nets} + RO_ns_params["datacenter"] = vim_account_2_RO(netslice_vld["vimAccountId"]) + + # Crate ns at RO + # if present use it unless in error status + RO_nsir_id = db_nsir["_admin"].get("deployed", {}).get("RO", {}).get("nsir_id") + if RO_nsir_id: + try: + step = db_nsir_update["detailed-status"] = "Looking for existing ns at RO" + # self.logger.debug(logging_text + step + " RO_ns_id={}".format(RO_nsir_id)) + desc = await RO.show("ns", RO_nsir_id) + except ROclient.ROClientException as e: + if e.http_code != HTTPStatus.NOT_FOUND: + raise + RO_nsir_id = db_nsir_update["_admin.deployed.RO.nsir_id"] = None + if RO_nsir_id: + ns_status, ns_status_info = RO.check_ns_status(desc) + db_nsir_update["_admin.deployed.RO.nsir_status"] = ns_status + if ns_status == "ERROR": + step = db_nsir_update["detailed-status"] = "Deleting ns at RO. RO_ns_id={}".format(RO_nsir_id) + self.logger.debug(logging_text + step) + await RO.delete("ns", RO_nsir_id) + RO_nsir_id = db_nsir_update["_admin.deployed.RO.nsir_id"] = None + if not RO_nsir_id: + step = db_nsir_update["detailed-status"] = "Checking dependencies" + # self.logger.debug(logging_text + step) + # check if VIM is creating and wait look if previous tasks in process + for vimAccountId_unit in RO_ns_params["datacenter"]: + task_name, task_dependency = self.lcm_tasks.lookfor_related("vim_account", vimAccountId_unit) + if task_dependency: + step = "Waiting for related tasks to be completed: {}".format(task_name) + self.logger.debug(logging_text + step) + await asyncio.wait(task_dependency, timeout=3600) + + step = db_nsir_update["detailed-status"] = "Creating ns at RO" + desc = await RO.create("ns", descriptor=RO_ns_params) + RO_nsir_id = db_nsir_update["_admin.deployed.RO.nsir_id"] = desc["uuid"] + db_nsir_update["_admin.nsState"] = "INSTANTIATED" + db_nsir_update["_admin.deployed.RO.nsir_status"] = "BUILD" + self.logger.debug(logging_text + "ns created at RO. RO_id={}".format(desc["uuid"])) + self.update_db_2("nsis", nsir_id, db_nsir_update) + + # wait until NS scenario for netslice-vld is ready + step = ns_status_detailed = detailed_status = "Waiting ns ready at RO. RO_id={}".format(RO_nsir_id) + detailed_status_old = None + self.logger.debug(logging_text + step) + + while time() <= start_deploy + self.total_deploy_timeout: + desc = await RO.show("ns", RO_nsir_id) + ns_status, ns_status_info = RO.check_ns_status(desc) + db_nsir_update["admin.deployed.RO.nsir_status"] = ns_status + db_nsir_update["admin.deployed.RO.nsr_id"] = desc.get("uuid") + if ns_status == "ERROR": + raise ROclient.ROClientException(ns_status_info) + elif ns_status == "BUILD": + detailed_status = ns_status_detailed + "; {}".format(ns_status_info) + elif ns_status == "ACTIVE": + break + else: + assert False, "ROclient.check_ns_status returns unknown {}".format(ns_status) + if detailed_status != detailed_status_old: + detailed_status_old = db_nsir_update["detailed-status"] = detailed_status + self.update_db_2("nsis", nsir_id, db_nsir_update) + await asyncio.sleep(5, loop=self.loop) + else: # total_deploy_timeout + raise ROclient.ROClientException("Timeout waiting ns to be ready") + + step = "Updating NSIR" + nsi_update_nsir(self, db_nsir_update, db_nsir, desc) + # Iterate over the network services operation ids to instantiate NSs # TODO: (future improvement) look another way check the tasks instead of keep asking # -> https://docs.python.org/3/library/asyncio-task.html#waiting-primitives @@ -101,6 +244,7 @@ class NetsliceLcm(LcmBase): if status not in ["COMPLETED", "PARTIALLY_COMPLETED", "FAILED", "FAILED_TEMP"]: nsi_ready = False + # TODO: Check admin and _admin if nsrs_detailed_list != nsrs_detailed_list_old: nsir_admin["nsrs-detailed-list"] = nsrs_detailed_list nsrs_detailed_list_old = nsrs_detailed_list @@ -172,10 +316,13 @@ class NetsliceLcm(LcmBase): db_nsilcmop = None db_nsir_update = {"_admin.nsilcmop": nsilcmop_id} db_nsilcmop_update = {} + RO = ROclient.ROClient(self.loop, **self.ro_config) + failed_detail = [] # annotates all failed error messages nsilcmop_operation_state = None try: step = "Getting nsir={} from db".format(nsir_id) db_nsir = self.db.get_one("nsis", {"_id": nsir_id}) + nsir_deployed = deepcopy(db_nsir["admin"].get("deployed")) step = "Getting nsilcmop={} from db".format(nsilcmop_id) db_nsilcmop = self.db.get_one("nsilcmops", {"_id": nsilcmop_id}) @@ -255,6 +402,60 @@ class NetsliceLcm(LcmBase): if termination_timeout <= 0: raise LcmException("Timeout waiting nsi to be terminated. nsi_id={}".format(nsir_id)) + # Delete ns + RO_nsir_id = RO_delete_action = None + if nsir_deployed and nsir_deployed.get("RO"): + RO_nsir_id = nsir_deployed["RO"].get("nsr_id") + RO_delete_action = nsir_deployed["RO"].get("nsr_delete_action_id") + try: + if RO_nsir_id: + step = db_nsir_update["detailed-status"] = "Deleting ns at RO" + db_nsilcmop_update["detailed-status"] = "Deleting ns at RO" + self.logger.debug(logging_text + step) + desc = await RO.delete("ns", RO_nsir_id) + RO_delete_action = desc["action_id"] + db_nsir_update["_admin.deployed.RO.nsr_delete_action_id"] = RO_delete_action + db_nsir_update["_admin.deployed.RO.nsr_id"] = None + db_nsir_update["_admin.deployed.RO.nsr_status"] = "DELETED" + if RO_delete_action: + # wait until NS is deleted from VIM + step = detailed_status = "Waiting ns deleted from VIM. RO_id={}".format(RO_nsir_id) + detailed_status_old = None + self.logger.debug(logging_text + step) + + delete_timeout = 20 * 60 # 20 minutes + while delete_timeout > 0: + desc = await RO.show("ns", item_id_name=RO_nsir_id, extra_item="action", + extra_item_id=RO_delete_action) + ns_status, ns_status_info = RO.check_action_status(desc) + if ns_status == "ERROR": + raise ROclient.ROClientException(ns_status_info) + elif ns_status == "BUILD": + detailed_status = step + "; {}".format(ns_status_info) + elif ns_status == "ACTIVE": + break + else: + assert False, "ROclient.check_action_status returns unknown {}".format(ns_status) + await asyncio.sleep(5, loop=self.loop) + delete_timeout -= 5 + if detailed_status != detailed_status_old: + detailed_status_old = db_nsilcmop_update["detailed-status"] = detailed_status + self.update_db_2("nslcmops", nslcmop_id, db_nsilcmop_update) + else: # delete_timeout <= 0: + raise ROclient.ROClientException("Timeout waiting ns deleted from VIM") + + except ROclient.ROClientException as e: + if e.http_code == 404: # not found + db_nsir_update["_admin.deployed.RO.nsr_id"] = None + db_nsir_update["_admin.deployed.RO.nsr_status"] = "DELETED" + self.logger.debug(logging_text + "RO_ns_id={} already deleted".format(RO_nsir_id)) + elif e.http_code == 409: # conflict + failed_detail.append("RO_ns_id={} delete conflict: {}".format(RO_nsir_id, e)) + self.logger.debug(logging_text + failed_detail[-1]) + else: + failed_detail.append("RO_ns_id={} delete error: {}".format(RO_nsir_id, e)) + self.logger.error(logging_text + failed_detail[-1]) + db_nsir_update["operational-status"] = "terminated" db_nsir_update["config-status"] = "configured" db_nsir_update["detailed-status"] = "done"