X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fdescriptor_topics.py;h=70b5d2398f472bb0528467e1928b86af95864d24;hb=d68526d51ba7fee30b35ed6acdfb85c1ffeea307;hp=2814653075319bddcec773e78e8ca4ee74a6df95;hpb=f2af4a100d308e07f355d61b94fb27d1ccc97aa2;p=osm%2FNBI.git diff --git a/osm_nbi/descriptor_topics.py b/osm_nbi/descriptor_topics.py index 2814653..70b5d23 100644 --- a/osm_nbi/descriptor_topics.py +++ b/osm_nbi/descriptor_topics.py @@ -20,6 +20,7 @@ import copy import os import shutil import functools +import re # import logging from deepdiff import DeepDiff @@ -30,6 +31,7 @@ from time import time from uuid import uuid4 from re import fullmatch from zipfile import ZipFile +from urllib.parse import urlparse from osm_nbi.validation import ( ValidationError, pdu_new_schema, @@ -51,10 +53,14 @@ from osm_nbi import utils __author__ = "Alfonso Tierno " +valid_helm_chart_re = re.compile( + r"^[a-z0-9]([-a-z0-9]*[a-z0-9]/)?([a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" +) + class DescriptorTopic(BaseTopic): def __init__(self, db, fs, msg, auth): - BaseTopic.__init__(self, db, fs, msg, auth) + super().__init__(db, fs, msg, auth) def _validate_input_new(self, indata, storage_params, force=False): return indata @@ -437,7 +443,7 @@ class DescriptorTopic(BaseTopic): indata = json.load(content) else: error_text = "Invalid yaml format " - indata = yaml.load(content, Loader=yaml.SafeLoader) + indata = yaml.safe_load(content) # Need to close the file package here so it can be copied from the # revision to the current, unrevisioned record @@ -676,7 +682,7 @@ class DescriptorTopic(BaseTopic): # to preserve current expected behaviour if "userDefinedData" in indata: data = indata.pop("userDefinedData") - if type(data) == dict: + if isinstance(data, dict): indata["_admin"]["userDefinedData"] = data else: raise EngineException( @@ -847,9 +853,32 @@ class VnfdTopic(DescriptorTopic): self.validate_internal_virtual_links(indata) self.validate_monitoring_params(indata) self.validate_scaling_group_descriptor(indata) + self.validate_healing_group_descriptor(indata) + self.validate_alarm_group_descriptor(indata) + self.validate_storage_compute_descriptor(indata) + self.validate_helm_chart(indata) return indata + @staticmethod + def validate_helm_chart(indata): + def is_url(url): + result = urlparse(url) + return all([result.scheme, result.netloc]) + + kdus = indata.get("kdu", []) + for kdu in kdus: + helm_chart_value = kdu.get("helm-chart") + if not helm_chart_value: + continue + if not ( + valid_helm_chart_re.match(helm_chart_value) or is_url(helm_chart_value) + ): + raise EngineException( + "helm-chart '{}' is not valid".format(helm_chart_value), + http_code=HTTPStatus.UNPROCESSABLE_ENTITY, + ) + @staticmethod def validate_mgmt_interface_connection_point(indata): if not indata.get("vdu"): @@ -1093,6 +1122,12 @@ class VnfdTopic(DescriptorTopic): @staticmethod def validate_scaling_group_descriptor(indata): all_monitoring_params = set() + all_vdu_ids = set() + for df in get_iterable(indata.get("df")): + for il in get_iterable(df.get("instantiation-level")): + for vl in get_iterable(il.get("vdu-level")): + all_vdu_ids.add(vl.get("vdu-id")) + for ivld in get_iterable(indata.get("int-virtual-link-desc")): for mp in get_iterable(ivld.get("monitoring-parameters")): all_monitoring_params.add(mp.get("id")) @@ -1105,6 +1140,26 @@ class VnfdTopic(DescriptorTopic): for mp in get_iterable(df.get("monitoring-parameter")): all_monitoring_params.add(mp.get("id")) + for df in get_iterable(indata.get("df")): + for sa in get_iterable(df.get("scaling-aspect")): + for deltas in get_iterable( + sa.get("aspect-delta-details").get("deltas") + ): + for vds in get_iterable(deltas.get("vdu-delta")): + sa_vdu_id = vds.get("id") + if sa_vdu_id and sa_vdu_id not in all_vdu_ids: + raise EngineException( + "df[id='{}']:scaling-aspect[id='{}']:aspect-delta-details" + "[delta='{}']: " + "vdu-id='{}' not defined in vdu".format( + df["id"], + sa["id"], + deltas["id"], + sa_vdu_id, + ), + http_code=HTTPStatus.UNPROCESSABLE_ENTITY, + ) + for df in get_iterable(indata.get("df")): for sa in get_iterable(df.get("scaling-aspect")): for sp in get_iterable(sa.get("scaling-policy")): @@ -1171,6 +1226,95 @@ class VnfdTopic(DescriptorTopic): http_code=HTTPStatus.UNPROCESSABLE_ENTITY, ) + @staticmethod + def validate_healing_group_descriptor(indata): + all_vdu_ids = set() + for df in get_iterable(indata.get("df")): + for il in get_iterable(df.get("instantiation-level")): + for vl in get_iterable(il.get("vdu-level")): + all_vdu_ids.add(vl.get("vdu-id")) + + for df in get_iterable(indata.get("df")): + for ha in get_iterable(df.get("healing-aspect")): + for hp in get_iterable(ha.get("healing-policy")): + hp_monitoring_param = hp.get("vdu-id") + if hp_monitoring_param and hp_monitoring_param not in all_vdu_ids: + raise EngineException( + "df[id='{}']:healing-aspect[id='{}']:healing-policy" + "[name='{}']: " + "vdu-id='{}' not defined in vdu".format( + df["id"], + ha["id"], + hp["event-name"], + hp_monitoring_param, + ), + http_code=HTTPStatus.UNPROCESSABLE_ENTITY, + ) + + @staticmethod + def validate_alarm_group_descriptor(indata): + all_monitoring_params = set() + for ivld in get_iterable(indata.get("int-virtual-link-desc")): + for mp in get_iterable(ivld.get("monitoring-parameters")): + all_monitoring_params.add(mp.get("id")) + + for vdu in get_iterable(indata.get("vdu")): + for mp in get_iterable(vdu.get("monitoring-parameter")): + all_monitoring_params.add(mp.get("id")) + + for df in get_iterable(indata.get("df")): + for mp in get_iterable(df.get("monitoring-parameter")): + all_monitoring_params.add(mp.get("id")) + + for vdus in get_iterable(indata.get("vdu")): + for alarms in get_iterable(vdus.get("alarm")): + alarm_monitoring_param = alarms.get("vnf-monitoring-param-ref") + if ( + alarm_monitoring_param + and alarm_monitoring_param not in all_monitoring_params + ): + raise EngineException( + "vdu[id='{}']:alarm[id='{}']:" + "vnf-monitoring-param-ref='{}' not defined in any monitoring-param".format( + vdus["id"], + alarms["alarm-id"], + alarm_monitoring_param, + ), + http_code=HTTPStatus.UNPROCESSABLE_ENTITY, + ) + + @staticmethod + def validate_storage_compute_descriptor(indata): + all_vsd_ids = set() + for vsd in get_iterable(indata.get("virtual-storage-desc")): + all_vsd_ids.add(vsd.get("id")) + + all_vcd_ids = set() + for vcd in get_iterable(indata.get("virtual-compute-desc")): + all_vcd_ids.add(vcd.get("id")) + + for vdus in get_iterable(indata.get("vdu")): + for vsd_ref in vdus.get("virtual-storage-desc"): + if vsd_ref and vsd_ref not in all_vsd_ids: + raise EngineException( + "vdu[virtual-storage-desc='{}']" + "not defined in vnfd".format( + vsd_ref, + ), + http_code=HTTPStatus.UNPROCESSABLE_ENTITY, + ) + + for vdus in get_iterable(indata.get("vdu")): + vcd_ref = vdus.get("virtual-compute-desc") + if vcd_ref and vcd_ref not in all_vcd_ids: + raise EngineException( + "vdu[virtual-compute-desc='{}']" + "not defined in vnfd".format( + vdus["virtual-compute-desc"], + ), + http_code=HTTPStatus.UNPROCESSABLE_ENTITY, + ) + def delete_extra(self, session, _id, db_content, not_send_msg=None): """ Deletes associate file system storage (via super) @@ -1323,11 +1467,9 @@ class VnfdTopic(DescriptorTopic): with self.fs.file_open( (old_descriptor_directory.rstrip("/"), descriptor_file_name), "r" ) as old_descriptor_file: - with self.fs.file_open( (new_descriptor_directory.rstrip("/"), descriptor_file_name), "r" ) as new_descriptor_file: - old_content = yaml.safe_load(old_descriptor_file.read()) new_content = yaml.safe_load(new_descriptor_file.read()) @@ -1377,7 +1519,7 @@ class NsdTopic(DescriptorTopic): topic_msg = "nsd" def __init__(self, db, fs, msg, auth): - DescriptorTopic.__init__(self, db, fs, msg, auth) + super().__init__(db, fs, msg, auth) def pyangbind_validation(self, item, data, force=False): if self._descriptor_data_is_in_old_format(data): @@ -1443,6 +1585,8 @@ class NsdTopic(DescriptorTopic): # 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("virtual-link-desc")): self.validate_vld_mgmt_network_with_virtual_link_protocol_data(vld, indata) + for fg in get_iterable(indata.get("vnffgd")): + self.validate_vnffgd_data(fg, indata) self.validate_vnf_profiles_vnfd_id(indata) @@ -1464,6 +1608,45 @@ class NsdTopic(DescriptorTopic): http_code=HTTPStatus.UNPROCESSABLE_ENTITY, ) + @staticmethod + def validate_vnffgd_data(fg, indata): + position_list = [] + all_vnf_ids = set(get_iterable(fg.get("vnf-profile-id"))) + for fgposition in get_iterable(fg.get("nfp-position-element")): + position_list.append(fgposition["id"]) + + for nfpd in get_iterable(fg.get("nfpd")): + nfp_position = [] + for position in get_iterable(nfpd.get("position-desc-id")): + nfp_position = position.get("nfp-position-element-id") + if position == "nfp-position-element-id": + nfp_position = position.get("nfp-position-element-id") + if nfp_position[0] not in position_list: + raise EngineException( + "Error at vnffgd nfpd[id='{}']:nfp-position-element-id='{}' " + "does not match any nfp-position-element".format( + nfpd["id"], nfp_position[0] + ), + http_code=HTTPStatus.UNPROCESSABLE_ENTITY, + ) + + for cp in get_iterable(position.get("cp-profile-id")): + for cpe in get_iterable(cp.get("constituent-profile-elements")): + constituent_base_element_id = cpe.get( + "constituent-base-element-id" + ) + if ( + constituent_base_element_id + and constituent_base_element_id not in all_vnf_ids + ): + raise EngineException( + "Error at vnffgd constituent_profile[id='{}']:vnfd-id='{}' " + "does not match any constituent-base-element-id".format( + cpe["id"], constituent_base_element_id + ), + http_code=HTTPStatus.UNPROCESSABLE_ENTITY, + ) + @staticmethod def validate_vnf_profiles_vnfd_id(indata): all_vnfd_ids = set(get_iterable(indata.get("vnfd-id"))) @@ -1507,7 +1690,7 @@ class NsdTopic(DescriptorTopic): # to preserve current expected behaviour if "userDefinedData" in indata: data = indata.pop("userDefinedData") - if type(data) == dict: + if isinstance(data, dict): indata["_admin"]["userDefinedData"] = data else: raise EngineException( @@ -1719,11 +1902,9 @@ class NsdTopic(DescriptorTopic): with self.fs.file_open( (old_descriptor_directory.rstrip("/"), descriptor_file_name), "r" ) as old_descriptor_file: - with self.fs.file_open( (new_descriptor_directory.rstrip("/"), descriptor_file_name), "r" ) as new_descriptor_file: - old_content = yaml.safe_load(old_descriptor_file.read()) new_content = yaml.safe_load(new_descriptor_file.read())