Allow sdn-port-mapping insertion at vim creation with config:sdn-port-mapping

[osm/RO.git] / osm_ro / openmano_schemas.py

diff --git a/osm_ro/openmano_schemas.py b/osm_ro/openmano_schemas.py
index 9e15ac5..f4cbcc8 100644 (file)
--- a/osm_ro/openmano_schemas.py
+++ b/osm_ro/openmano_schemas.py
@@ -101,9 +101,9 @@ config_schema = {
         "http_console_host": nameshort_schema,
         "http_console_ports": {
             "type": "array", 
-            "items": {"OneOf" : [
+            "items": {"OneOf": [
                 port_schema, 
-                {"type":"object", "properties":{"from": port_schema, "to": port_schema}, "required": ["from","to"]} 
+                {"type": "object", "properties": {"from": port_schema, "to": port_schema}, "required": ["from", "to"]}
             ]}
         },
         "log_level": log_level_schema,
@@ -300,22 +300,22 @@ datacenter_associate_schema={
 }
 
 dhcp_schema = {
-    "title":"DHCP schema",
+    "title": "DHCP schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "type":"object",
+    "type": "object",
     "properties":{
         "enabled": {"type": "boolean"},
-        "start-address": ip_schema,
-        "count": integer1_schema
+        "start-address": {"OneOf": [{"type": "null"}, ip_schema]},
+        "count": integer0_schema
     },
     "required": ["enabled", "start-address", "count"],
 }
 
 ip_profile_schema = {
-    "title":"IP profile schema",
+    "title": "IP profile schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "type":"object",
-    "properties":{
+    "type": "object",
+    "properties": {
         "ip-version": {"type": "string", "enum": ["IPv4","IPv6"]},
         "subnet-address": ip_prefix_schema,
         "gateway-address": ip_schema,
@@ -1084,27 +1084,27 @@ instance_scenario_create_schema_v01 = {
 }
 
 instance_scenario_action_schema = {
-    "title":"instance scenario action information schema",
+    "title": "instance scenario action information schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "type":"object",
-    "properties":{
-        "start":{"type": "null"},
-        "pause":{"type": "null"},
-        "resume":{"type": "null"},
-        "shutoff":{"type": "null"},
-        "shutdown":{"type": "null"},
-        "forceOff":{"type": "null"},
-        "rebuild":{"type": "null"},
-        "reboot":{
-            "type": ["object","null"],
+    "type": "object",
+    "properties": {
+        "start": {"type": "null"},
+        "pause": {"type": "null"},
+        "resume": {"type": "null"},
+        "shutoff": {"type": "null"},
+        "shutdown": {"type": "null"},
+        "forceOff": {"type": "null"},
+        "rebuild": {"type": "null"},
+        "reboot": {
+            "type": ["object", "null"],
         },
         "add_public_key": description_schema,
         "console": {"type": ["string", "null"], "enum": ["novnc", "xvpvnc", "rdp-html5", "spice-html5", None]},
         "create-vdu": {
             "type": "array",
-            "items" :{
+            "items": {
                 "type": "object",
-                "properties":{
+                "properties": {
                     "vdu-id": id_schema,
                     "count": integer1_schema,
                 },
@@ -1114,9 +1114,9 @@ instance_scenario_action_schema = {
         },
         "delete-vdu": {
             "type": "array",
-            "items" :{
+            "items": {
                 "type": "object",
-                "properties":{
+                "properties": {
                     "vdu-id": id_schema,
                     "transaction-id": id_schema,
                 },
@@ -1125,8 +1125,8 @@ instance_scenario_action_schema = {
                 "maxProperties": 1,
             }
         },
-        "vnfs":{"type": "array", "items":{"type":"string"}},
-        "vms":{"type": "array", "items":{"type":"string"}}
+        "vnfs": {"type": "array", "items": {"type": "string"}},
+        "vms": {"type": "array", "items": {"type": "string"}}
     },
     "minProperties": 1,
     #"maxProperties": 1,