Merge "Bug 637 NSD-level IP Profiles not working in mgmt-network fix single for loop...

[osm/NBI.git] / osm_nbi / descriptor_topics.py

diff --git a/osm_nbi/descriptor_topics.py b/osm_nbi/descriptor_topics.py
index 9f022f4..a1c3c15 100644 (file)
--- a/osm_nbi/descriptor_topics.py
+++ b/osm_nbi/descriptor_topics.py
@@ -687,6 +687,10 @@ class NsdTopic(DescriptorTopic):
         # 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")):
         # 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"]:
             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"]: