X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osm_lcm%2Flcm.py;h=83efbca9ddc78b126c378b1052893f370e31f637;hb=refs%2Fchanges%2F09%2F6309%2F1;hp=8cc53505041bb1445fd0b86f31d033d22616468f;hpb=275411e13bbfb20d8045c5425b20d46a5c8638ec;p=osm%2FLCM.git diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py index 8cc5350..83efbca 100644 --- a/osm_lcm/lcm.py +++ b/osm_lcm/lcm.py @@ -56,9 +56,9 @@ class Lcm: # load configuration config = self.read_config_file(config_file) self.config = config - self.ro_config={ + self.ro_config = { "endpoint_url": "http://{}:{}/openmano".format(config["RO"]["host"], config["RO"]["port"]), - "tenant": config.get("tenant", "osm"), + "tenant": config.get("tenant", "osm"), "logger_name": "lcm.ROclient", "loglevel": "ERROR", } @@ -163,14 +163,23 @@ class Lcm: self.logger.debug(logging_text + "Enter") db_vim = None exc = None + RO_sdn_id = None try: - step = "Getting vim from db" + step = "Getting vim-id='{}' from db".format(vim_id) db_vim = self.db.get_one("vim_accounts", {"_id": vim_id}) if "_admin" not in db_vim: db_vim["_admin"] = {} if "deployed" not in db_vim["_admin"]: db_vim["_admin"]["deployed"] = {} db_vim["_admin"]["deployed"]["RO"] = None + if vim_content.get("config") and vim_content["config"].get("sdn-controller"): + step = "Getting sdn-controller-id='{}' from db".format(vim_content["config"]["sdn-controller"]) + db_sdn = self.db.get_one("sdns", {"_id": vim_content["config"]["sdn-controller"]}) + if db_sdn.get("_admin") and db_sdn["_admin"].get("deployed") and db_sdn["_admin"]["deployed"].get("RO"): + RO_sdn_id = db_sdn["_admin"]["deployed"]["RO"] + else: + raise LcmException("sdn-controller={} is not available. Not deployed at RO".format( + vim_content["config"]["sdn-controller"])) step = "Creating vim at RO" RO = ROclient.ROClient(self.loop, **self.ro_config) @@ -183,18 +192,25 @@ class Lcm: vim_RO["type"] = vim_RO.pop("vim_type") vim_RO.pop("vim_user", None) vim_RO.pop("vim_password", None) + if RO_sdn_id: + vim_RO["config"]["sdn-controller"] = RO_sdn_id desc = await RO.create("vim", descriptor=vim_RO) RO_vim_id = desc["uuid"] db_vim["_admin"]["deployed"]["RO"] = RO_vim_id self.update_db("vim_accounts", vim_id, db_vim) - step = "Attach vim to RO tenant" - vim_RO = {"vim_tenant_name": vim_content["vim_tenant_name"], - "vim_username": vim_content["vim_user"], - "vim_password": vim_content["vim_password"], - "config": vim_content["config"] - } - desc = await RO.attach_datacenter(RO_vim_id , descriptor=vim_RO) + step = "Creating vim_account at RO" + vim_account_RO = {"vim_tenant_name": vim_content["vim_tenant_name"], + "vim_username": vim_content["vim_user"], + "vim_password": vim_content["vim_password"] + } + if vim_RO.get("config"): + vim_account_RO["config"] = vim_RO["config"] + if "sdn-controller" in vim_account_RO["config"]: + del vim_account_RO["config"]["sdn-controller"] + if "sdn-port-mapping" in vim_account_RO["config"]: + del vim_account_RO["config"]["sdn-port-mapping"] + await RO.attach_datacenter(RO_vim_id, descriptor=vim_account_RO) db_vim["_admin"]["operationalState"] = "ENABLED" self.update_db("vim_accounts", vim_id, db_vim) @@ -210,7 +226,7 @@ class Lcm: finally: if exc and db_vim: db_vim["_admin"]["operationalState"] = "ERROR" - db_vim["_admin"]["detailed-status"] = "ERROR {}: {}".format(step , exc) + db_vim["_admin"]["detailed-status"] = "ERROR {}: {}".format(step, exc) self.update_db("vim_accounts", vim_id, db_vim) async def vim_edit(self, vim_content, order_id): @@ -219,10 +235,21 @@ class Lcm: self.logger.debug(logging_text + "Enter") db_vim = None exc = None - step = "Getting vim from db" + RO_sdn_id = None + step = "Getting vim-id='{}' from db".format(vim_id) try: 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"): + if vim_content.get("config") and vim_content["config"].get("sdn-controller"): + step = "Getting sdn-controller-id='{}' from db".format(vim_content["config"]["sdn-controller"]) + db_sdn = self.db.get_one("sdns", {"_id": vim_content["config"]["sdn-controller"]}) + if db_sdn.get("_admin") and db_sdn["_admin"].get("deployed") and db_sdn["_admin"]["deployed"].get( + "RO"): + RO_sdn_id = db_sdn["_admin"]["deployed"]["RO"] + else: + raise LcmException("sdn-controller={} is not available. Not deployed at RO".format( + vim_content["config"]["sdn-controller"])) + RO_vim_id = db_vim["_admin"]["deployed"]["RO"] step = "Editing vim at RO" RO = ROclient.ROClient(self.loop, **self.ro_config) @@ -232,21 +259,33 @@ class Lcm: vim_RO.pop("schema_version", None) vim_RO.pop("schema_type", None) vim_RO.pop("vim_tenant_name", None) - vim_RO["type"] = vim_RO.pop("vim_type") + if "vim_type" in vim_RO: + vim_RO["type"] = vim_RO.pop("vim_type") vim_RO.pop("vim_user", None) 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 if vim_RO: - desc = await RO.edit("vim", RO_vim_id, descriptor=vim_RO) + await RO.edit("vim", RO_vim_id, descriptor=vim_RO) step = "Editing vim-account at RO tenant" - vim_RO = {} + vim_account_RO = {} + if "config" in vim_content: + if "sdn-controller" in vim_content["config"]: + del vim_content["config"]["sdn-controller"] + if "sdn-port-mapping" in vim_content["config"]: + del vim_content["config"]["sdn-port-mapping"] + if not vim_content["config"]: + del vim_content["config"] for k in ("vim_tenant_name", "vim_password", "config"): if k in vim_content: - vim_RO[k] = vim_content[k] + vim_account_RO[k] = vim_content[k] if "vim_user" in vim_content: vim_content["vim_username"] = vim_content["vim_user"] - if vim_RO: - desc = await RO.edit("vim_account", RO_vim_id, descriptor=vim_RO) + # vim_account must be edited always even if empty in order to ensure changes are translated to RO + # vim_thread. RO will remove and relaunch a new thread for this vim_account + await RO.edit("vim_account", RO_vim_id, descriptor=vim_account_RO) db_vim["_admin"]["operationalState"] = "ENABLED" self.update_db("vim_accounts", vim_id, db_vim) @@ -262,7 +301,7 @@ class Lcm: finally: if exc and db_vim: db_vim["_admin"]["operationalState"] = "ERROR" - db_vim["_admin"]["detailed-status"] = "ERROR {}: {}".format(step , exc) + db_vim["_admin"]["detailed-status"] = "ERROR {}: {}".format(step, exc) self.update_db("vim_accounts", vim_id, db_vim) async def vim_delete(self, vim_id, order_id): @@ -309,7 +348,7 @@ class Lcm: finally: if exc and db_vim: db_vim["_admin"]["operationalState"] = "ERROR" - db_vim["_admin"]["detailed-status"] = "ERROR {}: {}".format(step , exc) + db_vim["_admin"]["detailed-status"] = "ERROR {}: {}".format(step, exc) self.update_db("vim_accounts", vim_id, db_vim) async def sdn_create(self, sdn_content, order_id): @@ -325,7 +364,7 @@ class Lcm: db_sdn["_admin"] = {} if "deployed" not in db_sdn["_admin"]: db_sdn["_admin"]["deployed"] = {} - db_sdn["_admin"]["deployed"]["RO"] = None + db_sdn["_admin"]["deployed"]["RO"] = None step = "Creating sdn at RO" RO = ROclient.ROClient(self.loop, **self.ro_config) @@ -352,7 +391,7 @@ class Lcm: finally: if exc and db_sdn: db_sdn["_admin"]["operationalState"] = "ERROR" - db_sdn["_admin"]["detailed-status"] = "ERROR {}: {}".format(step , exc) + db_sdn["_admin"]["detailed-status"] = "ERROR {}: {}".format(step, exc) self.update_db("sdns", sdn_id, db_sdn) async def sdn_edit(self, sdn_content, order_id): @@ -375,7 +414,7 @@ class Lcm: sdn_RO.pop("schema_type", None) sdn_RO.pop("description", None) if sdn_RO: - desc = await RO.edit("sdn", RO_sdn_id, descriptor=sdn_RO) + await RO.edit("sdn", RO_sdn_id, descriptor=sdn_RO) db_sdn["_admin"]["operationalState"] = "ENABLED" self.update_db("sdns", sdn_id, db_sdn) @@ -391,7 +430,7 @@ class Lcm: finally: if exc and db_sdn: db_sdn["_admin"]["operationalState"] = "ERROR" - db_sdn["_admin"]["detailed-status"] = "ERROR {}: {}".format(step , exc) + db_sdn["_admin"]["detailed-status"] = "ERROR {}: {}".format(step, exc) self.update_db("sdns", sdn_id, db_sdn) async def sdn_delete(self, sdn_id, order_id): @@ -429,7 +468,7 @@ class Lcm: finally: if exc and db_sdn: db_sdn["_admin"]["operationalState"] = "ERROR" - db_sdn["_admin"]["detailed-status"] = "ERROR {}: {}".format(step , exc) + db_sdn["_admin"]["detailed-status"] = "ERROR {}: {}".format(step, exc) self.update_db("sdns", sdn_id, db_sdn) def vnfd2RO(self, vnfd, new_id=None): @@ -455,7 +494,8 @@ class Lcm: vdu["cloud-init-file"] ) ci_file = self.fs.file_open(clout_init_file, "r") - # TODO: detect if binary or text. Propose to read as binary and try to decode to utf8. If fails convert to base 64 or similar + # TODO: detect if binary or text. Propose to read as binary and try to decode to utf8. If fails + # convert to base 64 or similar clout_init_content = ci_file.read() ci_file.close() ci_file = None @@ -468,7 +508,8 @@ class Lcm: if ci_file: ci_file.close() - def n2vc_callback(self, model_name, application_name, status, message, db_nsr, db_nslcmop, member_vnf_index, task=None): + def n2vc_callback(self, model_name, application_name, status, message, db_nsr, db_nslcmop, member_vnf_index, + task=None): """ Callback both for charm status change and task completion :param model_name: Charm model name @@ -554,10 +595,11 @@ class Lcm: all_active = False elif vca_status in ("error", "blocked"): n2vc_error_text.append("member_vnf_index={} {}: {}".format(member_vnf_index, vca_status, - vca_info["detailed-status"])) + vca_info["detailed-status"])) if all_active: - self.logger.debug("[n2vc_callback] ns_instantiate={} vnf_index={} All active".format(nsr_id, member_vnf_index)) + self.logger.debug("[n2vc_callback] ns_instantiate={} vnf_index={} All active".format(nsr_id, + member_vnf_index)) db_nsr["config-status"] = "configured" db_nsr["detailed-status"] = "done" db_nslcmop["operationState"] = "COMPLETED" @@ -600,6 +642,7 @@ class Lcm: :return: The RO ns descriptor """ vim_2_RO = {} + def vim_account_2_RO(vim_account): if vim_account in vim_2_RO: return vim_2_RO[vim_account] @@ -645,8 +688,8 @@ class Lcm: "netmap-use": vim_net, "datacenter": vim_account_2_RO(vim_account) }) - else: #isinstance str - RO_vld["sites"].append({"netmap-use": vld["vim-network-name"]}) + else: # isinstance str + RO_vld["sites"].append({"netmap-use": vld["vim-network-name"]}) if RO_vld: RO_ns_params["networks"][vld["name"]] = RO_vld return RO_ns_params @@ -659,9 +702,10 @@ class Lcm: db_nslcmop = None db_vnfr = {} exc = None - step = "Getting nsr, nslcmop, RO_vims from db" try: + step = "Getting nslcmop={} from db".format(nslcmop_id) db_nslcmop = self.db.get_one("nslcmops", {"_id": nslcmop_id}) + step = "Getting nsr={} from db".format(nsr_id) db_nsr = self.db.get_one("nsrs", {"_id": nsr_id}) nsd = db_nsr["nsd"] nsr_name = db_nsr["name"] # TODO short-name?? @@ -691,32 +735,34 @@ class Lcm: # get vnfds, instantiate at RO for vnfd_id, vnfd in needed_vnfd.items(): step = db_nsr["detailed-status"] = "Creating vnfd={} at RO".format(vnfd_id) - self.logger.debug(logging_text + step) + # self.logger.debug(logging_text + step) vnfd_id_RO = nsr_id + "." + vnfd_id[:200] # look if present vnfd_list = await RO.get_list("vnfd", filter_by={"osm_id": vnfd_id_RO}) if vnfd_list: nsr_lcm["RO"]["vnfd_id"][vnfd_id] = vnfd_list[0]["uuid"] - self.logger.debug(logging_text + "RO vnfd={} exist. Using RO_id={}".format( + self.logger.debug(logging_text + "vnfd={} exists at RO. Using RO_id={}".format( vnfd_id, vnfd_list[0]["uuid"])) else: vnfd_RO = self.vnfd2RO(vnfd, vnfd_id_RO) desc = await RO.create("vnfd", descriptor=vnfd_RO) nsr_lcm["RO"]["vnfd_id"][vnfd_id] = desc["uuid"] db_nsr["_admin"]["nsState"] = "INSTANTIATED" + self.logger.debug(logging_text + "vnfd={} created at RO. RO_id={}".format( + vnfd_id, desc["uuid"])) self.update_db("nsrs", nsr_id, db_nsr) # create nsd at RO nsd_id = nsd["id"] step = db_nsr["detailed-status"] = "Creating nsd={} at RO".format(nsd_id) - self.logger.debug(logging_text + step) + # self.logger.debug(logging_text + step) - nsd_id_RO = nsd_id + "." + nsd_id[:200] + nsd_id_RO = nsr_id + "." + nsd_id[:200] nsd_list = await RO.get_list("nsd", filter_by={"osm_id": nsd_id_RO}) if nsd_list: nsr_lcm["RO"]["nsd_id"] = nsd_list[0]["uuid"] - self.logger.debug(logging_text + "RO nsd={} exist. Using RO_id={}".format( + self.logger.debug(logging_text + "nsd={} exists at RO. Using RO_id={}".format( nsd_id, nsd_list[0]["uuid"])) else: nsd_RO = deepcopy(nsd) @@ -729,6 +775,7 @@ class Lcm: desc = await RO.create("nsd", descriptor=nsd_RO) db_nsr["_admin"]["nsState"] = "INSTANTIATED" nsr_lcm["RO"]["nsd_id"] = desc["uuid"] + self.logger.debug(logging_text + "nsd={} created at RO. RO_id={}".format(nsd_id, desc["uuid"])) self.update_db("nsrs", nsr_id, db_nsr) # Crate ns at RO @@ -737,7 +784,7 @@ class Lcm: if RO_nsr_id: try: step = db_nsr["detailed-status"] = "Looking for existing ns at RO" - self.logger.debug(logging_text + step + " RO_ns_id={}".format(RO_nsr_id)) + # self.logger.debug(logging_text + step + " RO_ns_id={}".format(RO_nsr_id)) desc = await RO.show("ns", RO_nsr_id) except ROclient.ROClientException as e: if e.http_code != HTTPStatus.NOT_FOUND: @@ -747,13 +794,13 @@ class Lcm: ns_status, ns_status_info = RO.check_ns_status(desc) nsr_lcm["RO"]["nsr_status"] = ns_status if ns_status == "ERROR": - step = db_nsr["detailed-status"] = "Deleting ns at RO" - self.logger.debug(logging_text + step + " RO_ns_id={}".format(RO_nsr_id)) + step = db_nsr["detailed-status"] = "Deleting ns at RO. RO_ns_id={}".format(RO_nsr_id) + self.logger.debug(logging_text + step) await RO.delete("ns", RO_nsr_id) RO_nsr_id = nsr_lcm["RO"]["nsr_id"] = None if not RO_nsr_id: step = db_nsr["detailed-status"] = "Creating ns at RO" - self.logger.debug(logging_text + step) + # self.logger.debug(logging_text + step) RO_ns_params = self.ns_params_2_RO(db_nsr.get("instantiate_params")) desc = await RO.create("ns", descriptor=RO_ns_params, name=db_nsr["name"], @@ -761,25 +808,28 @@ class Lcm: RO_nsr_id = nsr_lcm["RO"]["nsr_id"] = desc["uuid"] db_nsr["_admin"]["nsState"] = "INSTANTIATED" nsr_lcm["RO"]["nsr_status"] = "BUILD" - + self.logger.debug(logging_text + "ns created at RO. RO_id={}".format(desc["uuid"])) self.update_db("nsrs", nsr_id, db_nsr) + # update VNFR vimAccount step = "Updating VNFR vimAcccount" for vnf_index, vnfr in db_vnfr.items(): if vnfr.get("vim-account-id"): continue - if db_nsr["instantiate_params"].get("vnf") and db_nsr["instantiate_params"]["vnf"].get(vnf_index) \ - and db_nsr["instantiate_params"]["vnf"][vnf_index].get("vimAccountId"): - vnfr["vim-account-id"] = db_nsr["instantiate_params"]["vnf"][vnf_index]["vimAccountId"] - else: - vnfr["vim-account-id"] = db_nsr["instantiate_params"]["vimAccountId"] + vnfr["vim-account-id"] = db_nsr["instantiate_params"]["vimAccountId"] + if db_nsr["instantiate_params"].get("vnf"): + for vnf_params in db_nsr["instantiate_params"]["vnf"]: + if vnf_params.get("member-vnf-index") == vnf_index: + if vnf_params.get("vimAccountId"): + vnfr["vim-account-id"] = vnf_params.get("vimAccountId") + break self.update_db("vnfrs", vnfr["_id"], vnfr) # wait until NS is ready - step = ns_status_detailed = "Waiting ns ready at RO" + step = ns_status_detailed = "Waiting ns ready at RO. RO_id={}".format(RO_nsr_id) db_nsr["detailed-status"] = ns_status_detailed - self.logger.debug(logging_text + step + " RO_ns_id={}".format(RO_nsr_id)) - deployment_timeout = 2*3600 # Two hours + self.logger.debug(logging_text + step) + deployment_timeout = 2 * 3600 # Two hours while deployment_timeout > 0: desc = await RO.show("ns", RO_nsr_id) ns_status, ns_status_info = RO.check_ns_status(desc) @@ -805,6 +855,7 @@ class Lcm: deployment_timeout -= 5 if deployment_timeout <= 0: raise ROclient.ROClientException("Timeout waiting ns to be ready") + step = "Updating VNFRs" for vnf_index, vnfr_deployed in ns_RO_info.items(): vnfr = db_vnfr[vnf_index] @@ -834,7 +885,7 @@ class Lcm: # yield from asyncio.wait_for(task, 30.0) # self.logger.debug("Logged into N2VC!") - ## await self.n2vc.login() + # # await self.n2vc.login() # Note: The charm needs to exist on disk at the location # specified by charm_path. @@ -867,7 +918,8 @@ class Lcm: "vnfd_id": vnfd_id, } - self.logger.debug("Task create_ns={} Passing artifacts path '{}' for {}".format(nsr_id, charm_path, proxy_charm)) + self.logger.debug("Task create_ns={} Passing artifacts path '{}' for {}".format(nsr_id, charm_path, + proxy_charm)) task = asyncio.ensure_future( self.n2vc.DeployCharms( model_name, # The network service name @@ -935,6 +987,7 @@ class Lcm: db_nslcmop["detailed-status"] = "configuring: init: {}".format(number_to_configure) else: db_nslcmop["operationState"] = "COMPLETED" + db_nslcmop["statusEnteredTime"] = time() db_nslcmop["detailed-status"] = "done" db_nsr["config-status"] = "configured" db_nsr["detailed-status"] = "done" @@ -945,10 +998,11 @@ class Lcm: return nsr_lcm except (ROclient.ROClientException, DbException, LcmException) as e: - self.logger.error(logging_text + "Exit Exception {}".format(e)) + self.logger.error(logging_text + "Exit Exception while '{}': {}".format(step, e)) exc = e except Exception as e: - self.logger.critical(logging_text + "Exit Exception {} {}".format(type(e).__name__, e), exc_info=True) + self.logger.critical(logging_text + "Exit Exception {} while '{}': {}".format(type(e).__name__, step, e), + exc_info=True) exc = e finally: if exc: @@ -1022,7 +1076,7 @@ class Lcm: try: step = db_nsr["detailed-status"] = "Deleting ns at RO" self.logger.debug(logging_text + step) - desc = await RO.delete("ns", RO_nsr_id) + await RO.delete("ns", RO_nsr_id) nsr_lcm["RO"]["nsr_id"] = None nsr_lcm["RO"]["nsr_status"] = "DELETED" except ROclient.ROClientException as e: @@ -1030,7 +1084,7 @@ class Lcm: nsr_lcm["RO"]["nsr_id"] = None nsr_lcm["RO"]["nsr_status"] = "DELETED" self.logger.debug(logging_text + "RO_ns_id={} already deleted".format(RO_nsr_id)) - elif e.http_code == 409: #conflict + elif e.http_code == 409: # conflict failed_detail.append("RO_ns_id={} delete conflict: {}".format(RO_nsr_id, e)) self.logger.debug(logging_text + failed_detail[-1]) else: @@ -1042,14 +1096,14 @@ class Lcm: if RO_nsd_id: try: step = db_nsr["detailed-status"] = "Deleting nsd at RO" - desc = await RO.delete("nsd", RO_nsd_id) + await RO.delete("nsd", RO_nsd_id) self.logger.debug(logging_text + "RO_nsd_id={} deleted".format(RO_nsd_id)) nsr_lcm["RO"]["nsd_id"] = None except ROclient.ROClientException as e: if e.http_code == 404: # not found nsr_lcm["RO"]["nsd_id"] = None self.logger.debug(logging_text + "RO_nsd_id={} already deleted".format(RO_nsd_id)) - elif e.http_code == 409: #conflict + elif e.http_code == 409: # conflict failed_detail.append("RO_nsd_id={} delete conflict: {}".format(RO_nsd_id, e)) self.logger.debug(logging_text + failed_detail[-1]) else: @@ -1061,14 +1115,14 @@ class Lcm: continue try: step = db_nsr["detailed-status"] = "Deleting vnfd={} at RO".format(vnf_id) - desc = await RO.delete("vnfd", RO_vnfd_id) + await RO.delete("vnfd", RO_vnfd_id) self.logger.debug(logging_text + "RO_vnfd_id={} deleted".format(RO_vnfd_id)) nsr_lcm["RO"]["vnfd_id"][vnf_id] = None except ROclient.ROClientException as e: if e.http_code == 404: # not found nsr_lcm["RO"]["vnfd_id"][vnf_id] = None self.logger.debug(logging_text + "RO_vnfd_id={} already deleted ".format(RO_vnfd_id)) - elif e.http_code == 409: #conflict + elif e.http_code == 409: # conflict failed_detail.append("RO_vnfd_id={} delete conflict: {}".format(RO_vnfd_id, e)) self.logger.debug(logging_text + failed_detail[-1]) else: @@ -1096,7 +1150,7 @@ class Lcm: db_nsr_update = { "operational-status": "failed", "detailed-status": "Deletion errors " + "; ".join(failed_detail), - "_admin": {"deployed": nsr_lcm, } + "_admin.deployed": nsr_lcm } db_nslcmop_update = { "detailed-status": "; ".join(failed_detail), @@ -1107,11 +1161,13 @@ class Lcm: self.db.del_one("nsrs", {"_id": nsr_id}) self.db.del_list("nslcmops", {"nsInstanceId": nsr_id}) self.db.del_list("vnfrs", {"nsr-id-ref": nsr_id}) + self.logger.debug(logging_text + "Delete from database") else: db_nsr_update = { "operational-status": "terminated", "detailed-status": "Done", - "_admin": {"deployed": nsr_lcm, "nsState": "NOT_INSTANTIATED"} + "_admin.deployed": nsr_lcm, + "_admin.nsState": "NOT_INSTANTIATED" } db_nslcmop_update = { "detailed-status": "Done", @@ -1153,7 +1209,7 @@ class Lcm: nsr_lcm = db_nsr["_admin"].get("deployed") vnf_index = db_nslcmop["operationParams"]["member_vnf_index"] - #TODO check if ns is in a proper status + # TODO check if ns is in a proper status vca_deployed = nsr_lcm["VCA"].get(vnf_index) if not vca_deployed: raise LcmException("charm for member_vnf_index={} is not deployed".format(vnf_index)) @@ -1238,9 +1294,9 @@ class Lcm: """ if topic == "ns": lcm_tasks = self.lcm_ns_tasks - elif topic== "vim_account": + elif topic == "vim_account": lcm_tasks = self.lcm_vim_tasks - elif topic== "sdn": + elif topic == "sdn": lcm_tasks = self.lcm_sdn_tasks if not lcm_tasks.get(_id): @@ -1260,7 +1316,7 @@ class Lcm: self.pings_not_received = 1 while True: try: - await self.msg.aiowrite("admin", "ping", {"from": "lcm", "to": "lcm"}, self.loop) + await self.msg.aiowrite("admin", "ping", {"from": "lcm", "to": "lcm"}, self.loop) # time between pings are low when it is not received and at starting wait_time = 5 if not kafka_has_received else 120 if not self.pings_not_received: @@ -1294,7 +1350,8 @@ class Lcm: try: topics = ("admin", "ns", "vim_account", "sdn") topic, command, params = await self.msg.aioread(topics, self.loop) - self.logger.debug("Task kafka_read receives {} {}: {}".format(topic, command, params)) + if topic != "admin" and command != "ping": + self.logger.debug("Task kafka_read receives {} {}: {}".format(topic, command, params)) consecutive_errors = 0 first_start = False order_id += 1 @@ -1351,12 +1408,11 @@ class Lcm: elif command == "show": try: db_nsr = self.db.get_one("nsrs", {"_id": nsr_id}) - print( - "nsr:\n _id={}\n operational-status: {}\n config-status: {}\n detailed-status: " - "{}\n deploy: {}\n tasks: {}".format( - nsr_id, db_nsr["operational-status"], - db_nsr["config-status"], db_nsr["detailed-status"], - db_nsr["_admin"]["deployed"], self.lcm_ns_tasks.get(nsr_id))) + print("nsr:\n _id={}\n operational-status: {}\n config-status: {}" + "\n detailed-status: {}\n deploy: {}\n tasks: {}" + "".format(nsr_id, db_nsr["operational-status"], db_nsr["config-status"], + db_nsr["detailed-status"], + db_nsr["_admin"]["deployed"], self.lcm_ns_tasks.get(nsr_id))) except Exception as e: print("nsr {} not found: {}".format(nsr_id, e)) sys.stdout.flush() @@ -1383,7 +1439,7 @@ class Lcm: sys.stdout.flush() continue elif command == "edit": - task = asyncio.ensure_future(self.vim_edit(vim_id, order_id)) + task = asyncio.ensure_future(self.vim_edit(params, order_id)) if vim_id not in self.lcm_vim_tasks: self.lcm_vim_tasks[vim_id] = {} self.lcm_vim_tasks[vim_id][order_id] = {"vim_edit": task} @@ -1404,7 +1460,7 @@ class Lcm: self.lcm_sdn_tasks[_sdn_id][order_id] = {"sdn_delete": task} continue elif command == "edit": - task = asyncio.ensure_future(self.sdn_edit(_sdn_id, order_id)) + task = asyncio.ensure_future(self.sdn_edit(params, order_id)) if _sdn_id not in self.lcm_sdn_tasks: self.lcm_sdn_tasks[_sdn_id] = {} self.lcm_sdn_tasks[_sdn_id][order_id] = {"sdn_edit": task} @@ -1485,8 +1541,8 @@ def usage(): -c|--config [configuration_file]: loads the configuration file (default: ./nbi.cfg) -h|--help: shows this help """.format(sys.argv[0])) - # --log-socket-host HOST: send logs to this host") - # --log-socket-port PORT: send logs using this port (default: 9022)") + # --log-socket-host HOST: send logs to this host") + # --log-socket-port PORT: send logs using this port (default: 9022)") if __name__ == '__main__':