X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fdescriptor_topics.py;h=70b5d2398f472bb0528467e1928b86af95864d24;hb=10f814e5c393778cbad66346f79208b4c70be2ff;hp=b165b76f8fb816434251e3d49ad19b8dee54736b;hpb=48683b8ca543c63a03c8d594a768d48d4a1a87b9;p=osm%2FNBI.git

diff --git a/osm_nbi/descriptor_topics.py b/osm_nbi/descriptor_topics.py
index b165b76..70b5d23 100644
--- a/osm_nbi/descriptor_topics.py
+++ b/osm_nbi/descriptor_topics.py
@@ -853,6 +853,9 @@ 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
@@ -1119,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"))
@@ -1131,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")):
@@ -1197,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)