# -*- coding: utf-8 -*-
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# import logging
from uuid import uuid4
from http import HTTPStatus
from validation import validate_input, ValidationError, ns_instantiate, ns_action, ns_scale, nsi_instantiate
from base_topic import BaseTopic, EngineException, get_iterable
from descriptor_topics import DescriptorTopic
+from yaml import safe_dump
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
if dry_run:
return
+ self.fs.file_delete(_id, ignore_non_exist=True)
v = self.db.del_one("nsrs", {"_id": _id})
self.db.del_list("nslcmops", {"nsInstanceId": _id})
self.db.del_list("vnfrs", {"nsr-id-ref": _id})
self._send_msg("deleted", {"_id": _id})
return v
+ @staticmethod
+ def _format_ns_request(ns_request):
+ formated_request = copy(ns_request)
+ formated_request.pop("additionalParamsForNs", None)
+ formated_request.pop("additionalParamsForVnf", None)
+ return formated_request
+
+ @staticmethod
+ def _format_addional_params(ns_request, member_vnf_index=None, descriptor=None):
+ """
+ Get and format user additional params for NS or VNF
+ :param ns_request: User instantiation additional parameters
+ :param member_vnf_index: None for extract NS params, or member_vnf_index to extract VNF params
+ :param descriptor: If not None it check that needed parameters of descriptor are supplied
+ :return: a formated copy of additional params or None if not supplied
+ """
+ additional_params = None
+ if not member_vnf_index:
+ additional_params = copy(ns_request.get("additionalParamsForNs"))
+ where_ = "additionalParamsForNs"
+ elif ns_request.get("additionalParamsForVnf"):
+ for additionalParamsForVnf in get_iterable(ns_request.get("additionalParamsForVnf")):
+ if additionalParamsForVnf["member-vnf-index"] == member_vnf_index:
+ additional_params = copy(additionalParamsForVnf.get("additionalParams"))
+ where_ = "additionalParamsForVnf[member-vnf-index={}]".format(
+ additionalParamsForVnf["member-vnf-index"])
+ break
+ if additional_params:
+ for k, v in additional_params.items():
+ if not isinstance(k, str):
+ raise EngineException("Invalid param at {}:{}. Only string keys are allowed".format(where_, k))
+ if "." in k or "$" in k:
+ raise EngineException("Invalid param at {}:{}. Keys must not contain dots or $".format(where_, k))
+ if isinstance(v, (dict, tuple, list)):
+ additional_params[k] = "!!yaml " + safe_dump(v)
+
+ if descriptor:
+ # check that enough parameters are supplied for the initial-config-primitive
+ # TODO: check for cloud-init
+ if member_vnf_index:
+ if descriptor.get("vnf-configuration"):
+ for initial_primitive in get_iterable(
+ descriptor["vnf-configuration"].get("initial-config-primitive")):
+ for param in get_iterable(initial_primitive.get("parameter")):
+ if param["value"].startswith("<") and param["value"].endswith(">"):
+ if param["value"] in ("<rw_mgmt_ip>", "<VDU_SCALE_INFO>"):
+ continue
+ if not additional_params or param["value"][1:-1] not in additional_params:
+ raise EngineException("Parameter '{}' needed for vnfd[id={}]:vnf-configuration:"
+ "initial-config-primitive[name={}] not supplied".
+ format(param["value"], descriptor["id"],
+ initial_primitive["name"]))
+
+ return additional_params
+
def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False):
"""
Creates a new nsr into database. It also creates needed vnfrs
nsd = self.db.get_one("nsds", _filter)
nsr_id = str(uuid4())
+
now = time()
step = "filling nsr from input data"
nsr_descriptor = {
"nsd-name-ref": nsd["name"],
"operational-events": [], # "id", "timestamp", "description", "event",
"nsd-ref": nsd["id"],
- "instantiate_params": ns_request,
+ "nsd-id": nsd["_id"],
+ "instantiate_params": self._format_ns_request(ns_request),
+ "additionalParamsForNs": self._format_addional_params(ns_request),
"ns-instance-config-ref": nsr_id,
"id": nsr_id,
"_id": nsr_id,
# "input-parameter": xpath, value,
- "ssh-authorized-key": ns_request.get("key-pair-ref"),
+ "ssh-authorized-key": ns_request.get("key-pair-ref"), # TODO remove
}
ns_request["nsr_id"] = nsr_id
+ # Create vld
+ if nsd.get("vld"):
+ nsr_descriptor["vld"] = []
+ for nsd_vld in nsd.get("vld"):
+ nsr_descriptor["vld"].append(
+ {key: nsd_vld[key] for key in ("id", "vim-network-name", "vim-network-id") if key in nsd_vld})
# Create VNFR
needed_vnfds = {}
- for member_vnf in nsd["constituent-vnfd"]:
+ for member_vnf in nsd.get("constituent-vnfd", ()):
vnfd_id = member_vnf["vnfd-id-ref"]
step = "getting vnfd id='{}' constituent-vnfd='{}' from database".format(
member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"])
"_id": vnfr_id,
"nsr-id-ref": nsr_id,
"member-vnf-index-ref": member_vnf["member-vnf-index"],
+ "additionalParamsForVnf": self._format_addional_params(ns_request, member_vnf["member-vnf-index"],
+ vnfd),
"created-time": now,
# "vnfd": vnfd, # at OSM model.but removed to avoid data duplication TODO: revise
"vnfd-ref": vnfd_id,
"connection-point": [],
"ip-address": None, # mgmt-interface filled by LCM
}
+
+ # Create vld
+ if vnfd.get("internal-vld"):
+ vnfr_descriptor["vld"] = []
+ for vnfd_vld in vnfd.get("internal-vld"):
+ vnfr_descriptor["vld"].append(
+ {key: vnfd_vld[key] for key in ("id", "vim-network-name", "vim-network-id") if key in
+ vnfd_vld})
+
+ vnfd_mgmt_cp = vnfd["mgmt-interface"].get("cp")
for cp in vnfd.get("connection-point", ()):
vnf_cp = {
"name": cp["name"],
# vim-id # TODO it would be nice having a vim port id
}
vnfr_descriptor["connection-point"].append(vnf_cp)
- for vdu in vnfd["vdu"]:
+ for vdu in vnfd.get("vdu", ()):
vdur = {
"vdu-id-ref": vdu["id"],
# TODO "name": "" Name of the VDU in the VIM
# "ip-address", "mac-address" # filled by LCM
# vim-id # TODO it would be nice having a vim port id
}
+ 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
+ vdu_iface["mgmt-interface"] = True # TODO change to mgmt-vdu
+
+ # look for network where this interface is connected
+ if iface.get("external-connection-point-ref"):
+ for nsd_vld in get_iterable(nsd.get("vld")):
+ for nsd_vld_cp in get_iterable(nsd_vld.get("vnfd-connection-point-ref")):
+ if nsd_vld_cp.get("vnfd-connection-point-ref") == \
+ iface["external-connection-point-ref"] and \
+ nsd_vld_cp.get("member-vnf-index-ref") == member_vnf["member-vnf-index"]:
+ vdu_iface["ns-vld-id"] = nsd_vld["id"]
+ break
+ else:
+ continue
+ break
+ elif iface.get("internal-connection-point-ref"):
+ for vnfd_ivld in get_iterable(vnfd.get("internal-vld")):
+ 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"]
+ break
+ else:
+ continue
+ break
vdur["interfaces"].append(vdu_iface)
count = vdu.get("count", 1)
self.format_on_new(nsr_descriptor, session["project_id"], make_public=make_public)
self.db.create("nsrs", nsr_descriptor)
rollback.append({"topic": "nsrs", "_id": nsr_id})
+
+ step = "creating nsr temporal folder"
+ self.fs.mkdir(nsr_id)
+
return nsr_id
except Exception as e:
self.logger.exception("Exception {} at NsrTopic.new()".format(e), exc_info=True)
raise EngineException("Invalid parameter vld:name='{}' is not present at nsd:vld".format(
in_vld["name"]))
- def _look_for_pdu(self, session, rollback, vnfr, vim_account):
+ def _look_for_pdu(self, session, rollback, vnfr, vim_account, vnfr_update, vnfr_update_rollback):
"""
- Look for a free PDU in the catalog matching vdur type and interfaces. Fills vdur with ip_address information
- :param vdur: vnfr:vdur descriptor. It is modified with pdu interface info if pdu is found
- :param member_vnf_index: used just for logging. Target vnfd of nsd
- :param vim_account:
- :return: vder_update: dictionary to update vnfr:vdur with pdu info. In addition it modified choosen pdu to set
- at status IN_USE
+ Look for a free PDU in the catalog matching vdur type and interfaces. Fills vnfr.vdur with the interface
+ (ip_address, ...) information.
+ Modifies PDU _admin.usageState to 'IN_USE'
+
+ :param session: client session information
+ :param rollback: list with the database modifications to rollback if needed
+ :param vnfr: vnfr to be updated. It is modified with pdu interface info if pdu is found
+ :param vim_account: vim_account where this vnfr should be deployed
+ :param vnfr_update: dictionary filled by this method with changes to be done at database vnfr
+ :param vnfr_update_rollback: dictionary filled by this method with original content of vnfr in case a rollback
+ of the changed vnfr is needed
+
+ :return: List of PDU interfaces that are connected to an existing VIM network. Each item contains:
+ "vim-network-name": used at VIM
+ "name": interface name
+ "vnf-vld-id": internal VNFD vld where this interface is connected, or
+ "ns-vld-id": NSD vld where this interface is connected.
+ NOTE: One, and only one between 'vnf-vld-id' and 'ns-vld-id' contains a value. The other will be None
"""
- vnfr_update = {}
- rollback_vnfr = {}
+
+ ifaces_forcing_vim_network = []
for vdur_index, vdur in enumerate(get_iterable(vnfr.get("vdur"))):
if not vdur.get("pdu-type"):
continue
pdu_type = vdur.get("pdu-type")
pdu_filter = self._get_project_filter(session, write=True, show_all=True)
- pdu_filter["vim.vim_accounts"] = vim_account
+ pdu_filter["vim_accounts"] = vim_account
pdu_filter["type"] = pdu_type
pdu_filter["_admin.operationalState"] = "ENABLED"
- pdu_filter["_admin.usageState"] = "NOT_IN_USE",
+ pdu_filter["_admin.usageState"] = "NOT_IN_USE"
# TODO feature 1417: "shared": True,
available_pdus = self.db.get_list("pdus", pdu_filter)
break
else:
raise EngineException(
- "No PDU of type={} found for member_vnf_index={} at vim_account={} matching interface "
- "names".format(vdur["vdu-id-ref"], vnfr["member-vnf-index-ref"], pdu_type))
+ "No PDU of type={} at vim_account={} found for member_vnf_index={}, vdu={} matching interface "
+ "names".format(pdu_type, vim_account, vnfr["member-vnf-index-ref"], vdur["vdu-id-ref"]))
# step 2. Update pdu
rollback_pdu = {
}
self.db.set_one("pdus", {"_id": pdu["_id"]},
{"_admin.usageState": "IN_USE",
- "_admin.usage.vnfr_id": vnfr["_id"],
- "_admin.usage.nsr_id": vnfr["nsr-id-ref"],
- "_admin.usage.vdur": vdur["vdu-id-ref"]}
- )
+ "_admin.usage": {"vnfr_id": vnfr["_id"],
+ "nsr_id": vnfr["nsr-id-ref"],
+ "vdur": vdur["vdu-id-ref"]}
+ })
rollback.append({"topic": "pdus", "_id": pdu["_id"], "operation": "set", "content": rollback_pdu})
# step 3. Fill vnfr info by filling vdur
vdu_text = "vdur.{}".format(vdur_index)
- rollback_vnfr[vdu_text + ".pdu-id"] = None
+ vnfr_update_rollback[vdu_text + ".pdu-id"] = None
vnfr_update[vdu_text + ".pdu-id"] = pdu["_id"]
for iface_index, vdur_interface in enumerate(vdur["interfaces"]):
for pdu_interface in pdu["interfaces"]:
if pdu_interface["name"] == vdur_interface["name"]:
iface_text = vdu_text + ".interfaces.{}".format(iface_index)
for k, v in pdu_interface.items():
- vnfr_update[iface_text + ".{}".format(k)] = v
- rollback_vnfr[iface_text + ".{}".format(k)] = vdur_interface.get(v)
+ if k in ("ip-address", "mac-address"): # TODO: switch-xxxxx must be inserted
+ vnfr_update[iface_text + ".{}".format(k)] = v
+ vnfr_update_rollback[iface_text + ".{}".format(k)] = vdur_interface.get(v)
+ if pdu_interface.get("ip-address"):
+ if vdur_interface.get("mgmt-interface"):
+ vnfr_update_rollback[vdu_text + ".ip-address"] = vdur.get("ip-address")
+ vnfr_update[vdu_text + ".ip-address"] = pdu_interface["ip-address"]
+ if vdur_interface.get("mgmt-vnf"):
+ vnfr_update_rollback["ip-address"] = vnfr.get("ip-address")
+ vnfr_update["ip-address"] = pdu_interface["ip-address"]
+ if pdu_interface.get("vim-network-name") or pdu_interface.get("vim-network-id"):
+ ifaces_forcing_vim_network.append({
+ "name": vdur_interface.get("vnf-vld-id") or vdur_interface.get("ns-vld-id"),
+ "vnf-vld-id": vdur_interface.get("vnf-vld-id"),
+ "ns-vld-id": vdur_interface.get("ns-vld-id")})
+ if pdu_interface.get("vim-network-id"):
+ ifaces_forcing_vim_network.append({
+ "vim-network-id": pdu_interface.get("vim-network-id")})
+ if pdu_interface.get("vim-network-name"):
+ ifaces_forcing_vim_network.append({
+ "vim-network-name": pdu_interface.get("vim-network-name")})
break
- if vnfr_update:
- self.db.set_one("vnfrs", {"_id": vnfr["_id"]}, vnfr_update)
- rollback.append({"topic": "vnfrs", "_id": vnfr["_id"], "operation": "set", "content": rollback_vnfr})
- return
+ return ifaces_forcing_vim_network
def _update_vnfrs(self, session, rollback, nsr, indata):
vnfrs = None
vnfr_update_rollback["vim-account-id"] = vnfr.get("vim-account-id")
# get pdu
- self._look_for_pdu(session, rollback, vnfr, vim_account)
- # TODO change instantiation parameters to set network
+ ifaces_forcing_vim_network = self._look_for_pdu(session, rollback, vnfr, vim_account, vnfr_update,
+ vnfr_update_rollback)
- def _create_nslcmop(self, session, nsInstanceId, operation, params):
+ # updata database vnfr
+ self.db.set_one("vnfrs", {"_id": vnfr["_id"]}, vnfr_update)
+ rollback.append({"topic": "vnfrs", "_id": vnfr["_id"], "operation": "set", "content": vnfr_update_rollback})
+
+ # Update indada in case pdu forces to use a concrete vim-network-name
+ # TODO check if user has already insert a vim-network-name and raises an error
+ if not ifaces_forcing_vim_network:
+ continue
+ for iface_info in ifaces_forcing_vim_network:
+ if iface_info.get("ns-vld-id"):
+ if "vld" not in indata:
+ indata["vld"] = []
+ indata["vld"].append({key: iface_info[key] for key in
+ ("name", "vim-network-name", "vim-network-id") if iface_info.get(key)})
+
+ elif iface_info.get("vnf-vld-id"):
+ if "vnf" not in indata:
+ indata["vnf"] = []
+ indata["vnf"].append({
+ "member-vnf-index": member_vnf_index,
+ "internal-vld": [{key: iface_info[key] for key in
+ ("name", "vim-network-name", "vim-network-id") if iface_info.get(key)}]
+ })
+
+ @staticmethod
+ def _create_nslcmop(nsr_id, operation, params):
+ """
+ Creates a ns-lcm-opp content to be stored at database.
+ :param nsr_id: internal id of the instance
+ :param operation: instantiate, terminate, scale, action, ...
+ :param params: user parameters for the operation
+ :return: dictionary following SOL005 format
+ """
now = time()
_id = str(uuid4())
nslcmop = {
"_id": _id,
"operationState": "PROCESSING", # COMPLETED,PARTIALLY_COMPLETED,FAILED_TEMP,FAILED,ROLLING_BACK,ROLLED_BACK
"statusEnteredTime": now,
- "nsInstanceId": nsInstanceId,
+ "nsInstanceId": nsr_id,
"lcmOperationType": operation,
"startTime": now,
"isAutomaticInvocation": False,
"isCancelPending": False,
"links": {
"self": "/osm/nslcm/v1/ns_lcm_op_occs/" + _id,
- "nsInstance": "/osm/nslcm/v1/ns_instances/" + nsInstanceId,
+ "nsInstance": "/osm/nslcm/v1/ns_instances/" + nsr_id,
}
}
return nslcmop
if not nsr["_admin"].get("nsState") or nsr["_admin"]["nsState"] == "NOT_INSTANTIATED":
if operation == "terminate" and indata.get("autoremove"):
# NSR must be deleted
- return self.delete(session, nsInstanceId)
+ return None # a none in this case is used to indicate not instantiated. It can be removed
if operation != "instantiate":
raise EngineException("ns_instance '{}' cannot be '{}' because it is not instantiated".format(
nsInstanceId, operation), HTTPStatus.CONFLICT)
raise EngineException("ns_instance '{}' cannot be '{}' because it is already instantiated".format(
nsInstanceId, operation), HTTPStatus.CONFLICT)
self._check_ns_operation(session, nsr, operation, indata)
+
if operation == "instantiate":
self._update_vnfrs(session, rollback, nsr, indata)
- nslcmop_desc = self._create_nslcmop(session, nsInstanceId, operation, indata)
+
+ nslcmop_desc = self._create_nslcmop(nsInstanceId, operation, indata)
self.format_on_new(nslcmop_desc, session["project_id"], make_public=make_public)
_id = self.db.create("nslcmops", nslcmop_desc)
rollback.append({"topic": "nslcmops", "_id": _id})
def __init__(self, db, fs, msg):
BaseTopic.__init__(self, db, fs, msg)
+ self.nsrTopic = NsrTopic(db, fs, msg)
+
+ @staticmethod
+ def _format_ns_request(ns_request):
+ formated_request = copy(ns_request)
+ # TODO: Add request params
+ return formated_request
+
+ @staticmethod
+ def _format_addional_params(slice_request):
+ """
+ Get and format user additional params for NS or VNF
+ :param slice_request: User instantiation additional parameters
+ :return: a formatted copy of additional params or None if not supplied
+ """
+ additional_params = copy(slice_request.get("additionalParamsForNsi"))
+ if additional_params:
+ for k, v in additional_params.items():
+ if not isinstance(k, str):
+ raise EngineException("Invalid param at additionalParamsForNsi:{}. Only string keys are allowed".
+ format(k))
+ if "." in k or "$" in k:
+ raise EngineException("Invalid param at additionalParamsForNsi:{}. Keys must not contain dots or $".
+ format(k))
+ if isinstance(v, (dict, tuple, list)):
+ additional_params[k] = "!!yaml " + safe_dump(v)
+ return additional_params
def _check_descriptor_dependencies(self, session, descriptor):
"""
_filter = {"_id": id_item}
nslcmop = self.db.get_one("nslcmops", _filter)
nsr_id = nslcmop["operationParams"]["nsr_id"]
- NsrTopic.delete(self, session, nsr_id, force=False, dry_run=False)
+ self.nsrTopic.delete(session, nsr_id, force=False, dry_run=False)
self._send_msg("deleted", {"_id": _id})
return v
step = ""
# look for nstd
- self.logger.info(str(slice_request))
- step = "getting nstd id='{}' from database".format(slice_request.get("nstdId"))
- _filter = {"id": slice_request["nstdId"]}
+ step = "getting nstd id='{}' from database".format(slice_request.get("nstId"))
+ _filter = {"_id": slice_request["nstId"]}
_filter.update(BaseTopic._get_project_filter(session, write=False, show_all=True))
nstd = self.db.get_one("nsts", _filter)
nstd.pop("_admin", None)
nsi_id = str(uuid4())
step = "filling nsi_descriptor with input data"
- # "instantiation-parameters.netslice-subnet": []
- # TODO: Equal as template for now
+ # Creating the NSIR
nsi_descriptor = {
"id": nsi_id,
+ "name": slice_request["nsiName"],
+ "description": slice_request.get("nsiDescription", ""),
+ "datacenter": slice_request["vimAccountId"],
"nst-ref": nstd["id"],
- "instantiation-parameters": {
- "netslice-subnet": []
- },
+ "instantiation_parameters": slice_request,
"network-slice-template": nstd,
+ "nsr-ref-list": [],
+ "vlr-list": [],
"_id": nsi_id,
+ "additionalParamsForNsi": self._format_addional_params(slice_request)
}
+ step = "creating nsi at database"
+ self.format_on_new(nsi_descriptor, session["project_id"], make_public=make_public)
+ nsi_descriptor["_admin"]["nsiState"] = "NOT_INSTANTIATED"
+ nsi_descriptor["_admin"]["netslice-subnet"] = None
+
+ # Creating netslice-vld for the RO.
+ step = "creating netslice-vld at database"
+ instantiation_parameters = slice_request
+
+ # Building the vlds list to be deployed
+ # From netslice descriptors, creating the initial list
+ nsi_vlds = []
+ if nstd.get("netslice-vld"):
+ # Building VLDs from NST
+ for netslice_vlds in nstd["netslice-vld"]:
+ nsi_vld = {}
+ # Adding nst vld name and global vimAccountId for netslice vld creation
+ nsi_vld["name"] = netslice_vlds["name"]
+ nsi_vld["vimAccountId"] = slice_request["vimAccountId"]
+ # Getting template Instantiation parameters from NST
+ for netslice_vld in netslice_vlds["nss-connection-point-ref"]:
+ for netslice_subnet in nstd["netslice-subnet"]:
+ nsi_vld["nsd-ref"] = netslice_subnet["nsd-ref"]
+ nsi_vld["nsd-connection-point-ref"] = netslice_vld["nsd-connection-point-ref"]
+ # Obtaining the vimAccountId from template instantiation parameter
+ if netslice_subnet.get("instantiation-parameters"):
+ # Taking the vimAccountId from NST netslice-subnet instantiation parameters
+ if netslice_subnet["instantiation-parameters"].get("vimAccountId"):
+ netsn = netslice_subnet["instantiation-parameters"]["vimAccountId"]
+ nsi_vld["vimAccountId"] = netsn
+ # Obtaining the vimAccountId from user instantiation parameter
+ if instantiation_parameters.get("netslice-subnet"):
+ for ins_param in instantiation_parameters["netslice-subnet"]:
+ if ins_param.get("id") == netslice_vld["nss-ref"]:
+ if ins_param.get("vimAccountId"):
+ nsi_vld["vimAccountId"] = ins_param["vimAccountId"]
+ # Adding vim-network-name / vim-network-id defined by the user to vld
+ if instantiation_parameters.get("netslice-vld"):
+ for ins_param in instantiation_parameters["netslice-vld"]:
+ if ins_param["name"] == netslice_vlds["name"]:
+ if ins_param.get("vim-network-name"):
+ nsi_vld["vim-network-name"] = ins_param.get("vim-network-name")
+ if ins_param.get("vim-network-id"):
+ nsi_vld["vim-network-id"] = ins_param.get("vim-network-id")
+ if netslice_vlds.get("mgmt-network"):
+ nsi_vld["mgmt-network"] = netslice_vlds.get("mgmt-network")
+ nsi_vlds.append(nsi_vld)
+
+ nsi_descriptor["_admin"]["netslice-vld"] = nsi_vlds
# Creating netslice-subnet_record.
needed_nsds = {}
services = []
+
for member_ns in nstd["netslice-subnet"]:
nsd_id = member_ns["nsd-ref"]
step = "getting nstd id='{}' constituent-nsd='{}' from database".format(
step = "filling nsir nsd-id='{}' constituent-nsd='{}' from database".format(
member_ns["nsd-ref"], member_ns["id"])
- step = "creating nsi at database"
- self.format_on_new(nsi_descriptor, session["project_id"], make_public=make_public)
- nsi_descriptor["_admin"]["nsiState"] = "NOT_INSTANTIATED"
+ # check additionalParamsForSubnet contains a valid id
+ if slice_request.get("additionalParamsForSubnet"):
+ for additional_params_subnet in get_iterable(slice_request.get("additionalParamsForSubnet")):
+ for service in services:
+ if additional_params_subnet["id"] == service["id"]:
+ break
+ else:
+ raise EngineException("Error at additionalParamsForSubnet:id='{}' not match any "
+ "netslice-subnet:id".format(additional_params_subnet["id"]))
# creates Network Services records (NSRs)
step = "creating nsrs at database using NsrTopic.new()"
+ ns_params = slice_request.get("netslice-subnet")
+
nsrs_list = []
+ nsi_netslice_subnet = []
for service in services:
indata_ns = {}
indata_ns["nsdId"] = service["_id"]
- indata_ns["nsName"] = service["name"]
- indata_ns["vimAccountId"] = indata.get("vimAccountId")
+ indata_ns["nsName"] = slice_request.get("nsiName") + "." + service["id"]
+ indata_ns["vimAccountId"] = slice_request.get("vimAccountId")
indata_ns["nsDescription"] = service["description"]
indata_ns["key-pair-ref"] = None
+ for additional_params_subnet in get_iterable(slice_request.get("additionalParamsForSubnet")):
+ if additional_params_subnet["id"] == service["id"]:
+ if additional_params_subnet.get("additionalParamsForNs"):
+ indata_ns["additionalParamsForNs"] = additional_params_subnet["additionalParamsForNs"]
+ if additional_params_subnet.get("additionalParamsForVnf"):
+ indata_ns["additionalParamsForVnf"] = additional_params_subnet["additionalParamsForVnf"]
+ break
+
# NsrTopic(rollback, session, indata_ns, kwargs, headers, force)
- _id_nsr = NsrTopic.new(self, rollback, session, indata_ns, kwargs, headers, force)
+ # Overwriting ns_params filtering by nsName == netslice-subnet.id
+
+ if ns_params:
+ for ns_param in ns_params:
+ if ns_param.get("id") == service["id"]:
+ copy_ns_param = deepcopy(ns_param)
+ del copy_ns_param["id"]
+ indata_ns.update(copy_ns_param)
+ # TODO: Improve network selection via networkID
+ # Override the instantiation parameters for netslice-vld provided by user
+ if nsi_vlds:
+ indata_ns_list = []
+ for nsi_vld in nsi_vlds:
+ nsd = self.db.get_one("nsds", {"id": nsi_vld["nsd-ref"]})
+ if nsd["connection-point"]:
+ for cp_item in nsd["connection-point"]:
+ if cp_item["name"] == nsi_vld["nsd-connection-point-ref"]:
+ vld_id_ref = cp_item["vld-id-ref"]
+ # Mapping the vim-network-name or vim-network-id instantiation parameters
+ if nsi_vld.get("vim-network-id"):
+ vnid = nsi_vld.get("vim-network-id")
+ if type(vnid) is not dict:
+ vim_network_id = {slice_request.get("vimAccountId"): vnid}
+ else: # is string
+ vim_network_id = vnid
+ indata_ns_list.append({"name": vld_id_ref, "vim-network-id": vim_network_id})
+ # Case not vim-network-name instantiation parameter
+ elif nsi_vld.get("vim-network-name"):
+ vnm = nsi_vld.get("vim-network-name")
+ if type(vnm) is not dict:
+ vim_network_name = {slice_request.get("vimAccountId"): vnm}
+ else: # is string
+ vim_network_name = vnm
+ indata_ns_list.append({"name": vld_id_ref,
+ "vim-network-name": vim_network_name})
+ # Case neither vim-network-name nor vim-network-id provided
+ else:
+ indata_ns_list.append({"name": vld_id_ref})
+ if indata_ns_list:
+ indata_ns["vld"] = indata_ns_list
+
+ # Creates Nsr objects
+ _id_nsr = self.nsrTopic.new(rollback, session, indata_ns, kwargs, headers, force)
nsrs_item = {"nsrId": _id_nsr}
nsrs_list.append(nsrs_item)
+ nsi_netslice_subnet.append(indata_ns)
+ nsr_ref = {"nsr-ref": _id_nsr}
+ nsi_descriptor["nsr-ref-list"].append(nsr_ref)
# Adding the nsrs list to the nsi
nsi_descriptor["_admin"]["nsrs-detailed-list"] = nsrs_list
+ nsi_descriptor["_admin"]["netslice-subnet"] = nsi_netslice_subnet
# Creating the entry in the database
self.db.create("nsis", nsi_descriptor)
rollback.append({"topic": "nsis", "_id": nsi_id})
nsds = {}
nstd = nsir["network-slice-template"]
- def check_valid_netslice_subnet_id(nsId):
+ def check_valid_netslice_subnet_id(nstId):
# TODO change to vnfR (??)
- for ns in nstd["netslice-subnet"]:
- if nsId == ns["id"]:
- nsd_id = ns["nsd-ref"]
+ for netslice_subnet in nstd["netslice-subnet"]:
+ 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})
return nsds[nsd_id]
else:
- raise EngineException("Invalid parameter nsId='{}' is not one of the "
- "nst:netslice-subnet".format(nsId))
+ raise EngineException("Invalid parameter nstId='{}' is not one of the "
+ "nst:netslice-subnet".format(nstId))
if operation == "instantiate":
# check the existance of netslice-subnet items
- for in_nst in get_iterable(indata.get("netslice-subnet")):
- nstd = check_valid_netslice_subnet_id(in_nst["nsdId"])
+ for in_nst in get_iterable(indata.get("netslice-subnet")):
+ check_valid_netslice_subnet_id(in_nst["id"])
def _create_nsilcmop(self, session, netsliceInstanceId, operation, params):
now = time()
if not nsir["_admin"].get("nsiState") or nsir["_admin"]["nsiState"] == "NOT_INSTANTIATED":
if operation == "terminate" and indata.get("autoremove"):
# NSIR must be deleted
- return self.delete(session, nsiInstanceId)
+ return None # a none in this case is used to indicate not instantiated. It can be removed
if operation != "instantiate":
raise EngineException("netslice_instance '{}' cannot be '{}' because it is not instantiated".format(
nsiInstanceId, operation), HTTPStatus.CONFLICT)
projects / osm / NBI.git / blobdiff