X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=5b6cce19b75b652ea940914960050372dc1605a5;hp=d93feb0efbfb4f10cecabcda5c0f21c512c71669;hb=cddb07d092fdcf72ce2c87cd801b93732e64d3a9;hpb=6b02b05e51fb2837731027ae063ecbdb2c71135d diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index d93feb0..5b6cce1 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -286,7 +286,7 @@ ns_instantiate = { "nsDescription": {"oneOf": [description_schema, null_schema]}, "nsdId": id_schema, "vimAccountId": id_schema, - "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]}, + "wimAccountId": {"oneOf": [id_schema, bool_schema, null_schema]}, "placement-engine": string_schema, "placement-constraints": object_schema, "additionalParamsForNs": object_schema, @@ -328,10 +328,10 @@ ns_instantiate = { "type": "object", "properties": { "name": string_schema, - "vim-network-name": {"OneOf": [string_schema, object_schema]}, - "vim-network-id": {"OneOf": [string_schema, object_schema]}, + "vim-network-name": {"oneOf": [string_schema, object_schema]}, + "vim-network-id": {"oneOf": [string_schema, object_schema]}, "ns-net": object_schema, - "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]}, + "wimAccountId": {"oneOf": [id_schema, bool_schema, null_schema]}, "ip-profile": object_schema, "provider-network": provider_network_schema, "vnfd-connection-point-ref": { @@ -832,7 +832,7 @@ user_edit_schema = { # PROJECTS topics_with_quota = ["vnfds", "nsds", "slice_templates", "pduds", "ns_instances", "slice_instances", "vim_accounts", - "wim_accounts", "sdn_controllers", "k8sclusters", "k8srepos", "osmrepos"] + "wim_accounts", "sdn_controllers", "k8sclusters", "k8srepos", "osmrepos", "ns_subscriptions"] project_new_schema = { "$schema": "http://json-schema.org/draft-04/schema#", "title": "New project schema for administrators", @@ -938,8 +938,8 @@ nsi_vld_instantiate = { "type": "object", "properties": { "name": string_schema, - "vim-network-name": {"OneOf": [string_schema, object_schema]}, - "vim-network-id": {"OneOf": [string_schema, object_schema]}, + "vim-network-name": {"oneOf": [string_schema, object_schema]}, + "vim-network-id": {"oneOf": [string_schema, object_schema]}, "ip-profile": object_schema, }, "required": ["name"], @@ -984,6 +984,129 @@ nsi_terminate = { } +nsinstancesubscriptionfilter_schema = { + "title": "instance identifier schema", + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "properties": { + "nsdIds": {"type": "array"}, + "vnfdIds": {"type": "array"}, + "pnfdIds": {"type": "array"}, + "nsInstanceIds": {"type": "array"}, + "nsInstanceNames": {"type": "array"}, + }, +} + +nslcmsub_schema = { + "title": "nslcmsubscription input schema", + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "properties": { + "nsInstanceSubscriptionFilter": nsinstancesubscriptionfilter_schema, + "notificationTypes": { + "type": "array", + "items": { + "enum": ['NsLcmOperationOccurrenceNotification', 'NsChangeNotification', + 'NsIdentifierCreationNotification', 'NsIdentifierDeletionNotification'] + } + }, + "operationTypes": { + "type": "array", + "items": { + "enum": ['INSTANTIATE', 'SCALE', 'TERMINATE', 'UPDATE', 'HEAL'] + } + }, + "operationStates": { + "type": "array", + "items": { + "enum": ['PROCESSING', 'COMPLETED', 'PARTIALLY_COMPLETED', 'FAILED', + 'FAILED_TEMP', 'ROLLING_BACK', 'ROLLED_BACK'] + } + }, + "nsComponentTypes": { + "type": "array", + "items": { + "enum": ['VNF', 'NS', 'PNF'] + } + }, + "lcmOpNameImpactingNsComponent": { + "type": "array", + "items": { + "enum": ['VNF_INSTANTIATE', 'VNF_SCALE', 'VNF_SCALE_TO_LEVEL', 'VNF_CHANGE_FLAVOUR', + 'VNF_TERMINATE', 'VNF_HEAL', 'VNF_OPERATE', 'VNF_CHANGE_EXT_CONN', 'VNF_MODIFY_INFO', + 'NS_INSTANTIATE', 'NS_SCALE', 'NS_UPDATE', 'NS_TERMINATE', 'NS_HEAL'] + } + }, + "lcmOpOccStatusImpactingNsComponent": { + "type": "array", + "items": { + "enum": ['START', 'COMPLETED', 'PARTIALLY_COMPLETED', 'FAILED', 'ROLLED_BACK'] + } + }, + }, + "allOf": [ + { + "if": { + "properties": { + "notificationTypes": { + "contains": {"const": "NsLcmOperationOccurrenceNotification"} + } + }, + }, + "then": { + "anyOf": [ + {"required": ["operationTypes"]}, + {"required": ["operationStates"]}, + ] + } + }, + { + "if": { + "properties": { + "notificationTypes": { + "contains": {"const": "NsChangeNotification"} + } + }, + }, + "then": { + "anyOf": [ + {"required": ["nsComponentTypes"]}, + {"required": ["lcmOpNameImpactingNsComponent"]}, + {"required": ["lcmOpOccStatusImpactingNsComponent"]}, + ] + } + } + ] +} + +authentication_schema = { + "title": "authentication schema for subscription", + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "properties": { + "authType": {"enum": ["basic"]}, + "paramsBasic": { + "type": "object", + "properties": { + "userName": shortname_schema, + "password": passwd_schema, + }, + }, + }, +} + +subscription = { + "title": "subscription input schema", + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "properties": { + "filter": nslcmsub_schema, + "CallbackUri": description_schema, + "authentication": authentication_schema + }, + "required": ["CallbackUri"], +} + class ValidationError(Exception): def __init__(self, message, http_code=HTTPStatus.UNPROCESSABLE_ENTITY):