X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fengine.py;h=aaa94f0ed76d671693eb9b91d482fe3c9d5ee0f4;hb=refs%2Fchanges%2F61%2F6261%2F10;hp=b5989c0aa9e551ad66ab46207d49147397baba33;hpb=956924429d324ed432b2f9bf6ec0ceff437486ad;p=osm%2FNBI.git diff --git a/osm_nbi/engine.py b/osm_nbi/engine.py index b5989c0..aaa94f0 100644 --- a/osm_nbi/engine.py +++ b/osm_nbi/engine.py @@ -342,16 +342,22 @@ class Engine(object): :param indata: descriptor with the parameters of the operation :return: None """ - if operation == "action": - if indata.get("vnf_member_index"): - indata["member_vnf_index"] = indata.pop("vnf_member_index") # for backward compatibility + def check_valid_vnf_member_index(member_vnf_index): for vnf in nsr["nsd"]["constituent-vnfd"]: - if indata["member_vnf_index"] == vnf["member-vnf-index"]: - # TODO get vnfd, check primitives + if member_vnf_index == vnf["member-vnf-index"]: break else: - raise EngineException("Invalid parameter member_vnf_index='{}' is not one of the nsd " - "constituent-vnfd".format(indata["member_vnf_index"])) + raise EngineException("Invalid parameter member_vnf_index='{}' is not one of the " + "nsd:constituent-vnfd".format(member_vnf_index)) + + if operation == "action": + if indata.get("vnf_member_index"): + indata["member_vnf_index"] = indata.pop("vnf_member_index") # for backward compatibility + check_valid_vnf_member_index(indata["member_vnf_index"]) + # TODO get vnfd, check primitives + if operation == "scale": + check_valid_vnf_member_index(indata["scaleVnfData"]["scaleByStepData"]["member-vnf-index"]) + # TODO check vnf scaling primitives def _format_new_data(self, session, item, indata): now = time() @@ -530,14 +536,15 @@ class Engine(object): if file_pkg: file_pkg.close() - def new_nsr(self, session, ns_request): + def new_nsr(self, rollback, session, ns_request): """ Creates a new nsr into database. It also creates needed vnfrs + :param rollback: list where this method appends created items at database in case a rollback may to be done :param session: contains the used login username and working project :param ns_request: params to be used for the nsr :return: the _id of nsr descriptor stored at database """ - rollback = [] + rollback_index = len(rollback) step = "" try: # look for nsr @@ -603,7 +610,7 @@ class Engine(object): "created-time": now, # "vnfd": vnfd, # at OSM model.but removed to avoid data duplication TODO: revise "vnfd-ref": vnfd_id, - "vnfd-id": vnfr_id, # not at OSM model, but useful + "vnfd-id": vnfd["_id"], # not at OSM model, but useful "vim-account-id": None, "vdur": [], "connection-point": [], @@ -623,9 +630,11 @@ class Engine(object): vdur = { "id": vdur_id, "vdu-id-ref": vdu["id"], + # TODO "name": "" Name of the VDU in the VIM "ip-address": None, # mgmt-interface filled by LCM # "vim-id", "flavor-id", "image-id", "management-ip" # filled by LCM "internal-connection-point": [], + "interfaces": [], } # TODO volumes: name, volume-id for icp in vdu.get("internal-connection-point", ()): @@ -637,26 +646,29 @@ class Engine(object): # vim-id # TODO it would be nice having a vim port id } vdur["internal-connection-point"].append(vdu_icp) + for iface in vdu.get("interface", ()): + vdu_iface = { + "name": iface.get("name"), + # "ip-address", "mac-address" # filled by LCM + # vim-id # TODO it would be nice having a vim port id + } + vdur["interfaces"].append(vdu_iface) vnfr_descriptor["vdur"].append(vdur) step = "creating vnfr vnfd-id='{}' constituent-vnfd='{}' at database".format( member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"]) self._format_new_data(session, "vnfrs", vnfr_descriptor) self.db.create("vnfrs", vnfr_descriptor) - rollback.append({"session": session, "item": "vnfrs", "_id": vnfr_id, "force": True}) + rollback.insert(0, {"item": "vnfrs", "_id": vnfr_id}) nsr_descriptor["constituent-vnfr-ref"].append(vnfr_id) step = "creating nsr at database" self._format_new_data(session, "nsrs", nsr_descriptor) self.db.create("nsrs", nsr_descriptor) + rollback.insert(rollback_index, {"item": "nsrs", "_id": nsr_id}) return nsr_id except Exception as e: raise EngineException("Error {}: {}".format(step, e)) - for rollback_item in rollback: - try: - self.engine.del_item(**rollback) - except Exception as e2: - self.logger.error("Rollback Exception {}: {}".format(rollback, e2)) @staticmethod def _update_descriptor(desc, kwargs): @@ -694,10 +706,11 @@ class Engine(object): raise EngineException( "Invalid query string '{}'. Index '{}' out of range".format(k, kitem_old)) - def new_item(self, session, item, indata={}, kwargs=None, headers={}, force=False): + def new_item(self, rollback, session, item, indata={}, kwargs=None, headers={}, force=False): """ Creates a new entry into database. For nsds and vnfds it creates an almost empty DISABLED entry, that must be completed with a call to method upload_content + :param rollback: list where this method appends created items at database in case a rollback may to be done :param session: contains the used login username and working project :param item: it can be: users, projects, vim_accounts, sdns, nsrs, nsds, vnfds :param indata: data to be inserted @@ -722,13 +735,14 @@ class Engine(object): if item == "nsrs": # in this case the input descriptor is not the data to be stored - return self.new_nsr(session, ns_request=content) + return self.new_nsr(rollback, session, ns_request=content) self._validate_new_data(session, item_envelop, content, force) if item in ("nsds", "vnfds"): content = {"_admin": {"userDefinedData": content}} self._format_new_data(session, item, content) _id = self.db.create(item, content) + rollback.insert(0, {"item": item, "_id": _id}) if item == "vim_accounts": msg_data = self.db.get_one(item, {"_id": _id}) @@ -763,9 +777,10 @@ class Engine(object): } return nslcmop - def ns_operation(self, session, nsInstanceId, operation, indata, kwargs=None): + def ns_operation(self, rollback, session, nsInstanceId, operation, indata, kwargs=None): """ Performs a new operation over a ns + :param rollback: list where this method appends created items at database in case a rollback may to be done :param session: contains the used login username and working project :param nsInstanceId: _id of the nsr to perform the operation :param operation: it can be: instantiate, terminate, action, TODO: update, heal @@ -795,6 +810,7 @@ class Engine(object): nslcmop = self.new_nslcmop(session, nsInstanceId, operation, indata) self._format_new_data(session, "nslcmops", nslcmop) _id = self.db.create("nslcmops", nslcmop) + rollback.insert(0, {"item": "nslcmops", "_id": _id}) indata["_id"] = _id self.msg.write("ns", operation, nslcmop) return _id