X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=7a6397a11631d52e234db0ac156a0ada7ec34bb6;hp=4b2eb44a891c3099db362d26f15638d8c54c62e1;hb=f417d52971f2b32525b283227e6f7e9d7fdbd133;hpb=e19707be54905bd804289a967812e617c8e2ce98 diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index 4b2eb44..7a6397a 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -34,6 +34,7 @@ __author__ = "Alfonso Tierno " class NsrTopic(BaseTopic): topic = "nsrs" topic_msg = "ns" + quota_name = "ns_instances" schema_new = ns_instantiate def __init__(self, db, fs, msg, auth): @@ -283,6 +284,9 @@ class NsrTopic(BaseTopic): "ssh-authorized-key": ns_request.get("ssh_keys"), # TODO remove } ns_request["nsr_id"] = nsr_id + if ns_request and ns_request.get("config-units"): + nsr_descriptor["config-units"] = ns_request["config-units"] + # Create vld if nsd.get("vld"): nsr_descriptor["vld"] = nsd["vld"] @@ -309,9 +313,6 @@ class NsrTopic(BaseTopic): additional_params, vnf_params = self._format_additional_params(ns_request, member_vnf["member-vnf-index"], descriptor=vnfd) - vnf_k8s_namespace = ns_k8s_namespace - if vnf_params and vnf_params.get("k8s-namespace"): - vnf_k8s_namespace = vnf_params["k8s-namespace"] vnfr_descriptor = { "id": vnfr_id, "_id": vnfr_id, @@ -327,6 +328,12 @@ class NsrTopic(BaseTopic): "connection-point": [], "ip-address": None, # mgmt-interface filled by LCM } + vnf_k8s_namespace = ns_k8s_namespace + if vnf_params: + if vnf_params.get("k8s-namespace"): + vnf_k8s_namespace = vnf_params["k8s-namespace"] + if vnf_params.get("config-units"): + vnfr_descriptor["config-units"] = vnf_params["config-units"] # Create vld if vnfd.get("internal-vld"): @@ -390,6 +397,8 @@ class NsrTopic(BaseTopic): "ip-address": None, # mgmt-interface filled by LCM "k8s-cluster": {}, } + if kdu_params and kdu_params.get("config-units"): + kdur["config-units"] = kdu_params["config-units"] for k8s_type in ("helm-chart", "juju-bundle"): if kdu.get(k8s_type): kdur[k8s_type] = kdu_model or kdu[k8s_type] @@ -398,8 +407,8 @@ class NsrTopic(BaseTopic): vnfr_descriptor["kdur"].append(kdur) for vdu in vnfd.get("vdu", ()): - additional_params, _ = self._format_additional_params(ns_request, member_vnf["member-vnf-index"], - vdu_id=vdu["id"], descriptor=vnfd) + additional_params, vdu_params = self._format_additional_params( + ns_request, member_vnf["member-vnf-index"], vdu_id=vdu["id"], descriptor=vnfd) vdur = { "vdu-id-ref": vdu["id"], # TODO "name": "" Name of the VDU in the VIM @@ -409,6 +418,10 @@ class NsrTopic(BaseTopic): "interfaces": [], "additionalParams": additional_params } + if vdu_params and vdu_params.get("config-units"): + vdur["config-units"] = vdu_params["config-units"] + if deep_get(vdu, ("supplemental-boot-data", "boot-data-drive")): + vdur["boot-data-drive"] = vdu["supplemental-boot-data"]["boot-data-drive"] if vdu.get("pdu-type"): vdur["pdu-type"] = vdu["pdu-type"] # TODO volumes: name, volume-id @@ -596,7 +609,7 @@ class NsLcmOpTopic(BaseTopic): for in_ivld in get_iterable(in_vnfd.get("internal-vld")): for ivld in get_iterable(vnfd.get("internal-vld")): - if in_ivld["name"] == ivld["name"] or in_ivld["name"] == ivld["id"]: + if in_ivld["name"] in (ivld["id"], ivld.get("name")): for in_icp in get_iterable(in_ivld.get("internal-connection-point")): for icp in ivld["internal-connection-point"]: if in_icp["id-ref"] == icp["id-ref"]: @@ -606,7 +619,7 @@ class NsLcmOpTopic(BaseTopic): "='{}']:internal-connection-point[id-ref:'{}'] is not present at " "vnfd:internal-vld:name/id:internal-connection-point" .format(in_vnf["member-vnf-index"], in_ivld["name"], - in_icp["id-ref"], vnfd["id"])) + in_icp["id-ref"])) break else: raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:internal-vld:name='{}'" @@ -1070,6 +1083,7 @@ class NsLcmOpTopic(BaseTopic): class NsiTopic(BaseTopic): topic = "nsis" topic_msg = "nsi" + quota_name = "slice_instances" def __init__(self, db, fs, msg, auth): BaseTopic.__init__(self, db, fs, msg, auth) @@ -1420,7 +1434,9 @@ class NsiLcmOpTopic(BaseTopic): if nstId == netslice_subnet["id"]: nsd_id = netslice_subnet["nsd-ref"] if nsd_id not in nsds: - nsds[nsd_id] = self.db.get_one("nsds", {"id": nsd_id}) + _filter = self._get_project_filter(session) + _filter["id"] = nsd_id + nsds[nsd_id] = self.db.get_one("nsds", _filter) return nsds[nsd_id] else: raise EngineException("Invalid parameter nstId='{}' is not one of the " @@ -1537,12 +1553,15 @@ class NsiLcmOpTopic(BaseTopic): try: service = self.db.get_one("nsrs", {"_id": nsr_item["nsrId"]}) - indata_ns = {} - indata_ns = service["instantiate_params"] - indata_ns["lcmOperationType"] = operation - indata_ns["nsInstanceId"] = service["_id"] - # Including netslice_id in the ns instantiate Operation - indata_ns["netsliceInstanceId"] = netsliceInstanceId + indata_ns = { + "lcmOperationType": operation, + "nsInstanceId": service["_id"], + # Including netslice_id in the ns instantiate Operation + "netsliceInstanceId": netsliceInstanceId, + } + if operation == "instantiate": + indata_ns.update(service["instantiate_params"]) + # Creating NS_LCM_OP with the flag slice_object=True to not trigger the service instantiation # message via kafka bus nslcmop, _ = self.nsi_NsLcmOpTopic.new(rollback, session, indata_ns, kwargs, headers,