X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=8b9356654d1df5f094dd2982d5a53a018aa7a5c6;hb=refs%2Fchanges%2F51%2F13451%2F1;hp=3d675f6aff3d9bf7e6914e0192f448093465df65;hpb=e24f2c187c96a3cd9b4ab7fa50687c36c4614583;p=osm%2FNBI.git

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index 3d675f6a..8b935665 100644
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -96,7 +96,7 @@ ip_schema = {
 }
 ipv6_schema = {
     "type": "string",
-    "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))",
+    "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))",  # noqa: W605
 }
 ip_prefix_schema = {
     "type": "string",
@@ -137,6 +137,10 @@ ns_instantiate_vdu = {
     "type": "object",
     "properties": {
         "id": name_schema,
+        "configurable-properties": {
+            "type": "object",
+        },
+        "vim-flavor-id": name_schema,
         "volume": {
             "type": "array",
             "minItems": 1,
@@ -194,19 +198,6 @@ ip_profile_dhcp_schema = {
 }
 
 ip_profile_schema = {
-    "title": "ip profile validation schema",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "type": "object",
-    "properties": {
-        "ip-version": {"enum": ["ipv4", "ipv6"]},
-        "subnet-address": ip_prefix_schema,
-        "gateway-address": ip_schema,
-        "dns-server": ip_profile_dns_schema,
-        "dhcp-params": ip_profile_dhcp_schema,
-    },
-}
-
-ip_profile_update_schema = {
     "title": "ip profile validation schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
@@ -253,7 +244,7 @@ ns_instantiate_internal_vld = {
         "name": name_schema,
         "vim-network-name": name_schema,
         "vim-network-id": name_schema,
-        "ip-profile": ip_profile_update_schema,
+        "ip-profile": ip_profile_schema,
         "provider-network": provider_network_schema,
         "internal-connection-point": {
             "type": "array",
@@ -347,8 +338,7 @@ ns_instantiate = {
         "nsName": name_schema,
         "nsDescription": {"oneOf": [description_schema, null_schema]},
         "nsdId": id_schema,
-        "vimAccountId": {"oneOf": [id_schema, null_schema]},
-        "paasAccountId": {"oneOf": [id_schema, null_schema]},
+        "vimAccountId": id_schema,
         "wimAccountId": {"oneOf": [id_schema, bool_schema, null_schema]},
         "placement-engine": string_schema,
         "placement-constraints": object_schema,
@@ -367,8 +357,7 @@ ns_instantiate = {
                 "type": "object",
                 "properties": {
                     "member-vnf-index": name_schema,
-                    "vimAccountId": {"oneOf": [id_schema, null_schema]},
-                    "paasAccountId": {"oneOf": [id_schema, null_schema]},
+                    "vimAccountId": id_schema,
                     "vdu": {
                         "type": "array",
                         "minItems": 1,
@@ -396,7 +385,7 @@ ns_instantiate = {
                     "vim-network-id": {"oneOf": [string_schema, object_schema]},
                     "ns-net": object_schema,
                     "wimAccountId": {"oneOf": [id_schema, bool_schema, null_schema]},
-                    "ip-profile": object_schema,
+                    "ip-profile": ip_profile_schema,
                     "provider-network": provider_network_schema,
                     "vnfd-connection-point-ref": {
                         "type": "array",
@@ -423,7 +412,7 @@ ns_instantiate = {
             },
         },
     },
-    "required": ["nsName", "nsdId"],
+    "required": ["nsName", "nsdId", "vimAccountId"],
     "additionalProperties": False,
 }
 
@@ -933,48 +922,6 @@ vca_edit_schema = {
     "additionalProperties": False,
 }
 
-# PAAS
-paas_types = {"enum": ["juju"]}
-paas_new_schema = {
-    "title": "paas creation input schema",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "type": "object",
-    "properties": {
-        "schema_version": schema_version,
-        "schema_type": schema_type,
-        "name": name_schema,
-        "paas_type": paas_types,
-        "description": description_schema,
-        "endpoints": description_list_schema,
-        "user": string_schema,
-        "secret": passwd_schema,
-        "config": object_schema,
-    },
-    "required": [
-        "name",
-        "paas_type",
-        "endpoints",
-        "user",
-        "secret",
-    ],
-    "additionalProperties": False,
-}
-paas_edit_schema = {
-    "title": "paas edition input schema",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "type": "object",
-    "properties": {
-        "name": name_schema,
-        "paas_type": paas_types,
-        "description": description_schema,
-        "endpoints": description_list_schema,
-        "user": string_schema,
-        "secret": passwd_schema,
-        "config": object_schema,
-    },
-    "additionalProperties": False,
-}
-
 # K8s Repos
 k8srepo_types = {"enum": ["helm-chart", "juju-bundle"]}
 k8srepo_properties = {
@@ -1175,7 +1122,6 @@ topics_with_quota = [
     "sdn_controllers",
     "k8sclusters",
     "vca",
-    "paas",
     "k8srepos",
     "osmrepos",
     "ns_subscriptions",