X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=acb53c00e5941ab3916c68be96bfbe487ca0a53d;hp=2d1adcec399aa1eb918e2ee072869e2f4c4238c9;hb=c768937d5bb7b31e827aca36c9ab8c3cf1fdb34b;hpb=15089c6b752976bf4965246d3430833ac758b60e diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index 2d1adce..acb53c0 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -381,7 +381,7 @@ vim_account_new_schema = { "description": description_schema, "vim": name_schema, "datacenter": name_schema, - "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"]}, + "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws", "azure", "fos"]}, "vim_url": description_schema, # "vim_url_admin": description_schema, # "vim_tenant": name_schema, @@ -648,22 +648,20 @@ roles_new_schema = { "type": "object", "properties": { "name": shortname_schema, - "definition": object_schema, + "root": bool_schema, }, - "required": ["name"], - "additionalProperties": False + "required": ["name", "root"], + "additionalProperties": True } roles_edit_schema = { "$schema": "http://json-schema.org/draft-04/schema#", "title": "Roles edit schema for administrators", "type": "object", "properties": { - "_id": id_schema, - "name": shortname_schema, - "definition": object_schema, + "root": bool_schema, }, - "required": ["_id", "name", "definition"], - "additionalProperties": False, + "required": ["root"], + "additionalProperties": True, "minProperties": 1 }