Fix Bug 924: User is not allowed to upload NS Descriptors for project_user(role)

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

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index fe574e3..69caff7 100644 (file)
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -221,11 +221,35 @@ additional_params_for_vnf = {
         "properties": {
             "member-vnf-index": name_schema,
             "additionalParams": object_schema,
         "properties": {
             "member-vnf-index": name_schema,
             "additionalParams": object_schema,

+            "additionalParamsForVdu": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "vdu_id": name_schema,
+                        "additionalParams": object_schema,
+                    },
+                    "required": ["vdu_id", "additionalParams"],
+                    "additionalProperties": False,
+                },
+            },
+            "additionalParamsForKdu": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "kdu_name": name_schema,
+                        "additionalParams": object_schema,
+                    },
+                    "required": ["kdu_name", "additionalParams"],
+                    "additionalProperties": False,
+                },
+            },

         },
         },

-        "required": ["member-vnf-index", "additionalParams"],
+        "required": ["member-vnf-index"],
+        "minProperties": 2,

         "additionalProperties": False
     }
         "additionalProperties": False
     }

-

 }
 
 ns_instantiate = {
 }
 
 ns_instantiate = {


@@ -563,7 +587,7 @@ k8scluster_edit_schema = {
 }
 
 # K8s Repos
 }
 
 # K8s Repos

-k8srepo_types = {"enum": ["chart", "bundle"]}
+k8srepo_types = {"enum": ["helm-chart", "juju-bundle"]}

 k8srepo_properties = {
     "name": name_schema,
     "description": description_schema,
 k8srepo_properties = {
     "name": name_schema,
     "description": description_schema,