X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=d93feb0efbfb4f10cecabcda5c0f21c512c71669;hp=f8b91d86d4f59e9becf1365f5ec9ba8ab667c4cc;hb=6b02b05e51fb2837731027ae063ecbdb2c71135d;hpb=b66b041b8a3669ef44d9a94643cfa4add94d7f9b diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index f8b91d8..d93feb0 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -43,7 +43,7 @@ time_schema = {"type": "string", "pattern": "^[0-9]{4}-[0-1][0-9]-[0-3][0-9]T[0- pci_schema = {"type": "string", "pattern": "^[0-9a-fA-F]{4}(:[0-9a-fA-F]{2}){2}\\.[0-9a-fA-F]$"} # allows [] for wildcards. For that reason huge length limit is set pci_extended_schema = {"type": "string", "pattern": "^[0-9a-fA-F.:-\\[\\]]{12,40}$"} -http_schema = {"type": "string", "pattern": "^https?://[^'\"=]+$"} +http_schema = {"type": "string", "pattern": "^(https?|http)://[^'\"=]+$"} bandwidth_schema = {"type": "string", "pattern": "^[0-9]+ *([MG]bps)?$"} memory_schema = {"type": "string", "pattern": "^[0-9]+ *([MG]i?[Bb])?$"} integer0_schema = {"type": "integer", "minimum": 0} @@ -831,8 +831,8 @@ user_edit_schema = { } # PROJECTS -topics_with_quota = ["vnfds", "nsds", "nsts", "pdus", "nsrs", "nsis", "vim_accounts", "wim_accounts", "sdns", - "k8sclusters", "k8srepos"] +topics_with_quota = ["vnfds", "nsds", "slice_templates", "pduds", "ns_instances", "slice_instances", "vim_accounts", + "wim_accounts", "sdn_controllers", "k8sclusters", "k8srepos", "osmrepos"] project_new_schema = { "$schema": "http://json-schema.org/draft-04/schema#", "title": "New project schema for administrators", @@ -958,7 +958,7 @@ nsi_instantiate = { "nstId": string_schema, "vimAccountId": id_schema, "timeout_nsi_deploy": integer1_schema, - "ssh_keys": {"type": "string"}, + "ssh_keys": {"type": "array", "items": {"type": "string"}}, "nsi_id": id_schema, "additionalParamsForNsi": object_schema, "netslice-subnet": {