from copy import copy, deepcopy
from osm_nbi.validation import validate_input, ValidationError, ns_instantiate, ns_terminate, ns_action, ns_scale,\
nsi_instantiate
-from osm_nbi.base_topic import BaseTopic, EngineException, get_iterable, deep_get
+from osm_nbi.base_topic import BaseTopic, EngineException, get_iterable, deep_get, increment_ip_mac
# from descriptor_topics import DescriptorTopic
from yaml import safe_dump
from osm_common.dbbase import DbException
if not nsrs_list:
self.db.set_one("vnfds", {"_id": used_vnfd_id}, {"_admin.usageState": "NOT_IN_USE"})
+ # delete extra ro_nsrs used for internal RO module
+ self.db.del_one("ro_nsrs", q_filter={"_id": _id}, fail_on_empty=False)
+
@staticmethod
def _format_ns_request(ns_request):
formated_request = copy(ns_request)
"_id": nsr_id,
# "input-parameter": xpath, value,
"ssh-authorized-key": ns_request.get("ssh_keys"), # TODO remove
+ "vld": nsd.get("vld") or [],
+ "flavor": [],
+ "image": [],
}
ns_request["nsr_id"] = nsr_id
if ns_request and ns_request.get("config-units"):
# "vim-id", "flavor-id", "image-id", "management-ip" # filled by LCM
"internal-connection-point": [],
"interfaces": [],
- "additionalParams": additional_params
+ "additionalParams": additional_params,
+ "vdu-name": vdu["name"],
}
if vdu_params and vdu_params.get("config-units"):
vdur["config-units"] = vdu_params["config-units"]
if vdu.get("pdu-type"):
vdur["pdu-type"] = vdu["pdu-type"]
vdur["name"] = vdu["pdu-type"]
+
+ # flavor
+ flavor_data = copy(vdu.get("vm-flavor", {}))
+ flavor_data["guest-epa"] = vdu.get("guest-epa")
+ f = next((f for f in nsr_descriptor["flavor"] if
+ all(f.get(k) == flavor_data[k] for k in flavor_data)), None)
+ if not f:
+ flavor_data["vim_info"] = []
+ flavor_data["name"] = vdu["id"][:56] + "-flv"
+ flavor_data["id"] = str(len(nsr_descriptor["flavor"]))
+ nsr_descriptor["flavor"].append(flavor_data)
+ f = flavor_data
+ vdur["ns-flavor-id"] = f["id"]
+
+ # image
+ if vdu.get("image"):
+ image_data = {"image": vdu["image"], "image_checksum": vdu.get("image_checksum")}
+ img = next((f for f in nsr_descriptor["image"] if
+ all(f.get(k) == image_data[k] for k in image_data)), None)
+ if not img:
+ image_data["vim_info"] = []
+ image_data["id"] = str(len(nsr_descriptor["image"]))
+ nsr_descriptor["image"].append(image_data)
+ img = image_data
+ vdur["ns-image-id"] = img["id"]
+
# TODO volumes: name, volume-id
for icp in vdu.get("internal-connection-point", ()):
vdu_icp = {
"id": icp["id"],
"connection-point-id": icp["id"],
"name": icp.get("name"),
- # "ip-address", "mac-address" # filled by LCM
- # 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
- }
+ x: iface[x] for x in ("name", "ip-address", "mac-address", "internal-connection-point-ref",
+ "external-connection-point-ref") if iface.get(x) is not None}
if vnfd_mgmt_cp and iface.get("external-connection-point-ref") == vnfd_mgmt_cp:
vdu_iface["mgmt-vnf"] = True
if iface.get("mgmt-interface"):
vdu_iface["mgmt-interface"] = True # TODO change to mgmt-vdu
+ if iface.get("virtual-interface"):
+ if iface["virtual-interface"].get("type"):
+ iface["type"] = iface["virtual-interface"]["type"]
+ if iface["virtual-interface"].get("vpci"):
+ iface["vpci"] = iface["virtual-interface"]["vpci"]
+ if iface["virtual-interface"].get("bandwidth"):
+ iface["bandwidth"] = iface["virtual-interface"]["bandwidth"]
# look for network where this interface is connected
if iface.get("external-connection-point-ref"):
for vnfd_ivld_icp in get_iterable(vnfd_ivld.get("internal-connection-point")):
if vnfd_ivld_icp.get("id-ref") == iface["internal-connection-point-ref"]:
vdu_iface["vnf-vld-id"] = vnfd_ivld["id"]
+ if vnfd_ivld_icp.get("ip-address"):
+ vdu_iface["ip-address"] = vnfd_ivld_icp["ip-address"]
break
else:
continue
break
-
- vdur["interfaces"].append(vdu_iface)
+ if iface.get("position") is not None:
+ vdur["interfaces"].insert(iface["position"], vdu_iface)
+ else:
+ vdur["interfaces"].append(vdu_iface)
count = vdu.get("count", 1)
if count is None:
count = 1
for index in range(0, count):
if index:
vdur = deepcopy(vdur)
+ for iface in vdur["interfaces"]:
+ if iface.get("ip-address"):
+ iface["ip-address"] = increment_ip_mac(iface["ip-address"])
+ if iface.get("mac-address"):
+ iface["mac-address"] = increment_ip_mac(iface["mac-address"])
+
vdur["_id"] = str(uuid4())
vdur["count-index"] = index
+ vdur["id"] = "{}-{}".format(vdur["vdu-id-ref"], index)
vnfr_descriptor["vdur"].append(vdur)
step = "creating vnfr vnfd-id='{}' constituent-vnfd='{}' at database".format(
if vnf_inst_params.get("vimAccountId"):
vim_account = vnf_inst_params.get("vimAccountId")
+ # get vnf.vdu.interface instantiation params to update vnfr.vdur.interfaces ip, mac
+ for vdu_inst_param in get_iterable(vnf_inst_params.get("vdu")):
+ for vdur_index, vdur in enumerate(vnfr["vdur"]):
+ if vdu_inst_param["id"] != vdur["vdu-id-ref"]:
+ continue
+ for iface_inst_param in get_iterable(vdu_inst_param.get("interface")):
+ iface_index, _ = next(i for i in enumerate(vdur["interfaces"])
+ if i[1]["name"] == iface_inst_param["name"])
+ vnfr_update_text = "vdur.{}.interfaces.{}".format(vdur_index, iface_index)
+ if iface_inst_param.get("ip-address"):
+ vnfr_update[vnfr_update_text + ".ip-address"] = increment_ip_mac(
+ iface_inst_param.get("ip-address"), vdur.get("count-index", 0))
+ if iface_inst_param.get("mac-address"):
+ vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac(
+ iface_inst_param.get("mac-address"), vdur.get("count-index", 0))
+ # get vnf.internal-vld.internal-conection-point instantiation params to update vnfr.vdur.interfaces
+ # TODO update vld with the ip-profile
+ for ivld_inst_param in get_iterable(vnf_inst_params.get("internal-vld")):
+ for icp_inst_param in get_iterable(ivld_inst_param.get("internal-connection-point")):
+ # look for iface
+ for vdur_index, vdur in enumerate(vnfr["vdur"]):
+ for iface_index, iface in enumerate(vdur["interfaces"]):
+ if iface.get("internal-connection-point-ref") == icp_inst_param["id-ref"]:
+ vnfr_update_text = "vdur.{}.interfaces.{}".format(vdur_index, iface_index)
+ if icp_inst_param.get("ip-address"):
+ vnfr_update[vnfr_update_text + ".ip-address"] = increment_ip_mac(
+ icp_inst_param.get("ip-address"), vdur.get("count-index", 0))
+ if icp_inst_param.get("mac-address"):
+ vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac(
+ icp_inst_param.get("mac-address"), vdur.get("count-index", 0))
+ break
+ # get ip address from instantiation parameters.vld.vnfd-connection-point-ref
+ for vld_inst_param in get_iterable(indata.get("vld")):
+ for vnfcp_inst_param in get_iterable(vld_inst_param.get("vnfd-connection-point-ref")):
+ if vnfcp_inst_param["member-vnf-index-ref"] != member_vnf_index:
+ continue
+ # look for iface
+ for vdur_index, vdur in enumerate(vnfr["vdur"]):
+ for iface_index, iface in enumerate(vdur["interfaces"]):
+ if iface.get("external-connection-point-ref") == \
+ vnfcp_inst_param["vnfd-connection-point-ref"]:
+ vnfr_update_text = "vdur.{}.interfaces.{}".format(vdur_index, iface_index)
+ if vnfcp_inst_param.get("ip-address"):
+ vnfr_update[vnfr_update_text + ".ip-address"] = increment_ip_mac(
+ vnfcp_inst_param.get("ip-address"), vdur.get("count-index", 0))
+ if vnfcp_inst_param.get("mac-address"):
+ vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac(
+ vnfcp_inst_param.get("mac-address"), vdur.get("count-index", 0))
+ break
+
vnfr_update["vim-account-id"] = vim_account
vnfr_update_rollback["vim-account-id"] = vnfr.get("vim-account-id")
db_filter["_admin.nsrs-detailed-list.ANYINDEX.nsrId"] = nsr_id
nsis = self.db.get_one("nsis", db_filter, fail_on_empty=False, fail_on_more=False)
if nsis:
- raise EngineException("The NS instance {} cannot be terminate because is used by the slice {}".format(
+ raise EngineException("The NS instance {} cannot be terminated because is used by the slice {}".format(
nsr_id, nsis["_id"]), http_code=HTTPStatus.CONFLICT)
try:
_filter = self._get_project_filter(session)
_filter["_id"] = slice_request["nstId"]
nstd = self.db.get_one("nsts", _filter)
+ # check NST is not disabled
+ step = "checking NST operationalState"
+ if nstd["_admin"]["operationalState"] == "DISABLED":
+ raise EngineException("nst with id '{}' is DISABLED, and thus cannot be used to create a netslice "
+ "instance".format(slice_request["nstId"]), http_code=HTTPStatus.CONFLICT)
del _filter["_id"]
+ # check NSD is not disabled
+ step = "checking operationalState"
+ if nstd["_admin"]["operationalState"] == "DISABLED":
+ raise EngineException("nst with id '{}' is DISABLED, and thus cannot be used to create "
+ "a network slice".format(slice_request["nstId"]), http_code=HTTPStatus.CONFLICT)
+
nstd.pop("_admin", None)
nstd_id = nstd.pop("_id", None)
nsi_id = str(uuid4())
_filter = self._get_project_filter(session)
_filter["_id"] = netsliceInstanceId
nsir = self.db.get_one("nsis", _filter)
+ logging_prefix = "nsi={} {} ".format(netsliceInstanceId, operation)
del _filter["_id"]
# initial checking
nslcmops = []
# nslcmops_item = None
for index, nsr_item in enumerate(nsrs_list):
- nsi = None
+ nsr_id = nsr_item["nsrId"]
if nsr_item.get("shared"):
_filter["_admin.nsrs-detailed-list.ANYINDEX.shared"] = True
- _filter["_admin.nsrs-detailed-list.ANYINDEX.nsrId"] = nsr_item["nsrId"]
+ _filter["_admin.nsrs-detailed-list.ANYINDEX.nsrId"] = nsr_id
_filter["_admin.nsrs-detailed-list.ANYINDEX.nslcmop_instantiate.ne"] = None
_filter["_id.ne"] = netsliceInstanceId
nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False)
if operation == "terminate":
_update = {"_admin.nsrs-detailed-list.{}.nslcmop_instantiate".format(index): None}
self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
-
- # looks the first nsi fulfilling the conditions but not being the current NSIR
- if nsi:
- nsi_admin_shared = nsi["_admin"]["nsrs-detailed-list"]
- for nsi_nsr_item in nsi_admin_shared:
- if nsi_nsr_item["nsd-id"] == nsr_item["nsd-id"] and nsi_nsr_item["shared"]:
- self.add_shared_nsr_2vld(nsir, nsr_item)
- nslcmops.append(nsi_nsr_item["nslcmop_instantiate"])
- _update = {"_admin.nsrs-detailed-list.{}".format(index): nsi_nsr_item}
- self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
- break
- # continue to not create nslcmop since nsrs is shared and nsrs was created
- continue
- else:
- self.add_shared_nsr_2vld(nsir, nsr_item)
+ if nsi: # other nsi is using this nsr and it needs this nsr instantiated
+ continue # do not create nsilcmop
+ else: # instantiate
+ # looks the first nsi fulfilling the conditions but not being the current NSIR
+ if nsi:
+ nsi_nsr_item = next(n for n in nsi["_admin"]["nsrs-detailed-list"] if
+ n["nsrId"] == nsr_id and n["shared"] and
+ n["nslcmop_instantiate"])
+ self.add_shared_nsr_2vld(nsir, nsr_item)
+ nslcmops.append(nsi_nsr_item["nslcmop_instantiate"])
+ _update = {"_admin.nsrs-detailed-list.{}".format(index): nsi_nsr_item}
+ self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
+ # continue to not create nslcmop since nsrs is shared and nsrs was created
+ continue
+ else:
+ self.add_shared_nsr_2vld(nsir, nsr_item)
+ # create operation
try:
- service = self.db.get_one("nsrs", {"_id": nsr_item["nsrId"]})
indata_ns = {
"lcmOperationType": operation,
- "nsInstanceId": service["_id"],
+ "nsInstanceId": nsr_id,
# Including netslice_id in the ns instantiate Operation
"netsliceInstanceId": netsliceInstanceId,
}
if operation == "instantiate":
+ service = self.db.get_one("nsrs", {"_id": nsr_id})
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,
+ nslcmop, _ = self.nsi_NsLcmOpTopic.new(rollback, session, indata_ns, None, headers,
slice_object=True)
nslcmops.append(nslcmop)
- if operation == "terminate":
- nslcmop = None
- _update = {"_admin.nsrs-detailed-list.{}.nslcmop_instantiate".format(index): nslcmop}
- self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
+ if operation == "instantiate":
+ _update = {"_admin.nsrs-detailed-list.{}.nslcmop_instantiate".format(index): nslcmop}
+ self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
except (DbException, EngineException) as e:
if e.http_code == HTTPStatus.NOT_FOUND:
- self.logger.info("HTTPStatus.NOT_FOUND")
+ self.logger.info(logging_prefix + "skipping NS={} because not found".format(nsr_id))
pass
else:
raise
projects / osm / NBI.git / blobdiff