X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=6e43be59c053e6c8d2b027993a5988fd1f0d6f14;hp=b6ef64c1d8aca6e81e83d43c019fbb44c48f2b02;hb=2125a31711a94d2c21c24fe4aa768a2f3823f3cb;hpb=1f029d84b9597d3986a33dcd847b0d97d2bad077 diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index b6ef64c..6e43be5 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -631,6 +631,7 @@ user_edit_schema = { } # PROJECTS +topics_with_quota = ["vnfds", "nsds", "nsts", "pdus", "nsrs", "nsis", "vim_accounts", "wim_accounts", "sdns"] project_new_schema = { "$schema": "http://json-schema.org/draft-04/schema#", "title": "New project schema for administrators", @@ -638,6 +639,11 @@ project_new_schema = { "properties": { "name": shortname_schema, "admin": bool_schema, + "quotas": { + "type": "object", + "properties": {topic: integer0_schema for topic in topics_with_quota}, + "additionalProperties": False + }, }, "required": ["name"], "additionalProperties": False @@ -649,6 +655,11 @@ project_edit_schema = { "properties": { "admin": bool_schema, "name": shortname_schema, # To allow Project Name modification + "quotas": { + "type": "object", + "properties": {topic: {"oneOf": [integer0_schema, null_schema]} for topic in topics_with_quota}, + "additionalProperties": False + }, }, "additionalProperties": False, "minProperties": 1 @@ -807,5 +818,5 @@ def is_valid_uuid(x): try: if UUID(x): return True - except (TypeError, ValueError): + except (TypeError, ValueError, AttributeError): return False