X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=ebcf94e000d89b433839eb75c94f5e7d281aaf1e;hp=e40d0ec5c65f4c0a7df5d43be933152144e037a5;hb=50c8e6ea78990816eb34e748e765c7b334657c5a;hpb=0aa89ae83e5f60a2a42a914d4063a95ad12f5139

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index e40d0ec..ebcf94e 100644
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -145,7 +145,7 @@ ip_profile_dhcp_schema = {
 }
 
 ip_profile_schema = {
-    "title": "ip profile validation schame",
+    "title": "ip profile validation schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
     "properties": {
@@ -158,7 +158,7 @@ ip_profile_schema = {
 }
 
 ip_profile_update_schema = {
-    "title": "ip profile validation schame",
+    "title": "ip profile validation schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
     "properties": {
@@ -173,14 +173,28 @@ ip_profile_update_schema = {
 }
 
 provider_network_schema = {
-    "title": "provider network validation schame",
+    "title": "provider network validation schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
     "properties": {
         "physical-network": name_schema,
         "segmentation-id": name_schema,
+        "sdn-ports": {  # external ports to append to the SDN-assist network
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "switch_id": shortname_schema,
+                    "switch_port": shortname_schema,
+                    "mac_address": mac_schema,
+                    "vlan": vlan_schema,
+                },
+                "additionalProperties": True
+            }
+        },
+        "network-type": shortname_schema,
     },
-    "additionalProperties": False
+    "additionalProperties": True
 }
 
 ns_instantiate_internal_vld = {
@@ -336,6 +350,20 @@ ns_instantiate = {
     "additionalProperties": False
 }
 
+ns_terminate = {
+    "title": "ns terminate input schema",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+        "lcmOperationType": string_schema,
+        "nsInstanceId": id_schema,
+        "autoremove": bool_schema,
+        "timeout_ns_terminate": integer1_schema,
+        "skip_terminate_primitives": bool_schema,
+    },
+    "additionalProperties": False
+}
+
 ns_action = {   # TODO for the moment it is only contemplated the vnfd primitive execution
     "title": "ns action input schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
@@ -349,6 +377,7 @@ ns_action = {   # TODO for the moment it is only contemplated the vnfd primitive
         "vdu_count_index": integer0_schema,
         "kdu_name": name_schema,
         "primitive": name_schema,
+        "timeout_ns_action": integer1_schema,
         "primitive_params": {"type": "object"},
     },
     "required": ["primitive", "primitive_params"],   # TODO add member_vnf_index
@@ -362,6 +391,7 @@ ns_scale = {   # TODO for the moment it is only VDU-scaling
         "lcmOperationType": string_schema,
         "nsInstanceId": id_schema,
         "scaleType": {"enum": ["SCALE_VNF"]},
+        "timeout_ns_scale": integer1_schema,
         "scaleVnfData": {
             "type": "object",
             "properties": {
@@ -657,7 +687,6 @@ pdu_new_schema = {
     "required": ["name", "type", "interfaces"],
     "additionalProperties": False
 }
-
 pdu_edit_schema = {
     "title": "pdu edit input schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
@@ -682,6 +711,22 @@ pdu_edit_schema = {
     "minProperties": 1
 }
 
+# VNF PKG OPERATIONS
+vnfpkgop_new_schema = {
+    "title": "VNF PKG operation creation input schema",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+        "lcmOperationType": string_schema,
+        "vnfPkgId": id_schema,
+        "kdu_name": name_schema,
+        "primitive": name_schema,
+        "primitive_params": {"type": "object"},
+    },
+    "required": ["lcmOperationType", "vnfPkgId", "kdu_name", "primitive", "primitive_params"],
+    "additionalProperties": False
+}
+
 # USERS
 project_role_mappings = {
     "title": "list pf projects/roles",
@@ -719,7 +764,7 @@ user_new_schema = {
     "type": "object",
     "properties": {
         "username": shortname_schema,
-        "user_domain_name": shortname_schema,
+        "domain_name": shortname_schema,
         "password": passwd_schema,
         "projects": nameshort_list_schema,
         "project_role_mappings": project_role_mappings,
@@ -758,7 +803,7 @@ project_new_schema = {
     "properties": {
         "name": shortname_schema,
         "admin": bool_schema,
-        "project_domain_name": shortname_schema,
+        "domain_name": shortname_schema,
         "quotas": {
             "type": "object",
             "properties": {topic: integer0_schema for topic in topics_with_quota},