X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fdescriptor_topics.py;h=94b74a92f140e42868944591bffdb821d1df9da7;hp=e9339e029084ac7f729860586116f8ec04f28236;hb=f0637057dc1be391f068c7e2b9c8f81b16f0921e;hpb=70434c15924602743b05f4fcb745fabc94445c59 diff --git a/osm_nbi/descriptor_topics.py b/osm_nbi/descriptor_topics.py index e9339e0..94b74a9 100644 --- a/osm_nbi/descriptor_topics.py +++ b/osm_nbi/descriptor_topics.py @@ -43,7 +43,8 @@ class DescriptorTopic(BaseTopic): 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, force) # 1.2. modify final_content with a serialized version final_content.clear() final_content.update(serialized) @@ -85,6 +86,7 @@ class DescriptorTopic(BaseTopic): return v = self.db.del_one(self.topic, {"_id": _id}) self.fs.file_delete(_id, ignore_non_exist=True) + self.fs.file_delete(_id + "_", ignore_non_exist=True) # remove temp folder self._send_msg("delete", {"_id": _id}) return v @@ -185,18 +187,19 @@ class DescriptorTopic(BaseTopic): 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: @@ -256,8 +259,8 @@ class DescriptorTopic(BaseTopic): 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() @@ -285,6 +288,7 @@ class DescriptorTopic(BaseTopic): deep_update_rfc7396(current_desc, indata) self.check_conflict_on_edit(session, current_desc, indata, _id=_id, force=force) self.db.replace(self.topic, _id, current_desc) + self.fs.dir_rename(temp_folder, _id) indata["_id"] = _id self._send_msg("created", indata) @@ -467,7 +471,7 @@ class VnfdTopic(DescriptorTopic): if self.db.get_list("nsds", _filter): raise EngineException("There is soame NSD that depends on this VNFD", 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"): @@ -506,6 +510,23 @@ class VnfdTopic(DescriptorTopic): .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"])) for ivld in get_iterable(indata.get("internal-vld")): for icp in get_iterable(ivld.get("internal-connection-point")): icp_mark = False @@ -601,13 +622,28 @@ class VnfdTopic(DescriptorTopic): "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" @@ -636,7 +672,7 @@ class NsdTopic(DescriptorTopic): 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 @@ -759,7 +795,7 @@ 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()