def __init__(self, db, fs, msg):
BaseTopic.__init__(self, db, fs, msg)
- def check_conflict_on_edit(self, session, final_content, edit_content, _id, force=False):
+ def check_conflict_on_edit(self, session, final_content, edit_content, _id):
+ super().check_conflict_on_edit(session, final_content, edit_content, _id)
# 1. validate again with pyangbind
# 1.1. remove internal keys
internal_keys = {}
for k in ("_id", "_admin"):
if k in final_content:
internal_keys[k] = final_content.pop(k)
- serialized = self._validate_input_new(final_content, force)
+ storage_params = internal_keys["_admin"].get("storage")
+ serialized = self._validate_input_new(final_content, storage_params, session["force"])
# 1.2. modify final_content with a serialized version
final_content.clear()
final_content.update(serialized)
for k, v in internal_keys.items():
final_content[k] = v
- if force:
+ if session["force"]:
return
# 2. check that this id is not present
if "id" in edit_content:
- _filter = self._get_project_filter(session, write=False, show_all=False)
+ _filter = self._get_project_filter(session)
_filter["id"] = final_content["id"]
_filter["_id.neq"] = _id
if self.db.get_one(self.topic, _filter, fail_on_empty=False):
content["_admin"]["operationalState"] = "DISABLED"
content["_admin"]["usageState"] = "NOT_IN_USE"
- def delete(self, session, _id, force=False, dry_run=False):
+ def delete_extra(self, session, _id, db_content):
"""
- Delete item by its internal _id
- :param session: contains the used login username, working project, and admin rights
+ Deletes file system storage associated with the descriptor
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param _id: server internal id
- :param force: indicates if deletion must be forced in case of conflict
- :param dry_run: make checking but do not delete
- :return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ...
+ :param db_content: The database content of the descriptor
+ :return: None if ok or raises EngineException with the problem
"""
- # TODO add admin to filter, validate rights
- v = BaseTopic.delete(self, session, _id, force, dry_run=True)
- if dry_run:
- return
- v = self.db.del_one(self.topic, {"_id": _id})
self.fs.file_delete(_id, ignore_non_exist=True)
- self._send_msg("delete", {"_id": _id})
- return v
+ self.fs.file_delete(_id + "_", ignore_non_exist=True) # remove temp folder
@staticmethod
def get_one_by_id(db, session, topic, id):
# find owned by this project
- _filter = BaseTopic._get_project_filter(session, write=False, show_all=False)
+ _filter = BaseTopic._get_project_filter(session)
_filter["id"] = id
desc_list = db.get_list(topic, _filter)
if len(desc_list) == 1:
HTTPStatus.CONFLICT)
# not found any: try to find public
- _filter = BaseTopic._get_project_filter(session, write=False, show_all=True)
+ _filter = BaseTopic._get_project_filter(session)
_filter["id"] = id
desc_list = db.get_list(topic, _filter)
if not desc_list:
raise DbException("Found more than one public {} with id='{}'; and no one belonging to this project".format(
topic[:-1], id), HTTPStatus.CONFLICT)
- def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False):
+ def new(self, rollback, session, indata=None, kwargs=None, headers=None):
"""
Creates a new almost empty DISABLED entry into database. Due to SOL005, it does not follow normal procedure.
Creating a VNFD or NSD is done in two steps: 1. Creates an empty descriptor (this step) and 2) upload content
(self.upload_content)
:param rollback: list to append created items at database in case a rollback may to be done
- :param session: contains the used login username and working project
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param indata: data to be inserted
:param kwargs: used to override the indata descriptor
:param headers: http request headers
- :param force: If True avoid some dependence checks
- :param make_public: Make the created descriptor public to all projects
:return: _id: identity of the inserted data.
"""
self._update_input_with_kwargs(indata, kwargs)
# uncomment when this method is implemented.
# Avoid override in this case as the target is userDefinedData, but not vnfd,nsd descriptors
- # indata = DescriptorTopic._validate_input_new(self, indata, force=force)
+ # indata = DescriptorTopic._validate_input_new(self, indata, project_id=session["force"])
content = {"_admin": {"userDefinedData": indata}}
- self.format_on_new(content, session["project_id"], make_public=make_public)
+ self.format_on_new(content, session["project_id"], make_public=session["public"])
_id = self.db.create(self.topic, content)
rollback.append({"topic": self.topic, "_id": _id})
return _id
except ValidationError as e:
raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
- def upload_content(self, session, _id, indata, kwargs, headers, force=False):
+ def upload_content(self, session, _id, indata, kwargs, headers):
"""
Used for receiving content by chunks (with a transaction_id header and/or gzip file. It will store and extract)
- :param session: session
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param _id : the nsd,vnfd is already created, this is the id
:param indata: http body request
:param kwargs: user query string to override parameters. NOT USED
:param headers: http request headers
- :param force: to be more tolerant with validation
:return: True if package is completely uploaded or False if partial content has been uploded
Raise exception on error
"""
total = int(content_range[3])
else:
start = 0
+ temp_folder = _id + "_" # all the content is upload here and if ok, it is rename from id_ to is folder
if start:
- if not self.fs.file_exists(_id, 'dir'):
+ if not self.fs.file_exists(temp_folder, 'dir'):
raise EngineException("invalid Transaction-Id header", HTTPStatus.NOT_FOUND)
else:
- self.fs.file_delete(_id, ignore_non_exist=True)
- self.fs.mkdir(_id)
+ self.fs.file_delete(temp_folder, ignore_non_exist=True)
+ self.fs.mkdir(temp_folder)
storage = self.fs.get_params()
storage["folder"] = _id
- file_path = (_id, filename)
+ file_path = (temp_folder, filename)
if self.fs.file_exists(file_path, 'file'):
file_size = self.fs.file_size(file_path)
else:
raise EngineException("Not found any descriptor file at package descriptor tar.gz")
storage["descriptor"] = descriptor_file_name
storage["zipfile"] = filename
- self.fs.file_extract(tar, _id)
- with self.fs.file_open((_id, descriptor_file_name), "r") as descriptor_file:
+ self.fs.file_extract(tar, temp_folder)
+ with self.fs.file_open((temp_folder, descriptor_file_name), "r") as descriptor_file:
content = descriptor_file.read()
else:
content = file_pkg.read()
if kwargs:
self._update_input_with_kwargs(indata, kwargs)
# it will call overrides method at VnfdTopic or NsdTopic
- # indata = self._validate_input_edit(indata, force=force)
+ # indata = self._validate_input_edit(indata, force=session["force"])
deep_update_rfc7396(current_desc, indata)
- self.check_conflict_on_edit(session, current_desc, indata, _id=_id, force=force)
+ self.check_conflict_on_edit(session, current_desc, indata, _id=_id)
self.db.replace(self.topic, _id, current_desc)
+ self.fs.dir_rename(temp_folder, _id)
indata["_id"] = _id
self._send_msg("created", indata)
def get_file(self, session, _id, path=None, accept_header=None):
"""
Return the file content of a vnfd or nsd
- :param session: contains the used login username and working project
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param _id: Identity of the vnfd, nsd
:param path: artifact path or "$DESCRIPTOR" or None
:param accept_header: Content of Accept header. Must contain applition/zip or/and text/plain
clean_indata = clean_indata['vnfd:vnfd'][0]
return clean_indata
- def check_conflict_on_edit(self, session, final_content, edit_content, _id, force=False):
- super().check_conflict_on_edit(session, final_content, edit_content, _id, force=force)
+ def check_conflict_on_edit(self, session, final_content, edit_content, _id):
+ super().check_conflict_on_edit(session, final_content, edit_content, _id)
# set type of vnfd
contains_pdu = False
final_content["_admin"]["type"] = "vnfd"
# if neither vud nor pdu do not fill type
- def check_conflict_on_del(self, session, _id, force=False):
+ def check_conflict_on_del(self, session, _id, db_content):
"""
Check that there is not any NSD that uses this VNFD. Only NSDs belonging to this project are considered. Note
that VNFD can be public and be used by NSD of other projects. Also check there are not deployments, or vnfr
that uses this vnfd
- :param session:
- :param _id: vnfd inernal id
- :param force: Avoid this checking
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+ :param _id: vnfd internal id
+ :param db_content: The database content of the _id.
:return: None or raises EngineException with the conflict
"""
- if force:
+ if session["force"]:
return
- descriptor = self.db.get_one("vnfds", {"_id": _id})
+ descriptor = db_content
descriptor_id = descriptor.get("id")
if not descriptor_id: # empty vnfd not uploaded
return
- _filter = self._get_project_filter(session, write=False, show_all=False)
+ _filter = self._get_project_filter(session)
+
# check vnfrs using this vnfd
_filter["vnfd-id"] = _id
if self.db.get_list("vnfrs", _filter):
- raise EngineException("There is some VNFR that depends on this VNFD", http_code=HTTPStatus.CONFLICT)
+ raise EngineException("There is at least one VNF using this descriptor", http_code=HTTPStatus.CONFLICT)
+
+ # check NSD referencing this VNFD
del _filter["vnfd-id"]
- # check NSD using this VNFD
_filter["constituent-vnfd.ANYINDEX.vnfd-id-ref"] = descriptor_id
if self.db.get_list("nsds", _filter):
- raise EngineException("There is soame NSD that depends on this VNFD", http_code=HTTPStatus.CONFLICT)
+ raise EngineException("There is at least one NSD referencing this descriptor",
+ http_code=HTTPStatus.CONFLICT)
- def _validate_input_new(self, indata, force=False):
+ def _validate_input_new(self, indata, storage_params, force=False):
indata = self.pyangbind_validation("vnfds", indata, force)
# Cross references validation in the descriptor
if indata.get("vdu"):
.format(vdu["id"], interface["name"],
interface["internal-connection-point-ref"]),
http_code=HTTPStatus.UNPROCESSABLE_ENTITY)
+ # Validate that if descriptor contains charms, artifacts _admin.storage."pkg-dir" is not none
+ if vdu.get("vdu-configuration"):
+ if vdu["vdu-configuration"].get("juju"):
+ if not self._validate_package_folders(storage_params, 'charms'):
+ raise EngineException("Charm defined in vnf[id={}]:vdu[id={}] but not present in "
+ "package".format(indata["id"], vdu["id"]))
+ # Validate that if descriptor contains cloud-init, artifacts _admin.storage."pkg-dir" is not none
+ if vdu.get("cloud-init-file"):
+ if not self._validate_package_folders(storage_params, 'cloud_init', vdu["cloud-init-file"]):
+ raise EngineException("Cloud-init defined in vnf[id={}]:vdu[id={}] but not present in "
+ "package".format(indata["id"], vdu["id"]))
+ # Validate that if descriptor contains charms, artifacts _admin.storage."pkg-dir" is not none
+ if indata.get("vnf-configuration"):
+ if indata["vnf-configuration"].get("juju"):
+ if not self._validate_package_folders(storage_params, 'charms'):
+ raise EngineException("Charm defined in vnf[id={}] but not present in "
+ "package".format(indata["id"]))
+ vld_names = [] # For detection of duplicated VLD names
for ivld in get_iterable(indata.get("internal-vld")):
+ # BEGIN Detection of duplicated VLD names
+ ivld_name = ivld["name"]
+ if ivld_name in vld_names:
+ raise EngineException("Duplicated VLD name '{}' in vnfd[id={}]:internal-vld[id={}]"
+ .format(ivld["name"], indata["id"], ivld["id"]),
+ http_code=HTTPStatus.UNPROCESSABLE_ENTITY)
+ else:
+ vld_names.append(ivld_name)
+ # END Detection of duplicated VLD names
for icp in get_iterable(ivld.get("internal-connection-point")):
icp_mark = False
for vdu in get_iterable(indata.get("vdu")):
"vnf-configuration:config-primitive:name"
.format(sgd["name"], sca["vnf-config-primitive-name-ref"]),
http_code=HTTPStatus.UNPROCESSABLE_ENTITY)
- # TODO validata that if contains cloud-init-file or charms, have artifacts _admin.storage."pkg-dir" is not none
return indata
def _validate_input_edit(self, indata, force=False):
# not needed to validate with pyangbind becuase it will be validated at check_conflict_on_edit
return indata
+ def _validate_package_folders(self, storage_params, folder, file=None):
+ if not storage_params or not storage_params.get("pkg-dir"):
+ return False
+ else:
+ if self.fs.file_exists("{}_".format(storage_params["folder"]), 'dir'):
+ f = "{}_/{}/{}".format(storage_params["folder"], storage_params["pkg-dir"], folder)
+ else:
+ f = "{}/{}/{}".format(storage_params["folder"], storage_params["pkg-dir"], folder)
+ if file:
+ return self.fs.file_exists("{}/{}".format(f, file), 'file')
+ else:
+ if self.fs.file_exists(f, 'dir'):
+ if self.fs.dir_ls(f):
+ return True
+ return False
+
class NsdTopic(DescriptorTopic):
topic = "nsds"
clean_indata = clean_indata['nsd:nsd'][0]
return clean_indata
- def _validate_input_new(self, indata, force=False):
+ def _validate_input_new(self, indata, storage_params, force=False):
indata = self.pyangbind_validation("nsds", indata, force)
# Cross references validation in the descriptor
# TODO validata that if contains cloud-init-file or charms, have artifacts _admin.storage."pkg-dir" is not none
for vld in get_iterable(indata.get("vld")):
+ if vld.get("mgmt-network") and vld.get("ip-profile-ref"):
+ raise EngineException("Error at vld[id='{}']:ip-profile-ref"
+ " You cannot set an ip-profile when mgmt-network is True"
+ .format(vld["id"]), http_code=HTTPStatus.UNPROCESSABLE_ENTITY)
for vnfd_cp in get_iterable(vld.get("vnfd-connection-point-ref")):
for constituent_vnfd in get_iterable(indata.get("constituent-vnfd")):
if vnfd_cp["member-vnf-index-ref"] == constituent_vnfd["member-vnf-index"]:
# not needed to validate with pyangbind becuase it will be validated at check_conflict_on_edit
return indata
- def _check_descriptor_dependencies(self, session, descriptor, force=False):
+ def _check_descriptor_dependencies(self, session, descriptor):
"""
Check that the dependent descriptors exist on a new descriptor or edition. Also checks references to vnfd
connection points are ok
- :param session: client session information
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param descriptor: descriptor to be inserted or edit
- :param force: if true skip dependencies checking
:return: None or raises exception
"""
- if force:
+ if session["force"]:
return
member_vnfd_index = {}
- if descriptor.get("constituent-vnfd") and not force:
+ if descriptor.get("constituent-vnfd") and not session["force"]:
for vnf in descriptor["constituent-vnfd"]:
vnfd_id = vnf["vnfd-id-ref"]
- filter_q = self._get_project_filter(session, write=False, show_all=True)
+ filter_q = self._get_project_filter(session)
filter_q["id"] = vnfd_id
vnf_list = self.db.get_list("vnfds", filter_q)
if not vnf_list:
referenced_vnfd_cp["vnfd-connection-point-ref"], vnfd["id"]),
http_code=HTTPStatus.UNPROCESSABLE_ENTITY)
- def check_conflict_on_edit(self, session, final_content, edit_content, _id, force=False):
- super().check_conflict_on_edit(session, final_content, edit_content, _id, force=force)
+ def check_conflict_on_edit(self, session, final_content, edit_content, _id):
+ super().check_conflict_on_edit(session, final_content, edit_content, _id)
- self._check_descriptor_dependencies(session, final_content, force)
+ self._check_descriptor_dependencies(session, final_content)
- def check_conflict_on_del(self, session, _id, force=False):
+ def check_conflict_on_del(self, session, _id, db_content):
"""
Check that there is not any NSR that uses this NSD. Only NSRs belonging to this project are considered. Note
that NSD can be public and be used by other projects.
- :param session:
- :param _id: vnfd inernal id
- :param force: Avoid this checking
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+ :param _id: nsd internal id
+ :param db_content: The database content of the _id
:return: None or raises EngineException with the conflict
"""
- if force:
+ if session["force"]:
+ return
+ descriptor = db_content
+ descriptor_id = descriptor.get("id")
+ if not descriptor_id: # empty nsd not uploaded
return
- _filter = self._get_project_filter(session, write=False, show_all=False)
- _filter["nsdId"] = _id
+
+ # check NSD used by NS
+ _filter = self._get_project_filter(session)
+ _filter["nsd-id"] = _id
if self.db.get_list("nsrs", _filter):
- raise EngineException("There is some NSR that depends on this NSD", http_code=HTTPStatus.CONFLICT)
+ raise EngineException("There is at least one NS using this descriptor", http_code=HTTPStatus.CONFLICT)
+
+ # check NSD referenced by NST
+ del _filter["nsd-id"]
+ _filter["netslice-subnet.ANYINDEX.nsd-ref"] = descriptor_id
+ if self.db.get_list("nsts", _filter):
+ raise EngineException("There is at least one NetSlice Template referencing this descriptor",
+ http_code=HTTPStatus.CONFLICT)
class NstTopic(DescriptorTopic):
# TODO validate with pyangbind, serialize
return indata
- def _validate_input_new(self, indata, force=False):
+ def _validate_input_new(self, indata, storage_params, force=False):
indata = self.pyangbind_validation("nsts", indata, force)
return indata.copy()
def _check_descriptor_dependencies(self, session, descriptor):
"""
Check that the dependent descriptors exist on a new descriptor or edition
- :param session: client session information
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param descriptor: descriptor to be inserted or edit
:return: None or raises exception
"""
return
for nsd in descriptor["netslice-subnet"]:
nsd_id = nsd["nsd-ref"]
- filter_q = self._get_project_filter(session, write=False, show_all=True)
+ filter_q = self._get_project_filter(session)
filter_q["id"] = nsd_id
if not self.db.get_list("nsds", filter_q):
raise EngineException("Descriptor error at 'netslice-subnet':'nsd-ref'='{}' references a non "
"existing nsd".format(nsd_id), http_code=HTTPStatus.CONFLICT)
- def check_conflict_on_edit(self, session, final_content, edit_content, _id, force=False):
- super().check_conflict_on_edit(session, final_content, edit_content, _id, force=force)
+ def check_conflict_on_edit(self, session, final_content, edit_content, _id):
+ super().check_conflict_on_edit(session, final_content, edit_content, _id)
self._check_descriptor_dependencies(session, final_content)
- def check_conflict_on_del(self, session, _id, force=False):
+ def check_conflict_on_del(self, session, _id, db_content):
"""
Check that there is not any NSIR that uses this NST. Only NSIRs belonging to this project are considered. Note
that NST can be public and be used by other projects.
- :param session:
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param _id: nst internal id
- :param force: Avoid this checking
+ :param db_content: The database content of the _id.
:return: None or raises EngineException with the conflict
"""
# TODO: Check this method
- if force:
+ if session["force"]:
return
# Get Network Slice Template from Database
- _filter = self._get_project_filter(session, write=False, show_all=False)
- _filter["_id"] = _id
- nst = self.db.get_one("nsts", _filter)
-
- # Search NSIs using NST via nst-ref
- _filter = self._get_project_filter(session, write=False, show_all=False)
- _filter["nst-ref"] = nst["id"]
- nsis_list = self.db.get_list("nsis", _filter)
- for nsi_item in nsis_list:
- if nsi_item["_admin"].get("nsiState") != "TERMINATED":
- raise EngineException("There is some NSIS that depends on this NST", http_code=HTTPStatus.CONFLICT)
+ _filter = self._get_project_filter(session)
+ _filter["nst-id"] = _id
+ if self.db.get_list("nsis", _filter):
+ raise EngineException("there is at least one Netslice Instance using this descriptor",
+ http_code=HTTPStatus.CONFLICT)
class PduTopic(BaseTopic):
content["_admin"]["operationalState"] = "ENABLED"
content["_admin"]["usageState"] = "NOT_IN_USE"
- def check_conflict_on_del(self, session, _id, force=False):
- if force:
+ def check_conflict_on_del(self, session, _id, db_content):
+ """
+ Check that there is not any vnfr that uses this PDU
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+ :param _id: pdu internal id
+ :param db_content: The database content of the _id.
+ :return: None or raises EngineException with the conflict
+ """
+ if session["force"]:
return
- # TODO Is it needed to check descriptors _admin.project_read/project_write??
- _filter = {"vdur.pdu-id": _id}
+
+ _filter = self._get_project_filter(session)
+ _filter["vdur.pdu-id"] = _id
if self.db.get_list("vnfrs", _filter):
- raise EngineException("There is some NSR that uses this PDU", http_code=HTTPStatus.CONFLICT)
+ raise EngineException("There is at least one VNF using this PDU", http_code=HTTPStatus.CONFLICT)
projects / osm / NBI.git / blobdiff