From d693824f808b5b374606cc21fd39b6a8859f2aef Mon Sep 17 00:00:00 2001 From: Elian Kraja Date: Tue, 8 Jan 2019 17:33:23 +0100 Subject: [PATCH] Completed bug fixing on SOL002 and SOL003 --- SOL002/VNFFaultManagement-API/Alarms.robot | 6 +- .../EscalatePerceivedSeverityTask.robot | 4 +- .../IndividualAlarm.robot | 9 +- .../IndividualSubscription.robot | 6 +- .../Subscriptions.robot | 8 +- ...schema.json => FmSubscription.schema.json} | 0 .../schemas/FmSubscriptions.schema.json | 87 ++ .../schemas/alarmNotification.schema.json | 8 +- .../schemas/alarms.schema.json | 190 ++++ .../IndividualVNFindicator.robot | 2 +- SOL002/VNFIndicator-API/Subscriptions.robot | 6 +- .../VnfIndicatorSubscription.schema.json | 143 ++- .../VnfIndicatorSubscriptions.schema.json | 1 + .../schemas/vnfIndicator.schema.json | 62 ++ .../CancelOperationTask.robot | 10 +- .../ChangeExternalVNFConnectivityTask.robot | 6 +- .../ChangeVNFFlavourTask.robot | 10 +- .../FailOperationTask.robot | 10 +- .../HealVNFTask.robot | 10 +- .../IndividualSubscription.robot | 6 +- .../IndividualVNFInstance.robot | 17 +- .../IndividualVnfLcmOperationOccurence.robot | 19 +- .../InstantiateVNFTask.robot | 6 +- .../OperateVNFTask.robot | 10 +- .../RetryOperationTask.robot | 10 +- .../RollbackOperationTask.robot | 12 +- .../ScaleVNFTask.robot | 10 +- .../ScaleVNFToLevelTask.robot | 10 +- .../Subscriptions.robot | 4 +- .../TerminateVNFTask.robot | 8 +- .../VNFInstances.robot | 4 +- .../VnfLcmOperationOccurences.robot | 2 +- .../schemas/subscription.schema.json | 181 ++++ .../schemas/subscriptions.schema.json | 278 +++-- .../schemas/vnfInstance.schema.json | 4 +- .../schemas/vnfInstances.schema.json | 986 ++++++++++++++++++ .../schemas/vnfLcmOpOcc.schema.json | 2 - .../schemas/vnfLcmOpOccs.schema.json | 633 +++++++++++ .../IndividualSubscription.robot | 2 +- .../VNFPerformanceManagement-API/PMJobs.robot | 12 +- .../Subscriptions.robot | 2 +- .../Thresholds.robot | 4 +- .../schemas/PmJobs.schema.json | 134 +++ .../schemas/PmSubscription.schema.json | 142 +++ .../schemas/Threshold.schema.json | 86 +- .../schemas/Thresholds.schema.json | 1 + .../Subscriptions.robot | 8 +- .../VNFPackages.robot | 10 +- .../schemas/PkgmSubscription.schema.json | 143 ++- .../schemas/PkgmSubscriptions.schema.json | 1 + .../schemas/vnfPkgInfo.schema.json | 283 ++++- .../schemas/vnfPkgsInfo.schema.json | 1 + .../PackageOnboardingNotification.schema.json | 0 .../IndividualSubscription.robot | 2 +- .../VNFPerformanceManagement-API/PMJobs.robot | 12 +- .../Subscriptions.robot | 4 +- .../Thresholds.robot | 4 +- .../schemas/PmJobs.schema.json | 134 +++ .../schemas/PmSubscription.schema.json | 142 +++ .../schemas/Threshold.schema.json | 86 +- .../schemas/Thresholds.schema.json | 88 ++ 61 files changed, 3773 insertions(+), 308 deletions(-) rename SOL002/VNFFaultManagement-API/schemas/{subscriptions.schema.json => FmSubscription.schema.json} (100%) create mode 100644 SOL002/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json create mode 100644 SOL002/VNFFaultManagement-API/schemas/alarms.schema.json create mode 100644 SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscriptions.schema.json create mode 100644 SOL002/VNFIndicator-API/schemas/vnfIndicator.schema.json create mode 100644 SOL002/VNFLifecycleManagement-API/schemas/subscription.schema.json create mode 100644 SOL002/VNFLifecycleManagement-API/schemas/vnfInstances.schema.json create mode 100644 SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json create mode 100644 SOL002/VNFPerformanceManagement-API/schemas/PmJobs.schema.json create mode 100644 SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json create mode 100644 SOL002/VNFPerformanceManagement-API/schemas/Thresholds.schema.json create mode 100644 SOL003/VNFPackageManagement-API/schemas/PkgmSubscriptions.schema.json create mode 100644 SOL003/VNFPackageManagement-API/schemas/vnfPkgsInfo.schema.json delete mode 100644 SOL003/VNFPackageManagementNotification-API_nxw/schemas/PackageOnboardingNotification.schema.json create mode 100644 SOL003/VNFPerformanceManagement-API/schemas/PmJobs.schema.json create mode 100644 SOL003/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json create mode 100644 SOL003/VNFPerformanceManagement-API/schemas/Thresholds.schema.json diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot index 61ea4463..7da097d1 100644 --- a/SOL002/VNFFaultManagement-API/Alarms.robot +++ b/SOL002/VNFFaultManagement-API/Alarms.robot @@ -7,7 +7,7 @@ Library JSONLibrary Library JSONSchemaLibrary schemas/ Library OperatingSystem -*** Test cases *** +*** Test Cases *** POST Alarms - Method not implemented log Trying to perform a PUT. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} @@ -28,7 +28,7 @@ Get information about multiple alarms Should Contain ${contentType} ${CONTENT_TYPE} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json alarm.schema.json ${json} + Validate Json alarms.schema.json ${json} Log Validation OK Get information about multiple alarms with filters @@ -43,7 +43,7 @@ Get information about multiple alarms with filters Should Contain ${contentType} ${CONTENT_TYPE} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json alarm.schema.json ${json} + Validate Json alarms.schema.json ${json} Log Validation OK Get information about multiple alarms Bad Request Invalid attribute-based filtering parameters diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot index 6a85191a..6b8e8578 100644 --- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot +++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot @@ -2,7 +2,7 @@ Resource environment/variables.txt Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} ... spec=SOL002-VNFFaultManagement-API.yaml -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Escalate the perceived severity @@ -43,7 +43,7 @@ DELETE Escalate the perceived severity - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot index 3742cd80..8ca82026 100644 --- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot +++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot @@ -12,7 +12,7 @@ Library DependencyLibrary ${Etag}= an etag ${Etag_modified}= a modified etag -*** Test cases *** +*** Test Cases *** POST Alarm - Method not implemented log Trying to perform a POST. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} @@ -66,9 +66,9 @@ PATCH Alarm PATCH Alarm - Conflict [Documentation] Conflict - ... The operation cannot be executed currently, due to a conflict with the state of the “Individual alarm” resource. + ... The operation cannot be executed currently, due to a conflict with the state of the �Individual alarm� resource. ... Typically, this is due to the fact that the alarm is already in the state that is requested to be set (such as trying to acknowledge an already-acknowledged alarm). - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. Depends On Test PATCH Alarm # If the previous test scceeded, it means that the alarm is in ackownledged state log Trying to perform a PATCH. This method modifies an individual alarm resource Set Headers {"Accept":"${ACCEPT}"} @@ -87,7 +87,7 @@ PATCH Alarm - Precondition failed [Documentation] Precondition Failed ... A precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, ... indicating that the resource was modified by another entity. The response body should contain a ProblemDetails structure, - ... in which the “detail” attribute should convey more information about the error. + ... in which the �detail� attribute should convey more information about the error. Depends On Test PATCH Alarm # If the previous test scceeded, it means that Etag has been modified log Trying to perform a PATCH. This method modifies an individual alarm resource Set Headers {"Accept":"${ACCEPT}"} @@ -109,5 +109,4 @@ DELETE Alarm - Method not implemented Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Delete ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId} Log Validate Status code - Integer response status 405 diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot index 0a01891b..4b0746fd 100644 --- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot +++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot @@ -6,7 +6,7 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} ... spec=SOL002-VNFFaultManagement-API.yaml Documentation This resource represents an individual subscription for VNF alarms. ... The client can use this resource to read and to terminate a subscription to notifications related to VNF fault management. -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Post Individual Subscription - Method not implemented @@ -29,7 +29,7 @@ Get Information about an individual subscription Should Contain ${contentType} ${CONTENT_TYPE} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json subscriptions.schema.json ${json} + Validate Json FmSubscription.schema.json ${json} Log Validation OK PUT an individual subscription - Method not implemented @@ -60,7 +60,7 @@ DELETE an individual subscription Output response Integer response status 204 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot index 36783dd3..7671246a 100644 --- a/SOL002/VNFFaultManagement-API/Subscriptions.robot +++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot @@ -22,7 +22,7 @@ Create a new subscription Should Contain ${contentType} ${CONTENT_TYPE} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json subscriptions.schema.json ${json} + Validate Json FmSubscription.schema.json ${json} Log Validation OK Create a new Subscription - DUPLICATION @@ -39,7 +39,7 @@ Create a new Subscription - DUPLICATION Should Contain ${contentType} ${CONTENT_TYPE} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json subscriptions.schema.json ${json} + Validate Json FmSubscription.schema.json ${json} Log Validation OK Create a new Subscription - NO-DUPLICATION @@ -67,7 +67,7 @@ GET Subscriptions Integer response status 200 ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json subscriptions.schema.json ${json} + Validate Json FmSubscriptions.schema.json ${json} Log Validation OK GET Subscription - Filter @@ -79,7 +79,7 @@ GET Subscription - Filter Log Received a 200 OK as expected ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json subscriptions.schema.json ${json} + Validate Json FmSubscriptions.schema.json ${json} Log Validation OK GET subscriptions - Bad Request Invalid attribute-based filtering parameters diff --git a/SOL002/VNFFaultManagement-API/schemas/subscriptions.schema.json b/SOL002/VNFFaultManagement-API/schemas/FmSubscription.schema.json similarity index 100% rename from SOL002/VNFFaultManagement-API/schemas/subscriptions.schema.json rename to SOL002/VNFFaultManagement-API/schemas/FmSubscription.schema.json diff --git a/SOL002/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json b/SOL002/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json new file mode 100644 index 00000000..6394f381 --- /dev/null +++ b/SOL002/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json @@ -0,0 +1,87 @@ +{ + "type": "array", + "items": { + "description": "This type represents a subscription related to notifications related to the availability of the virtualised resources quotas.\n", + "type": "object", + "required": [ + "id", + "callbackUri", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "filter": { + "description": "This type represents a subscription filter related to notifications about the availability of the virtualised resources quotas. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n", + "type": "object", + "properties": { + "vimIds": { + "description": "Match VIMs that were created the quota for a consumer of the virtualised resources. This attribute shall only be supported when VNF-related Resource Management in direct mode is applicable.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "resourceProviderIds": { + "description": "Match the entities responsible for the management of the virtualised resources that were allocated by the NFVO. This attribute shall only be supported when VNF-related Resource Management in indirect mode is applicable. The identification scheme is outside the scope of the present document.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "resourceTypes": { + "description": "Match particular resource types.\n", + "type": "array", + "items": { + "type": "string", + "enum": [ + "COMPUTE", + "STORAGE", + "NETWORK" + ] + } + }, + "resourceGroupIds": { + "description": "Match the \"infrastructure resource groups\" that are logical groupings of the virtualised resources assigned to a tenant within an infrastructure Domain.\n", + "type": "array", + "items": { + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n", + "type": "string" + } + } + } + }, + "callbackUri": { + "description": "String formatted according to IETF RFC 3986.\n", + "type": "string" + }, + "_links": { + "description": "Links for this resource\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json index 1d31e7e3..bca2fc85 100644 --- a/SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json +++ b/SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json @@ -1,9 +1,4 @@ { - "name": "AlarmNotification", - "description": "Information of a VNF alarm.\n", - "in": "body", - "required": true, - "schema": { "description": "This type represents an alarm notification about VNF faults. This notification shall be triggered by the VNFM when: * An alarm has been created. * An alarm has been updated, e.g. if the severity of the alarm has changed.\n", "type": "object", "required": [ @@ -246,5 +241,4 @@ } } } - } -} \ No newline at end of file + } \ No newline at end of file diff --git a/SOL002/VNFFaultManagement-API/schemas/alarms.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarms.schema.json new file mode 100644 index 00000000..76c1392e --- /dev/null +++ b/SOL002/VNFFaultManagement-API/schemas/alarms.schema.json @@ -0,0 +1,190 @@ +{ + "type": "object", + "items": { + "description": "The alarm data type encapsulates information about an alarm.\n", + "type": "object", + "required": [ + "id", + "managedObjectId", + "rootCauseFaultyResource", + "alarmRaisedTime", + "ackState", + "perceivedSeverity", + "eventTime", + "eventType", + "probableCause", + "isRootCause", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "managedObjectId": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "rootCauseFaultyResource": { + "description": "This type represents the faulty virtual resources that have a negative impact on a VNF.\n", + "type": "object", + "required": [ + "faultyResource", + "faultyResourceType" + ], + "properties": { + "faultyResource": { + "required": [ + "vimConnectionId", + "resourceId" + ], + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "properties": { + "vimConnectionId": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "resourceProviderId": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "resourceId": { + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n", + "type": "string" + }, + "vimLevelResourceType": { + "description": "Type of the resource in the scope of the VIM or the resource provider.\n", + "type": "string" + } + } + }, + "faultyResourceType": { + "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n", + "type": "string", + "enum": [ + "COMPUTE", + "STORAGE", + "NETWORK" + ] + } + } + }, + "alarmRaisedTime": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + }, + "alarmChangedTime": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + }, + "alarmClearedTime": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + }, + "ackState": { + "description": "Acknowledgement state of the alarm. Permitted values: * UNACKNOWLEDGED * ACKNOWLEDGED.\n", + "type": "string", + "enum": [ + "UNACKNOWLEDGED", + "ACKNOWLEDGED" + ] + }, + "perceivedSeverity": { + "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service affecting condition has occurred and an immediate corrective action\n is required. Such a severity can be reported, for example, when a\n managed object becomes totally out of service and its capability needs\n to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting condition has developed and an urgent corrective action is required.\n Such a severity can be reported, for example, when there is a severe\n degradation in the capability of the managed object and its full\n capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a non-service affecting fault condition and that corrective action\n should be taken in order to prevent a more serious (for example,\n service affecting) fault. Such a severity can be reported, for\n example, when the detected alarm condition is not currently degrading\n the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a potential or impending service affecting fault, before any significant\n effects have been felt. Action should be taken to further diagnose (if\n necessary) and correct the problem in order to prevent it from\n becoming a more serious service affecting fault (ITU-T Recommendation\n X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or more previously reported alarms. This alarm clears all alarms for this\n managed object that have the same Alarm type, Probable cause and\n Specific problems (if given) (ITU-T Recommendation X.733).\n", + "type": "string", + "enum": [ + "CRITICAL", + "MAJOR", + "MINOR", + "WARNING", + "INDETERMINATE", + "CLEARED" + ] + }, + "eventTime": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + }, + "eventType": { + "description": "The enumeration EventType represents those types of events that trigger an alarm. * COMMUNICATIONS_ALARM: An alarm of this type is associated with the procedure and/or process required conveying information from one point\n to another (ITU-T Recommendation X.733).\n* PROCESSING_ERROR_ALARM: An alarm of this type is associated with a software or processing fault (ITU-T Recommendation X.733).\n* ENVIRONMENTAL_ALARM: An alarm of this type is associated with a condition related to an enclosure in which the equipment resides\n (ITU-T Recommendation X.733).\n* QOS_ALARM: An alarm of this type is associated with degradation in the quality of a service (ITU-T Recommendation X.733).\n* EQUIPMENT_ALARM: An alarm of this type is associated with an equipment fault (ITU-T Recommendation X.733).\n", + "type": "string", + "enum": [ + "COMMUNICATIONS_ALARM", + "PROCESSING_ERROR_ALARM", + "ENVIRONMENTAL_ALARM", + "QOS_ALARM", + "EQUIPMENT_ALARM" + ] + }, + "faultType": { + "description": "Additional information to clarify the type of the fault.\n", + "type": "string" + }, + "probableCause": { + "description": "Information about the probable cause of the fault.\n", + "type": "string" + }, + "isRootCause": { + "description": "Attribute indicating if this fault is the root for other correlated alarms. If TRUE, then the alarms listed in the attribute CorrelatedAlarmId are caused by this fault.\n", + "type": "boolean" + }, + "correlatedAlarmIds": { + "description": "List of identifiers of other alarms correlated to this fault.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "faultDetails": { + "description": "Provides additional information about the fault.\n", + "type": "array", + "items": { + "type": "string" + } + }, + "_links": { + "description": "Links for this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + }, + "objectInstance": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot index c63e60e1..afa22f96 100644 --- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot +++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot @@ -16,7 +16,7 @@ GET Individual VNF Indicator Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json vnfIndicators.schema.json ${json} + Validate Json vnfIndicator.schema.json ${json} Log Validation OK GET Individual VNF Indicator - Negative (Not Found) diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot index afffba91..4af16ecb 100644 --- a/SOL002/VNFIndicator-API/Subscriptions.robot +++ b/SOL002/VNFIndicator-API/Subscriptions.robot @@ -18,8 +18,8 @@ GET Subscription Should Contain ${contentType} application/json ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json VnfIndicatorSubscription.schema.json ${json} - Log Validated VnfIndicatorSubscription schema + Validate Json VnfIndicatorSubscriptions.schema.json ${json} + Log Validated VnfIndicatorSubscriptions schema GET Subscription - Filter Log Trying to get the list of subscriptions using filters @@ -32,7 +32,7 @@ GET Subscription - Filter Log Received a 200 OK as expected ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json VnfIndicatorSubscription.schema.json ${json} + Validate Json VnfIndicatorSubscriptions.schema.json ${json} Log Validated VnfIndicatorSubscriptions schema GET Subscription - Negative Filter diff --git a/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscription.schema.json b/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscription.schema.json index 493a2e97..bb3a85aa 100644 --- a/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscription.schema.json +++ b/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscription.schema.json @@ -1 +1,142 @@ -{ "type": "array", "items": { "description": "This type represents a subscription related to notifications about VNF indicator value changes.\n", "type": "object", "required": [ "callbackUri", "id", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "filter": { "description": "This type represents a subscription filter related to notifications about VNF indicator value changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n", "type": "object", "properties": { "vnfInstanceSubscriptionFilter": { "description": "This type represents subscription filter criteria to match VNF instances. * NOTE 1:\n The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to \n VNF instances that are based on certain VNFDs in a filter. They should not be used both\n in the same filter instance, but one alternative should be chosen.\n * NOTE 2:\n The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to\n particular VNF instances in a filter. They should not be used both in the same filter instance,\n but one alternative should be chosen.\n", "type": "object", "properties": { "vnfdIds": { "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. See NOTE 1.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "vnfProductsFromProviders": { "description": "If present, match VNF instances that belong to VNF products from certain providers. See NOTE 1.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProvider" ], "properties": { "vnfProvider": { "description": "Name of the VNF provider to match.\n", "type": "string" }, "vnfProducts": { "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProductName" ], "properties": { "vnfProductName": { "description": "Name of the VNF product to match.\n", "type": "string" }, "versions": { "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfSoftwareVersions" ], "properties": { "vnfSoftwareVersions": { "description": "A version.\n", "type": "string" }, "vnfdVersions": { "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", "type": "array", "items": { "description": "A version.\n", "type": "string" } } } } } } } } } } }, "vnfInstanceIds": { "description": "If present, match VNF instances with an instance identifier listed in this attribute. See NOTE 2.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "vnfInstanceNames": { "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. See NOTE 2\n", "type": "array", "items": { "type": "string" } } } }, "indicatorIds": { "description": "Match particular VNF indicator identifiers.\n", "type": "array", "items": { "description": "An identifier that is unique within a VNF descriptor.\n", "type": "string" } } } }, "callbackUri": { "description": "The URI of the endpoint to send the notification to.\n", "type": "string", "format": "URI" }, "_links": { "description": "Links to resources related to this resource.\n", "type": "object", "required": [ "self" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } } } } } }} \ No newline at end of file +{ + "description": "This type represents a subscription related to notifications about VNF indicator value changes.\n", + "type": "object", + "required": [ + "callbackUri", + "id", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "filter": { + "description": "This type represents a subscription filter related to notifications about VNF indicator value changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n", + "type": "object", + "properties": { + "vnfInstanceSubscriptionFilter": { + "description": "This type represents subscription filter criteria to match VNF instances. * NOTE 1:\n The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to \n VNF instances that are based on certain VNFDs in a filter. They should not be used both\n in the same filter instance, but one alternative should be chosen.\n * NOTE 2:\n The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to\n particular VNF instances in a filter. They should not be used both in the same filter instance,\n but one alternative should be chosen.\n", + "type": "object", + "properties": { + "vnfdIds": { + "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. See NOTE 1.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "vnfProductsFromProviders": { + "description": "If present, match VNF instances that belong to VNF products from certain providers. See NOTE 1.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProvider" + ], + "properties": { + "vnfProvider": { + "description": "Name of the VNF provider to match.\n", + "type": "string" + }, + "vnfProducts": { + "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProductName" + ], + "properties": { + "vnfProductName": { + "description": "Name of the VNF product to match.\n", + "type": "string" + }, + "versions": { + "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfSoftwareVersions" + ], + "properties": { + "vnfSoftwareVersions": { + "description": "A version.\n", + "type": "string" + }, + "vnfdVersions": { + "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "description": "A version.\n", + "type": "string" + } + } + } + } + } + } + } + } + } + } + }, + "vnfInstanceIds": { + "description": "If present, match VNF instances with an instance identifier listed in this attribute. See NOTE 2.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "vnfInstanceNames": { + "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. See NOTE 2\n", + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "indicatorIds": { + "description": "Match particular VNF indicator identifiers.\n", + "type": "array", + "items": { + "description": "An identifier that is unique within a VNF descriptor.\n", + "type": "string" + } + } + } + }, + "callbackUri": { + "description": "The URI of the endpoint to send the notification to.\n", + "type": "string", + "format": "URI" + }, + "_links": { + "description": "Links to resources related to this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscriptions.schema.json b/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscriptions.schema.json new file mode 100644 index 00000000..493a2e97 --- /dev/null +++ b/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscriptions.schema.json @@ -0,0 +1 @@ +{ "type": "array", "items": { "description": "This type represents a subscription related to notifications about VNF indicator value changes.\n", "type": "object", "required": [ "callbackUri", "id", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "filter": { "description": "This type represents a subscription filter related to notifications about VNF indicator value changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n", "type": "object", "properties": { "vnfInstanceSubscriptionFilter": { "description": "This type represents subscription filter criteria to match VNF instances. * NOTE 1:\n The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to \n VNF instances that are based on certain VNFDs in a filter. They should not be used both\n in the same filter instance, but one alternative should be chosen.\n * NOTE 2:\n The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to\n particular VNF instances in a filter. They should not be used both in the same filter instance,\n but one alternative should be chosen.\n", "type": "object", "properties": { "vnfdIds": { "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. See NOTE 1.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "vnfProductsFromProviders": { "description": "If present, match VNF instances that belong to VNF products from certain providers. See NOTE 1.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProvider" ], "properties": { "vnfProvider": { "description": "Name of the VNF provider to match.\n", "type": "string" }, "vnfProducts": { "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProductName" ], "properties": { "vnfProductName": { "description": "Name of the VNF product to match.\n", "type": "string" }, "versions": { "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfSoftwareVersions" ], "properties": { "vnfSoftwareVersions": { "description": "A version.\n", "type": "string" }, "vnfdVersions": { "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", "type": "array", "items": { "description": "A version.\n", "type": "string" } } } } } } } } } } }, "vnfInstanceIds": { "description": "If present, match VNF instances with an instance identifier listed in this attribute. See NOTE 2.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "vnfInstanceNames": { "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. See NOTE 2\n", "type": "array", "items": { "type": "string" } } } }, "indicatorIds": { "description": "Match particular VNF indicator identifiers.\n", "type": "array", "items": { "description": "An identifier that is unique within a VNF descriptor.\n", "type": "string" } } } }, "callbackUri": { "description": "The URI of the endpoint to send the notification to.\n", "type": "string", "format": "URI" }, "_links": { "description": "Links to resources related to this resource.\n", "type": "object", "required": [ "self" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } } } } } }} \ No newline at end of file diff --git a/SOL002/VNFIndicator-API/schemas/vnfIndicator.schema.json b/SOL002/VNFIndicator-API/schemas/vnfIndicator.schema.json new file mode 100644 index 00000000..7d12d665 --- /dev/null +++ b/SOL002/VNFIndicator-API/schemas/vnfIndicator.schema.json @@ -0,0 +1,62 @@ +{ + "type": "object", + "required": [ + "id", + "value", + "vnfInstanceId", + "_links" + ], + "properties": { + "id": { + "description": "An identifier that is unique within a VNF descriptor.\n", + "type": "string" + }, + "name": { + "type": "string" + }, + "value": { + "type": "object" + }, + "vnfInstanceId": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "_links": { + "description": "Links to resources related to this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + }, + "vnfInstance": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot index 3475ece0..b5b89598 100644 --- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot +++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot @@ -6,7 +6,7 @@ Library DependencyLibrary Library JSONLibrary Library JSONSchemaLibrary schemas/ Documentation This task resource represents the "Cancel operation" operation. The client can use this resource to cancel an ongoing VNF lifecycle operation. -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Post Cancel operation task @@ -28,7 +28,7 @@ Post Fail operation task Conflict (Not-FAILED_TEMP) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, ... or another error handling action is starting, such as retry or rollback. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. Depends on test failure Check resource FAILED_TEMP Log Final Fail an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -46,7 +46,7 @@ Post Fail operation task Conflict (parallel LCM operation) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, ... or another error handling action is starting, such as retry or rollback. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another error handling action log Final Fail an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -66,7 +66,7 @@ Post Fail operation task Not Found ... Specifically in case of this task resource, the response code 404 shall also be returned ... if the task is not supported for the VNF LCM operation occurrence represented by the parent resource, ... which means that the task resource consequently does not exist. - ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error. + ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the �detail� attribute shall convey more information about the error. [Setup] Check Fail not supported log Final fail an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -106,7 +106,7 @@ DELETE Fail operation task - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot index 3cd41f99..e277b041 100644 --- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot +++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot @@ -5,7 +5,7 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} Library OperatingSystem Library JSONLibrary Library JSONSchemaLibrary schemas/ -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Change external VNF connectivity @@ -27,7 +27,7 @@ Change external VNF connectivity Conflict (parallel LCM operation) [Documentation] Conflict ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that another LCM operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another LCM operation log Trying to change the deployment flavour of a VNF instance. Set Headers {"Accept":"${ACCEPT}"} @@ -72,7 +72,7 @@ DELETE Change external VNF connectivity - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot index 4a2ebaed..ac35e930 100644 --- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot +++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot @@ -5,7 +5,7 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} Library OperatingSystem Library JSONLibrary Library JSONSchemaLibrary schemas/ -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Change deployment flavour of a vnfInstance @@ -28,7 +28,7 @@ Change deployment flavour of a vnfInstance Conflict (Not-Instantiated) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, ... or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Check resource not instantiated Log Trying to change the deployment flavour of a VNF instance. Set Headers {"Accept":"${ACCEPT}"} @@ -49,7 +49,7 @@ Change deployment flavour of a vnfInstance Conflict (parallel LCM operation) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, ... or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another LCM operation log Trying to change the deployment flavour of a VNF instance. Set Headers {"Accept":"${ACCEPT}"} @@ -70,7 +70,7 @@ Change deployment flavour of a vnfInstance Not Found [Documentation] Not Found ... Error: The API producer did not find a current representation for the target resource or is not willing to disclose that one exists. ... Specifically in case of this task resource, the response code 404 shall also returned if the task is not supported for the VNF instance represented by the parent resource, which means that the task resource consequently does not exist. - ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error. + ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the �detail� attribute shall convey more information about the error. [Setup] Check change flavour not supported Log Trying to change the deployment flavour of a VNF instance, not exist Set Headers {"Accept":"${ACCEPT}"} @@ -114,7 +114,7 @@ DELETE Change deployment flavour VNFInstance - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot index 2b9b6f3b..519a6d3e 100644 --- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot +++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot @@ -9,7 +9,7 @@ Documentation This task resource represents the "Fail operation" operation. ... The client can use this resource to mark a VNF lifecycle management operation occurrence as "finally failed", ... i.e. change the state of the related VNF LCM operation occurrence resource to "FAILED", if it is not assumed that a subsequent retry or rollback will succeed. ... Once the operation is marked as "finally failed", it cannot be retried or rolled back anymore. -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Post Fail operation task @@ -31,7 +31,7 @@ Post Fail operation task Conflict (Not-FAILED_TEMP) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, ... or another error handling action is starting, such as retry or rollback. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. Depends on test failure Check resource FAILED_TEMP Log Final Fail an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -49,7 +49,7 @@ Post Fail operation task Conflict (parallel LCM operation) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, ... or another error handling action is starting, such as retry or rollback. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another error handling action log Final Fail an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -69,7 +69,7 @@ Post Fail operation task Not Found ... Specifically in case of this task resource, the response code 404 shall also be returned ... if the task is not supported for the VNF LCM operation occurrence represented by the parent resource, ... which means that the task resource consequently does not exist. - ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error. + ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the �detail� attribute shall convey more information about the error. [Setup] Check Fail not supported log Final fail an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -109,7 +109,7 @@ DELETE Fail operation task - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot index a1fa4cb8..5f89ea8e 100644 --- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot +++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot @@ -5,7 +5,7 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} Library OperatingSystem Library JSONLibrary Library JSONSchemaLibrary schemas/ -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Heal a vnfInstance @@ -28,7 +28,7 @@ Heal a vnfInstance Conflict (Not-Instantiated) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, ... or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Check resource not instantiated Log Trying to heal a VNF instance. Set Headers {"Accept":"${ACCEPT}"} @@ -49,7 +49,7 @@ Heal a vnfInstance Conflict (parallel LCM operation) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, ... or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another LCM operation log Trying to heal a VNF instance. Set Headers {"Accept":"${ACCEPT}"} @@ -70,7 +70,7 @@ Heal a vnfInstance Not Found [Documentation] Not Found ... Error: The API producer did not find a current representation for the target resource or is not willing to disclose that one exists. ... Specifically in case of this task resource, the response code 404 shall also returned if the task is not supported for the VNF instance represented by the parent resource, which means that the task resource consequently does not exist. - ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error. + ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the �detail� attribute shall convey more information about the error. [Setup] Check heal not supported Log Trying to heal a VNF instance, not exist Set Headers {"Accept":"${ACCEPT}"} @@ -113,7 +113,7 @@ DELETE Heal VNFInstance - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot index ea5d2776..e6cb7a10 100644 --- a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot +++ b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot @@ -6,7 +6,7 @@ Library JSONLibrary Library JSONSchemaLibrary schemas/ Documentation This resource represents an individual subscription. The client can use this resource to read and to terminate a ... subscription to notifications related to VNF lifecycle management -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Post Individual Subscription - Method not implemented @@ -27,7 +27,7 @@ Get Information about an individual subscription Integer response status 200 ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json subscriptions.schema.json ${json} + Validate Json subscription.schema.json ${json} Log Validation OK PUT an individual subscription - Method not implemented @@ -56,7 +56,7 @@ DELETE an individual subscription Log Validate Status code Integer response status 204 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot index f805d32d..3a050171 100644 --- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot +++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot @@ -9,7 +9,7 @@ Library JSONLibrary Library JSONSchemaLibrary schemas/ Documentation This resource represents an individual VNF instance. The client can use this resource to modify and delete the ... underlying VNF instance, and to read information about the VNF instance. -Suite setup Check resource existance +Suite Setup Check resource existance *** Variables *** ${Etag}= an etag @@ -17,7 +17,7 @@ ${Etag_modified}= a modified etag *** Test Cases *** Post Individual VNFInstance - Method not implemented - log Trying to perform a POST. This method should not be implemented + Log Trying to perform a POST. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -26,7 +26,7 @@ Post Individual VNFInstance - Method not implemented Integer response status 405 Get Information about an individual VNF Instance - log Trying to get information about an individual VNF instance + Log Trying to get information about an individual VNF instance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -42,7 +42,7 @@ Get Information about an individual VNF Instance Log Validation OK PUT Individual VNFInstance - Method not implemented - log Trying to perform a PUT. This method should not be implemented + Log Trying to perform a PUT. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -72,7 +72,7 @@ PATCH Individual VNFInstance Precondition failed [Documentation] Precondition Failed ... A precondition given in an HTTP request header is not fulfilled. ... Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity. - ... The response body should contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body should contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. Depends On Test PATCH Individual VNFInstance # If the previous test scceeded, it means that Etag has been modified log Trying to modify an individual VNF instance Precondition failed Set Headers {"Accept":"${ACCEPT}"} @@ -94,7 +94,7 @@ PATCH Individual VNFInstance Conflict # TODO: Need to set the pre-condition of the test [Documentation] Conflict ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. - ... Typically, this is due to the fact that another LCM operation is ongoing. The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... Typically, this is due to the fact that another LCM operation is ongoing. The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another LCM operation log Trying to modify an individual VNF instance Set Headers {"Accept":"${ACCEPT}"} @@ -126,7 +126,7 @@ DELETE Individual VNFInstance Conflict [Documentation] Conflict ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in INSTANTIATED state. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Check resource instantiated log Trying to delete an individual VNF instance Conflict Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -140,8 +140,7 @@ DELETE Individual VNFInstance Conflict Validate Json ProblemDetails.schema.json ${json} Log Validation OK -*** Key words *** - +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot index 97b748e4..dabe95a3 100644 --- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot +++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot @@ -10,19 +10,18 @@ Documentation This resource represents a VNF lifecycle management operation o ... handling of operation errors via retrying the operation, rolling back the operation, or permanently failing the operation *** Test Cases *** - Post Individual VNF LCM OP occurences - Method not implemented - log Trying to perform a POST. This method should not be implemented + Log Trying to perform a POST. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} Log Validate Status code Integer response status 405 -Get stauts information about multiple VNF instances +Get Individual VNF LCM OP occurences [Documentation] Get Operation Status ... The client can use this method to retrieve status information about a VNF lifecycle management operation occurrence - ... by reading an individual “VNF LCM operation occurrence” resource. + ... by reading an individual �VNF LCM operation occurrence� resource. Log Query status information about multiple VNF lifecycle management operation occurrences. Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -37,24 +36,24 @@ Get stauts information about multiple VNF instances Validate Json vnfLcmOpOcc.schema.json ${json} Log Validation OK -PUT stauts information about multiple VNF instances - Method not implemented - log Trying to perform a PUT. This method should not be implemented +PUT Individual VNF LCM OP occurences - Method not implemented + Log Trying to perform a PUT. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Put ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} Log Validate Status code Integer response status 405 -PATCH stauts information about multiple VNF instances - Method not implemented - log Trying to perform a PATCH. This method should not be implemented +PATCH Individual VNF LCM OP occurences - Method not implemented + Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} Log Validate Status code Integer response status 405 -DELETE stauts information about multiple VNF instances - Method not implemented - log Trying to perform a DELETE. This method should not be implemented +DELETE Individual VNF LCM OP occurences - Method not implemented + Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Delete ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot index df669342..56b9bc23 100644 --- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot +++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot @@ -6,7 +6,7 @@ Library DependencyLibrary Library OperatingSystem Library JSONLibrary Library JSONSchemaLibrary schemas/ -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** @@ -29,7 +29,7 @@ Instantiate a vnfInstance Conflict [Documentation] Conflict. ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in INSTANTIATED state. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Check resource instantiated Log Trying to Instantiate a vnf Instance Set Headers {"Accept":"${ACCEPT}"} @@ -74,7 +74,7 @@ DELETE Instantiate VNFInstance - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot index 46d7093c..4e5cd6eb 100644 --- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot +++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot @@ -5,7 +5,7 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} Library OperatingSystem Library JSONLibrary Library JSONSchemaLibrary schemas/ -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Operate a vnfInstance @@ -28,7 +28,7 @@ Operate a vnfInstance Conflict (Not-Instantiated) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, ... or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Check resource not instantiated Log Trying to change the operational state of a VNF instance. Set Headers {"Accept":"${ACCEPT}"} @@ -49,7 +49,7 @@ Operate a vnfInstance Conflict (parallel LCM operation) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, ... or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another LCM operation log Trying to change the operational state of a VNF instance. Set Headers {"Accept":"${ACCEPT}"} @@ -70,7 +70,7 @@ Operate a vnfInstance Not Found [Documentation] Not Found ... Error: The API producer did not find a current representation for the target resource or is not willing to disclose that one exists. ... Specifically in case of this task resource, the response code 404 shall also returned if the task is not supported for the VNF instance represented by the parent resource, which means that the task resource consequently does not exist. - ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error. + ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the �detail� attribute shall convey more information about the error. [Setup] Check operate not supported Log Trying to change the operational state of a VNF instance, not exist Set Headers {"Accept":"${ACCEPT}"} @@ -114,7 +114,7 @@ DELETE Operate VNFInstance - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot index 998f5c78..edc6c385 100644 --- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot +++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot @@ -6,7 +6,7 @@ Library DependencyLibrary Library JSONLibrary Library JSONSchemaLibrary schemas/ Documentation This task resource represents the "Retry operation" operation. The client can use this resource to initiate retrying a VNF lifecycle operation. -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Post Retry operation task @@ -29,7 +29,7 @@ Post Retry operation task Conflict (Not-FAILED_TEMP) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, ... or another error handling action is starting, such as rollback or fail. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. Depends on test failure Check resource FAILED_TEMP Log Retry an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -49,7 +49,7 @@ Post Retry operation task Conflict (parallel LCM operation) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, ... or another error handling action is starting, such as rollback or fail. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another error handling action log Retry an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -69,7 +69,7 @@ Post Retry operation task Not Found ... Specifically in case of this task resource, the response code 404 shall also be returned ... if the task is not supported for the VNF LCM operation occurrence represented by the parent resource, ... which means that the task resource consequently does not exist. - ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error. + ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the �detail� attribute shall convey more information about the error. [Setup] Check retry not supported log Retry an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -109,7 +109,7 @@ DELETE Retry operation task - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot index 9dab30f9..cdd00647 100644 --- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot +++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot @@ -6,12 +6,12 @@ Library DependencyLibrary Library JSONLibrary Library JSONSchemaLibrary schemas/ Documentation This task resource represents the "Rollback operation" operation. The client can use this resource to initiate rolling back a VNF lifecycle operation -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Post Rollback operation task [Documentation] The POST method initiates rolling back a VNF lifecycle operation if that operation has experienced a temporary failure, - ... i.e. the related “VNF LCM operation occurrence” resource is in “FAILED_TEMP” state. + ... i.e. the related �VNF LCM operation occurrence� resource is in �FAILED_TEMP� state. Depends on test Check resource FAILED_TEMP Log Rollback a VNF lifecycle operation if that operation has experienced a temporary failure Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -29,7 +29,7 @@ Post Rollback operation task Conflict (Not-FAILED_TEMP) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, ... or another error handling action is starting, such as retry or fail. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. Depends on test failure Check resource FAILED_TEMP Log Rollback an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -48,7 +48,7 @@ Post Rollback operation task Conflict (parallel LCM operation) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, ... or another error handling action is starting, such as retry or fail. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another error handling action log Rollback an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -68,7 +68,7 @@ Post Rollback operation task Not Found ... Specifically in case of this task resource, the response code 404 shall also be returned ... if the task is not supported for the VNF LCM operation occurrence represented by the parent resource, ... which means that the task resource consequently does not exist. - ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error. + ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the �detail� attribute shall convey more information about the error. [Setup] Check Rollback not supported log Rollback an operation Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -109,7 +109,7 @@ DELETE Rollback operation task - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot index 20ed3720..a1a7e0cb 100644 --- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot +++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot @@ -5,7 +5,7 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} Library OperatingSystem Library JSONLibrary Library JSONSchemaLibrary schemas/ -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Scale a vnfInstance @@ -27,7 +27,7 @@ Scale a vnfInstance Conflict (Not-Instantiated) [Documentation] Conflict. ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Check resource not instantiated Log Trying to Scale a vnf Instance Set Headers {"Accept":"${ACCEPT}"} @@ -47,7 +47,7 @@ Scale a vnfInstance Conflict (parallel LCM operation) [Documentation] Conflict ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another LCM operation log Trying to Scale a vnf Instance Set Headers {"Accept":"${ACCEPT}"} @@ -68,7 +68,7 @@ Scale a vnfInstance Not Found [Documentation] Not Found ... Error: The API producer did not find a current representation for the target resource or is not willing to disclose that one exists. ... Specifically in case of this task resource, the response code 404 shall also returned if the task is not supported for the VNF instance represented by the parent resource, which means that the task resource consequently does not exist. - ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error. + ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the �detail� attribute shall convey more information about the error. [Setup] Check scale not supported Log Trying to scale a vnf Instance, not exist Set Headers {"Accept":"${ACCEPT}"} @@ -111,7 +111,7 @@ DELETE Scale VNFInstance - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot index a5c2fe64..1c54fde8 100644 --- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot +++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot @@ -5,7 +5,7 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} Library OperatingSystem Library JSONLibrary Library JSONSchemaLibrary schemas/ -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Scale a vnfInstance to level @@ -27,7 +27,7 @@ Scale a vnfInstance to level Conflict (Not-Instantiated) [Documentation] Conflict. ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Check resource not instantiated Log Trying to Scale a vnf Instance Set Headers {"Accept":"${ACCEPT}"} @@ -46,7 +46,7 @@ Scale a vnfInstance to level Conflict (parallel LCM operation) [Documentation] Conflict ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another LCM operation log Trying to Scale a vnf Instance Set Headers {"Accept":"${ACCEPT}"} @@ -67,7 +67,7 @@ Scale a vnfInstance Not Found [Documentation] Not Found ... Error: The API producer did not find a current representation for the target resource or is not willing to disclose that one exists. ... Specifically in case of this task resource, the response code 404 shall also returned if the task is not supported for the VNF instance represented by the parent resource, which means that the task resource consequently does not exist. - ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error. + ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the �detail� attribute shall convey more information about the error. [Setup] Check scale to level not supported Log Trying to scale a vnf Instance, not exist Set Headers {"Accept":"${ACCEPT}"} @@ -115,7 +115,7 @@ DELETE Scale to level VNFInstance - Method not implemented Output response Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot index ab8ff7d5..3e669983 100644 --- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot +++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot @@ -22,7 +22,7 @@ Create a new subscription Should Contain ${contentType} ${CONTENT_TYPE} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json subscriptions.schema.json ${json} + Validate Json subscription.schema.json ${json} Log Validation OK Create a new Subscription - DUPLICATION @@ -39,7 +39,7 @@ Create a new Subscription - DUPLICATION Should Contain ${contentType} ${CONTENT_TYPE} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json subscriptions.schema.json ${json} + Validate Json subscription.schema.json ${json} Log Validation OK Create a new Subscription - NO-DUPLICATION diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot index e9a52027..7cb56637 100644 --- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot +++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot @@ -5,7 +5,7 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} Library OperatingSystem Library JSONLibrary Library JSONSchemaLibrary schemas/ -Suite setup Check resource existance +Suite Setup Check resource existance *** Test Cases *** Terminate a vnfInstance @@ -28,7 +28,7 @@ Terminate a vnfInstance Conflict (Not-Instantiated) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, ... or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Check resource not instantiated Log Trying to terminate a VNF instance. Set Headers {"Accept":"${ACCEPT}"} @@ -49,7 +49,7 @@ Terminate a vnfInstance Conflict (parallel LCM operation) ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, ... or that another lifecycle management operation is ongoing. - ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error. + ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error. [Setup] Launch another LCM operation log Trying to change the deployment flavour of a VNF instance. Set Headers {"Accept":"${ACCEPT}"} @@ -93,7 +93,7 @@ DELETE Terminate VNFInstance - Method not implemented Log Validate Status code Integer response status 405 -*** Key words *** +*** Keywords *** Check resource existance Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot index 08e8e2a5..c8039f68 100644 --- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot +++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot @@ -7,7 +7,7 @@ Library OperatingSystem Library JSONLibrary Library JSONSchemaLibrary schemas/ -*** Test cases *** +*** Test Cases *** Create a new vnfInstance [Setup] #make sure the vnfInstand ${vnfInstanceId} doesn't exist @@ -40,7 +40,7 @@ Get information about multiple VNF instances Should Contain ${contentType} ${CONTENT_TYPE} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json vnfInstance.schema.json ${json} + Validate Json vnfInstances.schema.json ${json} Log Validation OK Get information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot index e612c79b..99357a27 100644 --- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot +++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot @@ -28,7 +28,7 @@ Get stauts information about multiple VNF LCM OP OCC Should Contain ${contentType} ${CONTENT_TYPE} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json vnfLcmOpOcc.schema.json ${json} + Validate Json vnfLcmOpOccs.schema.json ${json} Log Validation OK Get stauts information about multiple VNF LCM OP OCC Bad Request Invalid attribute-based filtering parameters diff --git a/SOL002/VNFLifecycleManagement-API/schemas/subscription.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/subscription.schema.json new file mode 100644 index 00000000..82bbcc8f --- /dev/null +++ b/SOL002/VNFLifecycleManagement-API/schemas/subscription.schema.json @@ -0,0 +1,181 @@ +{ + "type": "object", + "description": "This type represents a subscription related to notifications about VNF lifecycle changes.\n", + "required": [ + "id", + "callbackUri", + "_links" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "filter": { + "type": "object", + "description": "This type represents a subscription filter related to notifications about VNF lifecycle changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n", + "properties": { + "vnfInstanceSubscriptionFilter": { + "type": "object", + "description": "This type represents subscription filter criteria to match VNF instances.\n", + "properties": { + "vnfdIds": { + "type": "array", + "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "items": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + } + }, + "vnfProductsFromProviders": { + "type": "array", + "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "items": { + "type": "object", + "required": [ + "vnfProvider" + ], + "properties": { + "vnfProvider": { + "type": "string", + "description": "Name of the VNF provider to match.\n" + }, + "vnfProducts": { + "type": "array", + "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n", + "items": { + "type": "object", + "required": [ + "vnfProductName" + ], + "properties": { + "vnfProductName": { + "type": "string", + "description": "Name of the VNF product to match.\n" + }, + "versions": { + "type": "array", + "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n", + "items": { + "type": "object", + "required": [ + "vnfSoftwareVersion" + ], + "properties": { + "vnfSoftwareVersion": { + "type": "string", + "description": "A version.\n" + }, + "vnfdVersions": { + "type": "array", + "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", + "items": { + "type": "string", + "description": "A version.\n" + } + } + } + } + } + } + } + } + } + } + }, + "vnfInstanceIds": { + "type": "array", + "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "items": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + } + }, + "vnfInstanceNames": { + "type": "array", + "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "items": { + "type": "string" + } + } + } + }, + "notificationTypes": { + "type": "array", + "description": "Match particular notification types. Permitted values: * VnfLcmOperationOccurrenceNotification * VnfIdentifierCreationNotification * VnfIdentifierDeletionNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n", + "items": { + "type": "string", + "enum": [ + "VnfLcmOperationOccurrenceNotification", + "VnfIdentifierCreationNotification", + "VnfIdentifierDeletionNotification" + ] + } + }, + "operationTypes": { + "type": "array", + "description": "Match particular VNF lifecycle operation types for the notification of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n", + "items": { + "type": "string", + "enum": [ + "INSTANTIATE", + "SCALE", + "SCALE_TO_LEVEL", + "CHANGE_FLAVOUR", + "TERMINATE", + "HEAL", + "OPERATE", + "CHANGE_EXT_CONN", + "MODIFY_INFO" + ], + "description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation. SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation. \n" + } + }, + "operationStates": { + "type": "array", + "description": "Match particular LCM operation state values as reported in notifications of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n", + "items": { + "type": "string", + "enum": [ + "STARTING", + "PROCESSING", + "COMPLETED", + "FAILED_TEMP", + "FAILED", + "ROLLING_BACK", + "ROLLED_BACK" + ], + "description": "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n" + } + } + } + }, + "callbackUri": { + "type": "string", + "description": "String formatted according to IETF RFC 3986.\n" + }, + "_links": { + "type": "object", + "description": "Links to resources related to this resource.\n", + "required": [ + "self" + ], + "properties": { + "self": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL002/VNFLifecycleManagement-API/schemas/subscriptions.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/subscriptions.schema.json index 82bbcc8f..1da3ee69 100644 --- a/SOL002/VNFLifecycleManagement-API/schemas/subscriptions.schema.json +++ b/SOL002/VNFLifecycleManagement-API/schemas/subscriptions.schema.json @@ -1,77 +1,80 @@ { - "type": "object", - "description": "This type represents a subscription related to notifications about VNF lifecycle changes.\n", - "required": [ - "id", - "callbackUri", - "_links" - ], - "properties": { - "id": { - "type": "string", - "description": "An identifier with the intention of being globally unique.\n" - }, - "filter": { - "type": "object", - "description": "This type represents a subscription filter related to notifications about VNF lifecycle changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n", - "properties": { - "vnfInstanceSubscriptionFilter": { - "type": "object", - "description": "This type represents subscription filter criteria to match VNF instances.\n", - "properties": { - "vnfdIds": { - "type": "array", - "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", - "items": { - "type": "string", - "description": "An identifier with the intention of being globally unique.\n" - } - }, - "vnfProductsFromProviders": { - "type": "array", - "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", - "items": { - "type": "object", - "required": [ - "vnfProvider" - ], - "properties": { - "vnfProvider": { - "type": "string", - "description": "Name of the VNF provider to match.\n" - }, - "vnfProducts": { - "type": "array", - "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n", - "items": { - "type": "object", - "required": [ - "vnfProductName" - ], - "properties": { - "vnfProductName": { - "type": "string", - "description": "Name of the VNF product to match.\n" - }, - "versions": { - "type": "array", - "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n", - "items": { - "type": "object", - "required": [ - "vnfSoftwareVersion" - ], - "properties": { - "vnfSoftwareVersion": { - "type": "string", - "description": "A version.\n" - }, - "vnfdVersions": { - "type": "array", - "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", - "items": { - "type": "string", - "description": "A version.\n" + "type": "array", + "items": { + "description": "This type represents a subscription.", + "type": "object", + "required": [ + "id", + "callbackUri", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "filter": { + "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n", + "type": "object", + "properties": { + "vnfInstanceSubscriptionFilter": { + "description": "This type represents subscription filter criteria to match VNF instances.\n", + "type": "object", + "properties": { + "vnfdIds": { + "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "vnfProductsFromProviders": { + "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProvider" + ], + "properties": { + "vnfProvider": { + "description": "Name of the VNF provider to match.\n", + "type": "string" + }, + "vnfProducts": { + "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProductName" + ], + "properties": { + "vnfProductName": { + "description": "Name of the VNF product to match.\n", + "type": "string" + }, + "versions": { + "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfSoftwareVersion" + ], + "properties": { + "vnfSoftwareVersion": { + "description": "A version.\n", + "type": "string" + }, + "vnfdVersions": { + "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "description": "A version.\n", + "type": "string" + } } } } @@ -81,97 +84,58 @@ } } } - } - }, - "vnfInstanceIds": { - "type": "array", - "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", - "items": { - "type": "string", - "description": "An identifier with the intention of being globally unique.\n" - } - }, - "vnfInstanceNames": { - "type": "array", - "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", - "items": { - "type": "string" + }, + "vnfInstanceIds": { + "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "vnfInstanceNames": { + "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "type": "string" + } } } - } - }, - "notificationTypes": { - "type": "array", - "description": "Match particular notification types. Permitted values: * VnfLcmOperationOccurrenceNotification * VnfIdentifierCreationNotification * VnfIdentifierDeletionNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n", - "items": { + }, + "notificationTypes": { + "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n", "type": "string", "enum": [ - "VnfLcmOperationOccurrenceNotification", - "VnfIdentifierCreationNotification", - "VnfIdentifierDeletionNotification" + "ThresholdCrossedNotification", + "PerformanceInformationAvailableNotification" ] } - }, - "operationTypes": { - "type": "array", - "description": "Match particular VNF lifecycle operation types for the notification of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n", - "items": { - "type": "string", - "enum": [ - "INSTANTIATE", - "SCALE", - "SCALE_TO_LEVEL", - "CHANGE_FLAVOUR", - "TERMINATE", - "HEAL", - "OPERATE", - "CHANGE_EXT_CONN", - "MODIFY_INFO" - ], - "description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation. SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation. \n" - } - }, - "operationStates": { - "type": "array", - "description": "Match particular LCM operation state values as reported in notifications of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n", - "items": { - "type": "string", - "enum": [ - "STARTING", - "PROCESSING", - "COMPLETED", - "FAILED_TEMP", - "FAILED", - "ROLLING_BACK", - "ROLLED_BACK" - ], - "description": "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n" - } } - } - }, - "callbackUri": { - "type": "string", - "description": "String formatted according to IETF RFC 3986.\n" - }, - "_links": { - "type": "object", - "description": "Links to resources related to this resource.\n", - "required": [ - "self" - ], - "properties": { - "self": { - "type": "object", - "description": "This type represents a link to a resource.\n", - "required": [ - "href" - ], - "properties": { - "href": { - "type": "string", - "description": "URI of the referenced resource.\n", - "format": "url" + }, + "callbackUri": { + "description": "The URI of the endpoint to send the notification to.\n", + "type": "string", + "format": "url" + }, + "_links": { + "description": "Links to resources related to this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } } } } diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json index e0122312..552b1e46 100644 --- a/SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json +++ b/SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json @@ -1,8 +1,6 @@ { - "definitions": {}, - "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", - "description": "This type represents a VNF instance.\n", + "description": "This type represents a VNF instance.", "required": [ "id", "vnfdId", diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfInstances.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfInstances.schema.json new file mode 100644 index 00000000..7b380ec3 --- /dev/null +++ b/SOL002/VNFLifecycleManagement-API/schemas/vnfInstances.schema.json @@ -0,0 +1,986 @@ +{ + "type:" : "array", + "items": { + "type": "object", + "description": "This type represents a VNF instance.", + "required": [ + "id", + "vnfdId", + "vnfProvider", + "vnfProductName", + "vnfSoftwareVersion", + "vnfdVersion", + "vnfPkgId", + "instantiationState" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vnfInstanceName": { + "type": "string", + "description": "Name of the VNF instance. This attribute can be modified with the PATCH method.\n" + }, + "vnfInstanceDescription": { + "type": "string", + "description": "Human-readable description of the VNF instance. This attribute can be modified with the PATCH method.\n" + }, + "vnfdId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vnfProvider": { + "type": "string", + "description": "Provider of the VNF and the VNFD. The value is copied from the VNFD.\n" + }, + "vnfProductName": { + "type": "string", + "description": "Name to identify the VNF Product. The value is copied from the VNFD.\n" + }, + "vnfSoftwareVersion": { + "type": "string", + "description": "A Version.\n" + }, + "vnfdVersion": { + "type": "string", + "description": "A Version.\n" + }, + "vnfPkgId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vnfConfigurableProperties": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "vimConnectionInfo": { + "type": "array", + "description": "Information about VIM connections to be used for managing the resources for the VNF instance. This attribute shall only be supported and present if VNF-related resource management in direct mode is applicable. This attribute can be modified with the PATCH method.\n", + "items": { + "type": "object", + "description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n", + "required": [ + "id", + "vimType" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vimId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vimType": { + "type": "string", + "description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n" + }, + "interfaceInfo": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "accessInfo": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "extra": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + } + } + } + }, + "instantiationState": { + "type": "string", + "enum": [ + "NOT_INSTANTIATED", + "INSTANTIATED" + ], + "description": "The instantiation state of the VNF.\n" + }, + "instantiatedVnfInfo": { + "type": "object", + "description": "Information specific to an instantiated VNF instance. This attribute shall be present if the instantiateState attribute value is INSTANTIATED.\n", + "required": [ + "flavourId", + "vnfState" + ], + "properties": { + "flavourId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "vnfState": { + "type": "string", + "enum": [ + "STARTED", + "STOPPED" + ] + }, + "scaleStatus": { + "type": "array", + "description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect.\n", + "items": { + "type": "object", + "required": [ + "aspectId", + "scaleLevel" + ], + "properties": { + "aspectId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "scaleLevel": { + "type": "integer", + "description": "Indicates the scale level. The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.\n" + } + } + } + }, + "extCpInfo": { + "type": "array", + "description": "Information about the external CPs exposed by the VNF instance.\n", + "minItems": 1, + "items": { + "type": "object", + "required": [ + "id", + "cpdId" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "cpdId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "cpProtocolInfo": { + "type": "array", + "description": "Network protocol information for this CP.\n", + "items": { + "description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. \n", + "required": [ + "layerProtocol" + ], + "properties": { + "layerProtocol": { + "type": "string", + "enum": [ + "IP_OVER_ETHERNET" + ], + "description": "The identifier of layer(s) and protocol(s) associated to the network address information. Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n" + }, + "ipOverEthernet": { + "type": "object", + "description": "This type represents information about a network address that has been assigned. \n", + "required": [ + "macAddress" + ], + "properties": { + "macAddress": { + "type": "string", + "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n", + "format": "MAC" + }, + "ipAddresses": { + "type": "array", + "description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n", + "items": { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "IPV4", + "IPV6" + ], + "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n" + }, + "addresses": { + "type": "array", + "description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n", + "items": { + "type": "string", + "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n", + "format": "IP" + } + }, + "isDynamic": { + "type": "boolean", + "description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n" + }, + "addressRange": { + "type": "object", + "description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n", + "required": [ + "minAddress", + "maxAddress" + ], + "properties": { + "minAddress": { + "type": "string", + "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n", + "format": "IP" + }, + "maxAddress": { + "type": "string", + "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n", + "format": "IP" + } + } + }, + "subnetId": { + "type": "string", + "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n", + "format": "IP" + } + } + } + } + } + } + } + } + }, + "extLinkPortId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + } + } + } + }, + "extVirtualLinkInfo": { + "type": "array", + "description": "Information about the external VLs the VNF instance is connected to.\n", + "items": { + "type": "object", + "required": [ + "id", + "resourceHandle" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceHandle": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "extLinkPorts": { + "type": "array", + "description": "Link ports of this VL.\n", + "items": { + "type": "object", + "description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL. \n", + "required": [ + "id", + "resourceHandle" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceHandle": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "cpInstanceId": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + } + } + } + } + } + } + }, + "extManagedVirtualLinkInfo": { + "type": "array", + "description": "External virtual links the VNF instance is connected to.\n", + "items": { + "type": "object", + "required": [ + "id", + "vnfVirtualLinkDescId" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vnfVirtualLinkDescId": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "networkResource": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "vnfLinkPorts": { + "type": "array", + "description": "Link ports of this VL.\n", + "items": { + "type": "object", + "required": [ + "id", + "resourceHandle" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "resourceHandle": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "cpInstanceId": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + } + } + } + } + } + } + }, + "monitoringParameters": { + "type": "array", + "description": "Active monitoring parameters.\n", + "items": { + "type": "object", + "required": [ + "id", + "value", + "timeStamp" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "name": { + "type": "string", + "description": "Human readable name of the monitoring parameter, as defined in the VNFD.\n" + }, + "value": { + "type": "object", + "description": "Value of the monitoring parameter known to the VNFM (e.g. obtained for autoscaling purposes). The type of the \"value\" attribute (i.e. scalar, structure (Object in JSON), or array (of scalars, arrays or structures/Objects)) is assumed to be defined in an external measurement specification.\n" + }, + "timeStamp": { + "type": "string", + "description": "Represents the point in time when the measurement has been performed, as known to the VNFM. Should be formatted according to ETF RFC 3339.\n" + } + } + } + }, + "localizationLanguage": { + "type": "string", + "description": "Information about localization language of the VNF (includes e.g. strings in the VNFD). The localization languages supported by a VNF can be declared in the VNFD, and localization language selection can take place at instantiation time. The value shall comply with the format defined in IETF RFC 5646.\n" + }, + "vnfcResourceInfo": { + "type": "array", + "description": "Information about the virtualised compute and storage resources used by the VNFCs of the VNF instance.\n", + "items": { + "type": "object", + "description": "This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance.\n", + "required": [ + "id", + "vduId", + "computeResource" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "vduId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "computeResource": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "storageResourceIds": { + "type": "array", + "description": "References to the VirtualStorage resources. The value refers to a VirtualStorageResourceInfo item in the VnfInstance.\n", + "items": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + } + }, + "reservationId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vnfcCpInfo": { + "type": "array", + "description": "CPs of the VNFC instance. Shall be present when that particular CP of the VNFC instance is associated to an external CP of the VNF instance. May be present otherwise.\n", + "items": { + "type": "object", + "required": [ + "id", + "cpdId" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "cpdId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "vnfExtCpId": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "cpProtocolInfo": { + "type": "array", + "description": "Network protocol information for this CP.\n", + "items": { + "description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. \n", + "required": [ + "layerProtocol" + ], + "properties": { + "layerProtocol": { + "type": "string", + "enum": [ + "IP_OVER_ETHERNET" + ], + "description": "The identifier of layer(s) and protocol(s) associated to the network address information. Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n" + }, + "ipOverEthernet": { + "type": "object", + "description": "This type represents information about a network address that has been assigned. \n", + "required": [ + "macAddress" + ], + "properties": { + "macAddress": { + "type": "string", + "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n", + "format": "MAC" + }, + "ipAddresses": { + "type": "array", + "description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n", + "items": { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "IPV4", + "IPV6" + ], + "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n" + }, + "addresses": { + "type": "array", + "description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n", + "items": { + "type": "string", + "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n", + "format": "IP" + } + }, + "isDynamic": { + "type": "boolean", + "description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n" + }, + "addressRange": { + "type": "object", + "description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n", + "required": [ + "minAddress", + "maxAddress" + ], + "properties": { + "minAddress": { + "type": "string", + "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n", + "format": "IP" + }, + "maxAddress": { + "type": "string", + "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n", + "format": "IP" + } + } + }, + "subnetId": { + "type": "string", + "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n", + "format": "IP" + } + } + } + } + } + } + } + } + }, + "vnfLinkPortId": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + } + } + } + }, + "metadata": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + } + } + } + }, + "virtualLinkResourceInfo": { + "type": "array", + "description": "Information about the virtualised network resources used by the VLs of the VNF instance.\n", + "items": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by an internal VL instance in a VNF instance.\n", + "required": [ + "id", + "vnfVirtualLinkDescId", + "networkResource" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "vnfVirtualLinkDescId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "networkResource": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "reservationId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vnfLinkPorts": { + "type": "array", + "description": "Links ports of this VL. Shall be present when the linkPort is used for external connectivity by the VNF (refer to VnfLinkPortInfo). May be present otherwise.\n", + "items": { + "type": "object", + "required": [ + "id", + "resourceHandle" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "resourceHandle": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "cpInstanceId": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + } + } + } + }, + "metadata": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + } + } + } + }, + "virtualStorageResourceInfo": { + "type": "array", + "description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n", + "items": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n", + "required": [ + "id", + "virtualStorageDescId", + "storageResource" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "virtualStorageDescId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "storageResource": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "reservationId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "metadata": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + } + } + } + } + } + }, + "metadata": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "extensions": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "_links": { + "type": "object", + "description": "Links to resources related to this resource.\n", + "required": [ + "self" + ], + "properties": { + "self": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "indicators": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "instantiate": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "terminate": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "scale": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "scaleToLevel": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "changeFlavour": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "heal": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "operate": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "changeExtConn": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + } + } + } + } +} + } \ No newline at end of file diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json index aa8d1dcb..b512b22c 100644 --- a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json +++ b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json @@ -1,6 +1,4 @@ { - "definitions": {}, - "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "description": "This type represents a VNF lifecycle management operation occurrence.\n", "required": [ diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json new file mode 100644 index 00000000..04faf674 --- /dev/null +++ b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json @@ -0,0 +1,633 @@ +{ + "type": "array", + "items": { + "type": "object", + "description": "This type represents a VNF lifecycle management operation occurrence.\n", + "required": [ + "id", + "operationState", + "stateEnteredTime", + "startTime", + "vnfInstanceId", + "operation", + "isAutomaticInvocation", + "operationParams", + "isCancelPending" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "operationState": { + "type": "string", + "enum": [ + "STARTING", + "PROCESSING", + "COMPLETED", + "FAILED_TEMP", + "FAILED", + "ROLLING_BACK", + "ROLLED_BACK" + ], + "description": "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n" + }, + "stateEnteredTime": { + "type": "string", + "description": "Date-time when the current state was entered.\n", + "format": "date-time" + }, + "startTime": { + "type": "string", + "description": "Date-time of the start of the operation.\n", + "format": "date-time" + }, + "vnfInstanceId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "grantId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "operation": { + "type": "string", + "enum": [ + "INSTANTIATE", + "SCALE", + "SCALE_TO_LEVEL", + "CHANGE_FLAVOUR", + "TERMINATE", + "HEAL", + "OPERATE", + "CHANGE_EXT_CONN", + "MODIFY_INFO" + ], + "description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation. SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation. \n" + }, + "isAutomaticInvocation": { + "type": "boolean", + "description": "Set to true if this VNF LCM operation occurrence has been triggered by an automated procedure inside the VNFM (i.e. ScaleVnf / ScaleVnfToLevel triggered by auto-scale, or HealVnf triggered by auto-heal). Set to false otherwise.\n" + }, + "operationParams": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "isCancelPending": { + "type": "boolean", + "description": "If the VNF LCM operation occurrence is in \"STARTING\", \"PROCESSING\" or \"ROLLING_BACK\" state and the operation is being cancelled, this attribute shall be set to true. Otherwise, it shall be set to false.\n" + }, + "cancelMode": { + "type": "string", + "enum": [ + "GRACEFUL", + "FORCEFUL" + ], + "description": "Cancellation mode. GRACEFUL: If the VNF LCM operation occurrence is in \"PROCESSING\" or \"ROLLING_BACK\" state, the VNFM shall not start any new resource management operation and shall wait for the ongoing resource management operations in the underlying system, typically the VIM, to finish execution or to time out. After that, the VNFM shall put the operation occurrence into the FAILED_TEMP state. If the VNF LCM operation occurrence is in \"STARTING\" state, the VNFM shall not start any resource management operation and shall wait for the granting request to finish execution or time out. After that, the VNFM shall put the operation occurrence into the ROLLED_BACK state. FORCEFUL: If the VNF LCM operation occurrence is in \"PROCESSING\" or \"ROLLING_BACK\" state, the VNFM shall not start any new resource management operation, shall cancel the ongoing resource management operations in the underlying system, typically the VIM, and shall wait for the cancellation to finish or to time out. After that, the VNFM shall put the operation occurrence into the FAILED_TEMP state. If the VNF LCM operation occurrence is in \"STARTING\" state, the VNFM shall not start any resource management operation and put the operation occurrence into the ROLLED_BACK state.\n" + }, + "error": { + "type": "object", + "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n", + "properties": { + "type": { + "type": "string", + "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n", + "format": "URI" + }, + "title": { + "type": "string", + "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type. It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n" + }, + "status": { + "type": "integer", + "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n" + }, + "detail": { + "type": "string", + "description": "A human-readable explanation specific to this occurrence of the problem.\n" + }, + "instance": { + "type": "string", + "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n", + "format": "URI" + } + }, + "required": [ + "status", + "detail" + ] + }, + "resourceChanges": { + "type": "object", + "description": "This attribute contains information about the cumulative changes to virtualised resources that were performed so far by the LCM operation since its start, if applicable.\n", + "properties": { + "affectedVnfcs": { + "type": "array", + "description": "Information about VNFC instances that were affected during the lifecycle operation. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n", + "items": { + "type": "object", + "description": "This type provides information about added, deleted, modified and temporary VNFCs. \n", + "required": [ + "id", + "vduId", + "changeType", + "computeResource" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "vduId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "changeType": { + "type": "string", + "enum": [ + "ADDED", + "REMOVED", + "MODIFIED", + "TEMPORARY" + ], + "description": "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY For a temporary resource, an AffectedVnfc structure exists as long as the temporary resource exists.\n" + }, + "computeResource": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "metadata": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "affectedVnfcCpIds": { + "type": "array", + "description": "Identifiers of CP(s) of the VNFC instance that were affected by the change. Shall be present for those affected CPs of the VNFC instance that are associated to an external CP of the VNF instance. May be present for further affected CPs of the VNFC instance.\n", + "items": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + } + }, + "addedStorageResourceIds": { + "type": "array", + "description": "References to VirtualStorage resources that have been added. Each value refers to a VirtualStorageResourceInfo item in the VnfInstance that was added to the VNFC. It shall be provided if at least one storage resource was added to the VNFC.\n", + "items": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + } + }, + "removedStorageResourceIds": { + "type": "array", + "description": "References to VirtualStorage resources that have been removed. The value contains the identifier of a VirtualStorageResourceInfo item that has been removed from the VNFC, and might no longer exist in the VnfInstance. It shall be provided if at least one storage resource was removed from the VNFC.\n", + "items": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + } + } + } + } + }, + "affectedVirtualLinks": { + "type": "array", + "description": "Information about VL instances that were affected during the lifecycle operation. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n", + "items": { + "type": "object", + "description": "This type provides information about added, deleted, modified and temporary VLs.\n", + "required": [ + "id", + "virtualLinkDescId", + "changeType", + "networkResource" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "virtualLinkDescId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "changeType": { + "type": "string", + "enum": [ + "ADDED", + "REMOVED", + "MODIFIED", + "TEMPORARY", + "LINK_PORT_ADDED", + "LINK_PORT_REMOVED" + ], + "description": "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY * LINK_PORT_ADDED * LINK_PORT_REMOVED For a temporary resource, an AffectedVirtualLink structure exists as long as the temporary resource exists.\n" + }, + "networkResource": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "metadata": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + } + } + } + }, + "affectedVirtualStorages": { + "type": "array", + "description": "Information about virtualised storage instances that were affected during the lifecycle operation. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n", + "items": { + "type": "object", + "description": "This type provides information about added, deleted, modified and temporary virtual storage resources.\n", + "required": [ + "id", + "virtualStorageDescId", + "changeType", + "storageResource" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + }, + "virtualStorageDescId": { + "type": "string", + "description": "An identifier that is unique within a VNF descriptor.\n" + }, + "changeType": { + "type": "string", + "enum": [ + "ADDED", + "REMOVED", + "MODIFIED", + "TEMPORARY" + ], + "description": "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY For a temporary resource, an AffectedVirtualStorage structure exists as long as the temporary resource exists.\n" + }, + "storageResource": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "metadata": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + } + } + } + } + } + }, + "changedInfo": { + "type": "object", + "description": "This type represents attribute modifications that were performed on an \"Individual VNF instance\" resource. The attributes that can be included consist of those requested to be modified explicitly in the \"VnfInfoModificationRequest\" data structure, and additional attributes of the \"VnfInstance\" data structure that were modified implicitly e.g. when modifying the referenced VNF package.\n", + "properties": { + "vnfInstanceName": { + "type": "string", + "description": "If present, this attribute signals modifications of the \"vnfInstanceName\" attribute in \"VnfInstance\".\n" + }, + "vnfInstanceDescription": { + "type": "string", + "description": "If present, this attribute signals modifications of the \"vnfInstanceDescription\" attribute in \"VnfInstance\".\n" + }, + "vnfConfigurableProperties": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "metadata": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "extensions": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "vimConnectionInfo": { + "type": "array", + "description": "If present, this attribute signals modifications of certain entries in the \"vimConnectionInfo\" attribute array in \"VnfInstance\".\n", + "items": { + "type": "object", + "description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n", + "required": [ + "id", + "vimType" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vimId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vimType": { + "type": "string", + "description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n" + }, + "interfaceInfo": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "accessInfo": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + }, + "extra": { + "type": "object", + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159. \n" + } + } + } + }, + "vnfPkgId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vnfdId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "vnfProvider": { + "type": "string", + "description": "If present, this attribute signals modifications of the \"vnfProvider\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId� attribute.\n" + }, + "vnfProductName": { + "type": "string", + "description": "If present, this attribute signals modifications of the \"vnfProductName\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId� attribute.\n" + }, + "vnfSoftwareVersion": { + "type": "string", + "description": "A Version.\n" + }, + "vnfdVersion": { + "type": "string", + "description": "A Version.\n" + } + } + }, + "changedExtConnectivity": { + "type": "array", + "description": "Information about changed external connectivity, if applicable. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n", + "items": { + "type": "object", + "required": [ + "id", + "resourceHandle" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceHandle": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "extLinkPorts": { + "type": "array", + "description": "Link ports of this VL.\n", + "items": { + "type": "object", + "description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL. \n", + "required": [ + "id", + "resourceHandle" + ], + "properties": { + "id": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceHandle": { + "type": "object", + "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n", + "required": [ + "vimConnectionId", + "resourceId" + ], + "properties": { + "vimConnectionId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceProviderId": { + "type": "string", + "description": "An identifier with the intention of being globally unique.\n" + }, + "resourceId": { + "type": "string", + "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n" + }, + "vimLevelResourceType": { + "type": "string", + "description": "Type of the resource in the scope of the VIM or the resource provider.\n" + } + } + }, + "cpInstanceId": { + "type": "string", + "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n" + } + } + } + } + } + } + }, + "_links": { + "type": "object", + "description": "Links to resources related to this resource.\n", + "required": [ + "self", + "vnfInstance" + ], + "properties": { + "self": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "vnfInstance": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "grant": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "cancel": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "retry": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "rollback": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + }, + "fail": { + "type": "object", + "description": "This type represents a link to a resource.\n", + "required": [ + "href" + ], + "properties": { + "href": { + "type": "string", + "description": "URI of the referenced resource.\n", + "format": "url" + } + } + } + } + } + } +} +} \ No newline at end of file diff --git a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot index ce94498f..6bb132dd 100644 --- a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot +++ b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot @@ -23,7 +23,7 @@ GET Individual Subscription Should Contain ${contentType} application/json ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscriptions.schema.json ${json} + Validate Json PmSubscription.schema.json ${json} Log Validated PmSubscription schema GET Individual Subscription - Negative (Not Found) diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot index df214f4c..980222dc 100644 --- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot +++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot @@ -18,7 +18,7 @@ GET all Pm Jobs Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Checking that reports element is missing ${reports}= Get Value From Json ${json} $..reports @@ -36,7 +36,7 @@ GET all Pm Jobs - Filter Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK GET all Pm Jobs - all_fields @@ -50,7 +50,7 @@ GET all Pm Jobs - all_fields Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Trying to validate criteria schema ${criteria}= Get Value From Json ${json} $..criteria @@ -76,7 +76,7 @@ GET all Pm Jobs - exclude_default Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Checking that reports element is missing ${reports}= Get Value From Json ${json} $..reports @@ -95,7 +95,7 @@ GET all Pm Jobs - fields Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Trying to validate criteria schema ${criteria}= Get Value From Json ${json} $..criteria @@ -118,7 +118,7 @@ GET all Pm Jobs - exclude_fields Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Checking that reports element is missing ${reports}= Get Value From Json ${json} $..reports diff --git a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot index 87771cfb..bdbdfb6b 100644 --- a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot +++ b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot @@ -153,7 +153,7 @@ POST Subscription - NO DUPLICATION Should Contain ${contentType} application/json ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscriptions.schema.json ${json} + Validate Json PmSubscription.schema.json ${json} Log Validated PmSubscription schema Log Trying to validate the Location header ${headers}= Output response headers diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot index 0800c834..e8767c8e 100644 --- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot +++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot @@ -21,7 +21,7 @@ GET Thresholds ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with thresholds schema - Validate Json Threshold.schema.json ${json} + Validate Json Thresholds.schema.json ${json} GET Thresholds - Filter [Documentation] The client can use this method to query information about thresholds. @@ -36,7 +36,7 @@ GET Thresholds - Filter ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with Threshold schema - Validate Json Threshold.schema.json ${json} + Validate Json Thresholds.schema.json ${json} GET Thresholds - NEGATIVE Filter [Documentation] The client can use this method to query information about thresholds. diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PmJobs.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmJobs.schema.json new file mode 100644 index 00000000..654acdcf --- /dev/null +++ b/SOL002/VNFPerformanceManagement-API/schemas/PmJobs.schema.json @@ -0,0 +1,134 @@ +{ + "type": "array", + "items": { + "description": "This type represents a PM job.\n", + "type": "object", + "required": [ + "id", + "objectInstanceIds", + "criteria" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "objectInstanceIds": { + "description": "Identifiers of the VNF instances for which performance information is collected.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "criteria": { + "description": "Criteria of the collection of performance information.\n", + "type": "object", + "required": [ + "collectionPeriod", + "reportingPeriod" + ], + "properties": { + "performanceMetric": { + "description": "This defines the types of performance metrics for the specified object instances, as specified in ETSI GS NFV-IFA 027). At least one of the two attributes (performance metric or group) shall be present.\n", + "type": "array", + "items": { + "type": "string" + } + }, + "performanceMetricGroup": { + "description": "Group of performance metrics. A metric group is a pre-defined list of metrics, known to the producer that it can decompose to individual metrics. At least one of the two attributes (performance metric or group) shall be present.\n", + "type": "array", + "items": { + "type": "string" + } + }, + "collectionPeriod": { + "description": "Specifies the periodicity at which the producer will collect performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n", + "type": "integer" + }, + "reportingPeriod": { + "description": "Specifies the periodicity at which the producer will report to the consumer. about performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n", + "type": "integer" + }, + "reportingBoundary": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + } + } + }, + "reports": { + "description": "Information about available reports collected by this PM job.\n", + "type": "object", + "required": [ + "href", + "readyTime", + "_links" + ], + "properties": { + "href": { + "description": "The Uri where the report can be obtained.\n", + "type": "string", + "format": "url" + }, + "readyTime": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + }, + "expiryTime": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + }, + "fileSize": { + "description": "The size of the report file in bytes, if known.\n", + "type": "integer" + }, + "_links": { + "description": "Links for this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + }, + "objects": { + "description": "Links to resources representing the VNF instances for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n", + "type": "array", + "items": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json new file mode 100644 index 00000000..c9ad0513 --- /dev/null +++ b/SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json @@ -0,0 +1,142 @@ +{ + "description": "This type represents a subscription.\n", + "type": "object", + "required": [ + "id", + "callbackUri", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "filter": { + "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n", + "type": "object", + "properties": { + "vnfInstanceSubscriptionFilter": { + "description": "This type represents subscription filter criteria to match VNF instances.\n", + "type": "object", + "properties": { + "vnfdIds": { + "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "vnfProductsFromProviders": { + "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProvider" + ], + "properties": { + "vnfProvider": { + "description": "Name of the VNF provider to match.\n", + "type": "string" + }, + "vnfProducts": { + "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProductName" + ], + "properties": { + "vnfProductName": { + "description": "Name of the VNF product to match.\n", + "type": "string" + }, + "versions": { + "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfSoftwareVersion" + ], + "properties": { + "vnfSoftwareVersion": { + "description": "A version.\n", + "type": "string" + }, + "vnfdVersions": { + "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "description": "A version.\n", + "type": "string" + } + } + } + } + } + } + } + } + } + } + }, + "vnfInstanceIds": { + "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "vnfInstanceNames": { + "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "notificationTypes": { + "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n", + "type": "string", + "enum": [ + "ThresholdCrossedNotification", + "PerformanceInformationAvailableNotification" + ] + } + } + }, + "callbackUri": { + "description": "The URI of the endpoint to send the notification to.\n", + "type": "string", + "format": "url" + }, + "_links": { + "description": "Links to resources related to this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json index d642b93f..d3138727 100644 --- a/SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json +++ b/SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json @@ -1 +1,85 @@ -{ "type": "array", "items": { "description": "This type represents a threshold.\n", "type": "object", "required": [ "id", "objectInstanceId", "criteria", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "objectInstanceId": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "criteria": { "description": "This type represents criteria that define a threshold.\n", "type": "object", "required": [ "performanceMetric", "thresholdType" ], "properties": { "performanceMetric": { "description": "Defines the performance metric associated with the threshold, as specified in ETSI GS NFV-IFA 027).\n", "type": "string" }, "thresholdType": { "description": "Type of threshold. This attribute determines which other attributes are present in the data structure. Permitted values: * SIMPLE: Single-valued static threshold In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification.\n", "type": "string", "enum": [ "SIMPLE" ] }, "simpleThresholdDetails": { "description": "Details of a simple threshold. Shall be present if thresholdType=\"SIMPLE\".\n", "type": "object", "required": [ "thresholdValue", "hysteresis" ], "properties": { "thresholdValue": { "description": "The threshold value. Shall be represented as a floating point number.\n", "type": "integer" }, "hysteresis": { "description": "The hysteresis of the threshold. Shall be represented as a non-negative floating point number. A notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or reject the request).\n", "type": "integer" } } } } }, "_links": { "description": "Links for this resource.\n", "type": "object", "required": [ "self" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } }, "object": { "description": "Link to a resource representing the VNF instance for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n" } } } } }} \ No newline at end of file +{ + "description": "This type represents a threshold.\n", + "type": "object", + "required": [ + "id", + "objectInstanceId", + "criteria", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "objectInstanceId": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "criteria": { + "description": "This type represents criteria that define a threshold.\n", + "type": "object", + "required": [ + "performanceMetric", + "thresholdType" + ], + "properties": { + "performanceMetric": { + "description": "Defines the performance metric associated with the threshold, as specified in ETSI GS NFV-IFA 027).\n", + "type": "string" + }, + "thresholdType": { + "description": "Type of threshold. This attribute determines which other attributes are present in the data structure. Permitted values: * SIMPLE: Single-valued static threshold In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification.\n", + "type": "string", + "enum": [ + "SIMPLE" + ] + }, + "simpleThresholdDetails": { + "description": "Details of a simple threshold. Shall be present if thresholdType=\"SIMPLE\".\n", + "type": "object", + "required": [ + "thresholdValue", + "hysteresis" + ], + "properties": { + "thresholdValue": { + "description": "The threshold value. Shall be represented as a floating point number.\n", + "type": "integer" + }, + "hysteresis": { + "description": "The hysteresis of the threshold. Shall be represented as a non-negative floating point number. A notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or reject the request).\n", + "type": "integer" + } + } + } + } + }, + "_links": { + "description": "Links for this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + }, + "object": { + "description": "Link to a resource representing the VNF instance for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n" + } + } + } + } +} \ No newline at end of file diff --git a/SOL002/VNFPerformanceManagement-API/schemas/Thresholds.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/Thresholds.schema.json new file mode 100644 index 00000000..d642b93f --- /dev/null +++ b/SOL002/VNFPerformanceManagement-API/schemas/Thresholds.schema.json @@ -0,0 +1 @@ +{ "type": "array", "items": { "description": "This type represents a threshold.\n", "type": "object", "required": [ "id", "objectInstanceId", "criteria", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "objectInstanceId": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "criteria": { "description": "This type represents criteria that define a threshold.\n", "type": "object", "required": [ "performanceMetric", "thresholdType" ], "properties": { "performanceMetric": { "description": "Defines the performance metric associated with the threshold, as specified in ETSI GS NFV-IFA 027).\n", "type": "string" }, "thresholdType": { "description": "Type of threshold. This attribute determines which other attributes are present in the data structure. Permitted values: * SIMPLE: Single-valued static threshold In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification.\n", "type": "string", "enum": [ "SIMPLE" ] }, "simpleThresholdDetails": { "description": "Details of a simple threshold. Shall be present if thresholdType=\"SIMPLE\".\n", "type": "object", "required": [ "thresholdValue", "hysteresis" ], "properties": { "thresholdValue": { "description": "The threshold value. Shall be represented as a floating point number.\n", "type": "integer" }, "hysteresis": { "description": "The hysteresis of the threshold. Shall be represented as a non-negative floating point number. A notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or reject the request).\n", "type": "integer" } } } } }, "_links": { "description": "Links for this resource.\n", "type": "object", "required": [ "self" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } }, "object": { "description": "Link to a resource representing the VNF instance for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n" } } } } }} \ No newline at end of file diff --git a/SOL003/VNFPackageManagement-API/Subscriptions.robot b/SOL003/VNFPackageManagement-API/Subscriptions.robot index ea3684a6..012bccc9 100644 --- a/SOL003/VNFPackageManagement-API/Subscriptions.robot +++ b/SOL003/VNFPackageManagement-API/Subscriptions.robot @@ -18,8 +18,8 @@ GET Subscription Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PkgmSubscription.schema.json ${json} - Log Validated PkgmSubscription schema + Validate Json PkgmSubscriptions.schema.json ${json} + Log Validated PkgmSubscriptions schema GET Subscription - Filter Log Trying to get the list of subscriptions using filters @@ -32,8 +32,8 @@ GET Subscription - Filter Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PkgmSubscription.schema.json ${json} - Log Validated PkgmSubscription schema + Validate Json PkgmSubscriptions.schema.json ${json} + Log Validated PkgmSubscriptions schema GET Subscription - Negative Filter Log Trying to get the list of subscriptions using filters with wrong attribute name diff --git a/SOL003/VNFPackageManagement-API/VNFPackages.robot b/SOL003/VNFPackageManagement-API/VNFPackages.robot index a6976844..c230d5b6 100644 --- a/SOL003/VNFPackageManagement-API/VNFPackages.robot +++ b/SOL003/VNFPackageManagement-API/VNFPackages.robot @@ -17,7 +17,7 @@ GET all Packages Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json vnfPkgInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${json} Log Validation OK Log Checking missing information for softwareImages element ${softwareImages}= Get Value From Json ${json} $..softwareImages @@ -43,7 +43,7 @@ GET all Packages - Filter Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json vnfPkgInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${json} Log Validation OK GET all Packages - Negative (wronge filter name) @@ -103,7 +103,7 @@ GET all Packages - all_fields ${vnfPkgInfos}= Output response body ${json}= evaluate json.loads('''${vnfPkgInfos}''') json Log Trying to validate response - Validate Json vnfPkgInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${json} Log Validation OK Log Trying to validate softwareImages schema ${softwareImages}= Get Value From Json ${json} $..softwareImages @@ -128,7 +128,7 @@ GET all Packages - exclude_default ${vnfPkgInfos}= Output response body ${json}= evaluate json.loads('''${vnfPkgInfos}''') json Log Trying to validate response - Validate Json vnfPkgInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${json} Log Validation OK Log Checking missing information for softwareImages element ${softwareImages}= Get Value From Json ${json} $..softwareImages @@ -155,7 +155,7 @@ GET all Packages - fields ${vnfPkgInfos}= Output response body ${json}= evaluate json.loads('''${vnfPkgInfos}''') json Log Trying to validate response, checking vnfPkgInfo and other complex attributes included in the vnfPkgInfo - Validate Json vnfPkgInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${json} Log Validation for vnfPkgInfo OK Log Trying to validate softwareImages schema ${softwareImages}= Get Value From Json ${json} $..softwareImages diff --git a/SOL003/VNFPackageManagement-API/schemas/PkgmSubscription.schema.json b/SOL003/VNFPackageManagement-API/schemas/PkgmSubscription.schema.json index 5a318309..4c32bc8b 100644 --- a/SOL003/VNFPackageManagement-API/schemas/PkgmSubscription.schema.json +++ b/SOL003/VNFPackageManagement-API/schemas/PkgmSubscription.schema.json @@ -1 +1,142 @@ -{ "type": "array", "items": { "description": "This type represents a subscription related to notifications about VNF package management.\n", "type": "object", "required": [ "id", "callbackUri", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "filter": { "description": "This type represents a subscription filter related to notifications related to VNF package management. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n", "type": "object", "properties": { "notificationTypes": { "description": "Match particular notification types. Permitted values: - VnfPackageOnboardingNotification - VnfPackageChangeNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n", "type": "array", "items": { "type": "string", "enum": [ "VnfPackageOnboardingNotification", "VnfPackageChangeNotification" ] } }, "vnfProductsFromProviders": { "description": "If present, match VNF packages that contain VNF products from certain providers. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProvider" ], "properties": { "vnfProvider": { "description": "Name of the VNF provider to match.\n", "type": "string" }, "vnfProducts": { "description": "If present, match VNF packages that contain VNF products with certain product names, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProductName" ], "properties": { "vnfProductName": { "description": "Name of the VNF product to match.\n", "type": "string" }, "versions": { "description": "If present, match VNF packages that contain VNF products with certain versions and a certain product name, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfSoftwareVersion" ], "properties": { "vnfSoftwareVersion": { "description": "A Version.\n", "type": "string" }, "vnfdVersions": { "description": "If present, match VNF packages that contain VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", "type": "array", "items": { "description": "A Version.\n", "type": "string" } } } } } } } } } } }, "vnfdId": { "description": "Match VNF packages with a VNFD identifier listed in the attribute. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "vnfPkgId": { "description": "Match VNF packages with a package identifier listed in the attribute. May be present if the \"notificationTypes\" attribute contains the value \"VnfPackageChangeNotification\", and shall be absent otherwise. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "operationalState": { "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for further VNF instantiation requests (unless and until the VNF package\n is re-enabled).\n", "type": "string", "enum": [ "ENABLED", "DISABLED" ] }, "usageState": { "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF package.\n" } } }, "callbackUri": { "description": "String formatted according to IETF RFC 3986.\n", "type": "string" }, "_links": { "description": "Links to resources related to this resource.\n", "type": "object", "required": [ "self" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } } } } } }} \ No newline at end of file +{ + "description": "This type represents a subscription related to notifications about VNF package management.\n", + "type": "object", + "required": [ + "id", + "callbackUri", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "filter": { + "description": "This type represents a subscription filter related to notifications related to VNF package management. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n", + "type": "object", + "properties": { + "notificationTypes": { + "description": "Match particular notification types. Permitted values: - VnfPackageOnboardingNotification - VnfPackageChangeNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n", + "type": "array", + "items": { + "type": "string", + "enum": [ + "VnfPackageOnboardingNotification", + "VnfPackageChangeNotification" + ] + } + }, + "vnfProductsFromProviders": { + "description": "If present, match VNF packages that contain VNF products from certain providers. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProvider" + ], + "properties": { + "vnfProvider": { + "description": "Name of the VNF provider to match.\n", + "type": "string" + }, + "vnfProducts": { + "description": "If present, match VNF packages that contain VNF products with certain product names, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProductName" + ], + "properties": { + "vnfProductName": { + "description": "Name of the VNF product to match.\n", + "type": "string" + }, + "versions": { + "description": "If present, match VNF packages that contain VNF products with certain versions and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfSoftwareVersion" + ], + "properties": { + "vnfSoftwareVersion": { + "description": "A Version.\n", + "type": "string" + }, + "vnfdVersions": { + "description": "If present, match VNF packages that contain VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "description": "A Version.\n", + "type": "string" + } + } + } + } + } + } + } + } + } + } + }, + "vnfdId": { + "description": "Match VNF packages with a VNFD identifier listed in the attribute. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "vnfPkgId": { + "description": "Match VNF packages with a package identifier listed in the attribute. May be present if the \"notificationTypes\" attribute contains the value \"VnfPackageChangeNotification\", and shall be absent otherwise. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "operationalState": { + "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for further VNF instantiation requests (unless and until the VNF package\n is re-enabled).\n", + "type": "string", + "enum": [ + "ENABLED", + "DISABLED" + ] + }, + "usageState": { + "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF package.\n" + } + } + }, + "callbackUri": { + "description": "String formatted according to IETF RFC 3986.\n", + "type": "string" + }, + "_links": { + "description": "Links to resources related to this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL003/VNFPackageManagement-API/schemas/PkgmSubscriptions.schema.json b/SOL003/VNFPackageManagement-API/schemas/PkgmSubscriptions.schema.json new file mode 100644 index 00000000..5a318309 --- /dev/null +++ b/SOL003/VNFPackageManagement-API/schemas/PkgmSubscriptions.schema.json @@ -0,0 +1 @@ +{ "type": "array", "items": { "description": "This type represents a subscription related to notifications about VNF package management.\n", "type": "object", "required": [ "id", "callbackUri", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "filter": { "description": "This type represents a subscription filter related to notifications related to VNF package management. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n", "type": "object", "properties": { "notificationTypes": { "description": "Match particular notification types. Permitted values: - VnfPackageOnboardingNotification - VnfPackageChangeNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n", "type": "array", "items": { "type": "string", "enum": [ "VnfPackageOnboardingNotification", "VnfPackageChangeNotification" ] } }, "vnfProductsFromProviders": { "description": "If present, match VNF packages that contain VNF products from certain providers. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProvider" ], "properties": { "vnfProvider": { "description": "Name of the VNF provider to match.\n", "type": "string" }, "vnfProducts": { "description": "If present, match VNF packages that contain VNF products with certain product names, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProductName" ], "properties": { "vnfProductName": { "description": "Name of the VNF product to match.\n", "type": "string" }, "versions": { "description": "If present, match VNF packages that contain VNF products with certain versions and a certain product name, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfSoftwareVersion" ], "properties": { "vnfSoftwareVersion": { "description": "A Version.\n", "type": "string" }, "vnfdVersions": { "description": "If present, match VNF packages that contain VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", "type": "array", "items": { "description": "A Version.\n", "type": "string" } } } } } } } } } } }, "vnfdId": { "description": "Match VNF packages with a VNFD identifier listed in the attribute. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "vnfPkgId": { "description": "Match VNF packages with a package identifier listed in the attribute. May be present if the \"notificationTypes\" attribute contains the value \"VnfPackageChangeNotification\", and shall be absent otherwise. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "operationalState": { "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for further VNF instantiation requests (unless and until the VNF package\n is re-enabled).\n", "type": "string", "enum": [ "ENABLED", "DISABLED" ] }, "usageState": { "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF package.\n" } } }, "callbackUri": { "description": "String formatted according to IETF RFC 3986.\n", "type": "string" }, "_links": { "description": "Links to resources related to this resource.\n", "type": "object", "required": [ "self" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } } } } } }} \ No newline at end of file diff --git a/SOL003/VNFPackageManagement-API/schemas/vnfPkgInfo.schema.json b/SOL003/VNFPackageManagement-API/schemas/vnfPkgInfo.schema.json index 5941dbfa..e4ab35c5 100644 --- a/SOL003/VNFPackageManagement-API/schemas/vnfPkgInfo.schema.json +++ b/SOL003/VNFPackageManagement-API/schemas/vnfPkgInfo.schema.json @@ -1 +1,282 @@ -{ "type": "array", "items": { "description": "This type represents the information of an VNF package.\n", "type": "object", "required": [ "id", "operationalState", "usageState", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "vnfdId": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "vnfProvider": { "description": "Provider of the VNF package and the VNFD. This information is copied from the VNFD.\n", "type": "string" }, "vnfProductName": { "description": "Name to identify the VNF product. Invariant for the VNF product lifetime. This information is copied from the VNFD. It shall be present after the VNF package content has been on-boarded and absent otherwise.\n", "type": "string" }, "vnfSoftwareVersion": { "description": "A Version.\n", "type": "string" }, "vnfdVersion": { "description": "A Version.\n", "type": "string" }, "checksum": { "description": "This type represents the checksum of a VNF package or an artifact file.\n", "type": "object", "required": [ "algorithm", "hash" ], "properties": { "algorithm": { "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n", "type": "string" }, "hash": { "description": "The hexadecimal value of the checksum.\n", "type": "string" } } }, "softwareImages": { "description": "Information about VNF package artifacts that are software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present unless it has been requested to be excluded per attribute selector.\n", "type": "array", "items": { "description": "This type represents an artifact contained in a VNF package which represents a software image.\n", "type": "object", "required": [ "id", "name", "provider", "version", "checksum", "containerFormat", "diskFormat", "createdAt", "minDisk", "minRam", "size", "imagePath" ], "properties": { "id": { "description": "An identifier that is unique within a VNF descriptor.\n", "type": "string" }, "name": { "description": "Name of the software image.\n", "type": "string" }, "provider": { "description": "Provider of the software image.\n", "type": "string" }, "version": { "description": "A Version.\n", "type": "string" }, "checksum": { "description": "This type represents the checksum of a VNF package or an artifact file.\n", "type": "object", "required": [ "algorithm", "hash" ], "properties": { "algorithm": { "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n", "type": "string" }, "hash": { "description": "The hexadecimal value of the checksum.\n", "type": "string" } } }, "containerFormat": { "description": "Container format indicates whether the software image is in a file format that also contains metadata about the actual software. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - BARE: the image does not have a container or metadata envelope - DOCKER: docker container format - OVA: OVF package in a tarfile - OVF: OVF container format The list of permitted values was taken from \"Container formats\" in http://docs.openstack.org/image-guide/image-formats.html\n", "type": "string", "enum": [ "AKI", "AMI", "ARI", "BARE", "DOCKER", "OVA", "OVF" ] }, "diskFormat": { "description": "Disk format of a software image is the format of the underlying disk image. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - ISO: an archive format for the data contents of an optical disc, such as CD-ROM\n- QCOW2: a common disk image format, which can expand dynamically and supports copy on write\n- RAW: an unstructured disk image format - VDI: a common disk image format - VHD: a common disk image format - VHDX: enhanced version of VHD format - VMDK: a common disk image format The list of permitted values was adapted from \"Disk formats\" in http://docs.openstack.org/image-guide/image-formats.html\n", "type": "string", "enum": [ "AKI", "AMI", "ISO", "QCOW2", "RAW", "VDI", "VHD", "VHDX", "VMDK" ] }, "createdAt": { "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", "type": "string", "format": "date-time" }, "minDisk": { "description": "The minimal disk for this software image in bytes.\n", "type": "integer" }, "minRam": { "description": "The minimal RAM for this software image in bytes.\n", "type": "integer" }, "size": { "description": "Size of this software image in bytes.\n", "type": "integer" }, "userMetadata": { "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n", "type": "object" }, "imagePath": { "description": "Path in the VNF package, which identifies the image artifact and also allows to access a copy of the image artifact.\n", "type": "string" } } } }, "additionalArtifacts": { "description": "Information about VNF package artifacts contained in the VNF package that are not software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present if the VNF package contains additional artifacts.\n", "type": "array", "items": { "description": "This type represents an artifact other than a software image which is contained in a VNF package.\n", "type": "object", "required": [ "artifactPath", "checksum" ], "properties": { "artifactPath": { "description": "Path in the VNF package, which identifies the artifact and also allows to access a copy of the artifact.\n", "type": "string" }, "checksum": { "description": "This type represents the checksum of a VNF package or an artifact file.\n", "type": "object", "required": [ "algorithm", "hash" ], "properties": { "algorithm": { "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n", "type": "string" }, "hash": { "description": "The hexadecimal value of the checksum.\n", "type": "string" } } }, "metadata": { "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n", "type": "object" } } } }, "onboardingState": { "description": "CREATED: The VNF package resource has been created. UPLOADING: The associated VNF package content is being uploaded. PROCESSING: The associated VNF package content is being processed, e.g., validation.\nONBOARDED: The associated VNF package content has been successfully on-boarded.\n", "type": "string", "enum": [ "CREATED", "UPLOADING", "PROCESSING", "ONBOARDED" ] }, "operationalState": { "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for further VNF instantiation requests (unless and until the VNF package\n is re-enabled).\n", "type": "string", "enum": [ "ENABLED", "DISABLED" ] }, "usageState": { "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF package.\n" }, "userDefinedData": { "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n", "type": "object" }, "_links": { "description": "Links to resources related to this resource.\n", "type": "object", "required": [ "self", "packageContent" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } }, "vnfd": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } }, "packageContent": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } } } } } }} \ No newline at end of file +{ + "description": "This type represents the information of an VNF package.\n", + "type": "object", + "required": [ + "id", + "operationalState", + "usageState", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "vnfdId": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "vnfProvider": { + "description": "Provider of the VNF package and the VNFD. This information is copied from the VNFD.\n", + "type": "string" + }, + "vnfProductName": { + "description": "Name to identify the VNF product. Invariant for the VNF product lifetime. This information is copied from the VNFD. It shall be present after the VNF package content has been on-boarded and absent otherwise.\n", + "type": "string" + }, + "vnfSoftwareVersion": { + "description": "A Version.\n", + "type": "string" + }, + "vnfdVersion": { + "description": "A Version.\n", + "type": "string" + }, + "checksum": { + "description": "This type represents the checksum of a VNF package or an artifact file.\n", + "type": "object", + "required": [ + "algorithm", + "hash" + ], + "properties": { + "algorithm": { + "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n", + "type": "string" + }, + "hash": { + "description": "The hexadecimal value of the checksum.\n", + "type": "string" + } + } + }, + "softwareImages": { + "description": "Information about VNF package artifacts that are software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present unless it has been requested to be excluded per attribute selector.\n", + "type": "array", + "items": { + "description": "This type represents an artifact contained in a VNF package which represents a software image.\n", + "type": "object", + "required": [ + "id", + "name", + "provider", + "version", + "checksum", + "containerFormat", + "diskFormat", + "createdAt", + "minDisk", + "minRam", + "size", + "imagePath" + ], + "properties": { + "id": { + "description": "An identifier that is unique within a VNF descriptor.\n", + "type": "string" + }, + "name": { + "description": "Name of the software image.\n", + "type": "string" + }, + "provider": { + "description": "Provider of the software image.\n", + "type": "string" + }, + "version": { + "description": "A Version.\n", + "type": "string" + }, + "checksum": { + "description": "This type represents the checksum of a VNF package or an artifact file.\n", + "type": "object", + "required": [ + "algorithm", + "hash" + ], + "properties": { + "algorithm": { + "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n", + "type": "string" + }, + "hash": { + "description": "The hexadecimal value of the checksum.\n", + "type": "string" + } + } + }, + "containerFormat": { + "description": "Container format indicates whether the software image is in a file format that also contains metadata about the actual software. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - BARE: the image does not have a container or metadata envelope - DOCKER: docker container format - OVA: OVF package in a tarfile - OVF: OVF container format The list of permitted values was taken from \"Container formats\" in http://docs.openstack.org/image-guide/image-formats.html\n", + "type": "string", + "enum": [ + "AKI", + "AMI", + "ARI", + "BARE", + "DOCKER", + "OVA", + "OVF" + ] + }, + "diskFormat": { + "description": "Disk format of a software image is the format of the underlying disk image. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - ISO: an archive format for the data contents of an optical disc, such as CD-ROM\n- QCOW2: a common disk image format, which can expand dynamically and supports copy on write\n- RAW: an unstructured disk image format - VDI: a common disk image format - VHD: a common disk image format - VHDX: enhanced version of VHD format - VMDK: a common disk image format The list of permitted values was adapted from \"Disk formats\" in http://docs.openstack.org/image-guide/image-formats.html\n", + "type": "string", + "enum": [ + "AKI", + "AMI", + "ISO", + "QCOW2", + "RAW", + "VDI", + "VHD", + "VHDX", + "VMDK" + ] + }, + "createdAt": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + }, + "minDisk": { + "description": "The minimal disk for this software image in bytes.\n", + "type": "integer" + }, + "minRam": { + "description": "The minimal RAM for this software image in bytes.\n", + "type": "integer" + }, + "size": { + "description": "Size of this software image in bytes.\n", + "type": "integer" + }, + "userMetadata": { + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n", + "type": "object" + }, + "imagePath": { + "description": "Path in the VNF package, which identifies the image artifact and also allows to access a copy of the image artifact.\n", + "type": "string" + } + } + } + }, + "additionalArtifacts": { + "description": "Information about VNF package artifacts contained in the VNF package that are not software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present if the VNF package contains additional artifacts.\n", + "type": "array", + "items": { + "description": "This type represents an artifact other than a software image which is contained in a VNF package.\n", + "type": "object", + "required": [ + "artifactPath", + "checksum" + ], + "properties": { + "artifactPath": { + "description": "Path in the VNF package, which identifies the artifact and also allows to access a copy of the artifact.\n", + "type": "string" + }, + "checksum": { + "description": "This type represents the checksum of a VNF package or an artifact file.\n", + "type": "object", + "required": [ + "algorithm", + "hash" + ], + "properties": { + "algorithm": { + "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n", + "type": "string" + }, + "hash": { + "description": "The hexadecimal value of the checksum.\n", + "type": "string" + } + } + }, + "metadata": { + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n", + "type": "object" + } + } + } + }, + "onboardingState": { + "description": "CREATED: The VNF package resource has been created. UPLOADING: The associated VNF package content is being uploaded. PROCESSING: The associated VNF package content is being processed, e.g., validation.\nONBOARDED: The associated VNF package content has been successfully on-boarded.\n", + "type": "string", + "enum": [ + "CREATED", + "UPLOADING", + "PROCESSING", + "ONBOARDED" + ] + }, + "operationalState": { + "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for further VNF instantiation requests (unless and until the VNF package\n is re-enabled).\n", + "type": "string", + "enum": [ + "ENABLED", + "DISABLED" + ] + }, + "usageState": { + "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF package.\n" + }, + "userDefinedData": { + "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n", + "type": "object" + }, + "_links": { + "description": "Links to resources related to this resource.\n", + "type": "object", + "required": [ + "self", + "packageContent" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + }, + "vnfd": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + }, + "packageContent": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL003/VNFPackageManagement-API/schemas/vnfPkgsInfo.schema.json b/SOL003/VNFPackageManagement-API/schemas/vnfPkgsInfo.schema.json new file mode 100644 index 00000000..5941dbfa --- /dev/null +++ b/SOL003/VNFPackageManagement-API/schemas/vnfPkgsInfo.schema.json @@ -0,0 +1 @@ +{ "type": "array", "items": { "description": "This type represents the information of an VNF package.\n", "type": "object", "required": [ "id", "operationalState", "usageState", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "vnfdId": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "vnfProvider": { "description": "Provider of the VNF package and the VNFD. This information is copied from the VNFD.\n", "type": "string" }, "vnfProductName": { "description": "Name to identify the VNF product. Invariant for the VNF product lifetime. This information is copied from the VNFD. It shall be present after the VNF package content has been on-boarded and absent otherwise.\n", "type": "string" }, "vnfSoftwareVersion": { "description": "A Version.\n", "type": "string" }, "vnfdVersion": { "description": "A Version.\n", "type": "string" }, "checksum": { "description": "This type represents the checksum of a VNF package or an artifact file.\n", "type": "object", "required": [ "algorithm", "hash" ], "properties": { "algorithm": { "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n", "type": "string" }, "hash": { "description": "The hexadecimal value of the checksum.\n", "type": "string" } } }, "softwareImages": { "description": "Information about VNF package artifacts that are software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present unless it has been requested to be excluded per attribute selector.\n", "type": "array", "items": { "description": "This type represents an artifact contained in a VNF package which represents a software image.\n", "type": "object", "required": [ "id", "name", "provider", "version", "checksum", "containerFormat", "diskFormat", "createdAt", "minDisk", "minRam", "size", "imagePath" ], "properties": { "id": { "description": "An identifier that is unique within a VNF descriptor.\n", "type": "string" }, "name": { "description": "Name of the software image.\n", "type": "string" }, "provider": { "description": "Provider of the software image.\n", "type": "string" }, "version": { "description": "A Version.\n", "type": "string" }, "checksum": { "description": "This type represents the checksum of a VNF package or an artifact file.\n", "type": "object", "required": [ "algorithm", "hash" ], "properties": { "algorithm": { "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n", "type": "string" }, "hash": { "description": "The hexadecimal value of the checksum.\n", "type": "string" } } }, "containerFormat": { "description": "Container format indicates whether the software image is in a file format that also contains metadata about the actual software. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - BARE: the image does not have a container or metadata envelope - DOCKER: docker container format - OVA: OVF package in a tarfile - OVF: OVF container format The list of permitted values was taken from \"Container formats\" in http://docs.openstack.org/image-guide/image-formats.html\n", "type": "string", "enum": [ "AKI", "AMI", "ARI", "BARE", "DOCKER", "OVA", "OVF" ] }, "diskFormat": { "description": "Disk format of a software image is the format of the underlying disk image. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - ISO: an archive format for the data contents of an optical disc, such as CD-ROM\n- QCOW2: a common disk image format, which can expand dynamically and supports copy on write\n- RAW: an unstructured disk image format - VDI: a common disk image format - VHD: a common disk image format - VHDX: enhanced version of VHD format - VMDK: a common disk image format The list of permitted values was adapted from \"Disk formats\" in http://docs.openstack.org/image-guide/image-formats.html\n", "type": "string", "enum": [ "AKI", "AMI", "ISO", "QCOW2", "RAW", "VDI", "VHD", "VHDX", "VMDK" ] }, "createdAt": { "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", "type": "string", "format": "date-time" }, "minDisk": { "description": "The minimal disk for this software image in bytes.\n", "type": "integer" }, "minRam": { "description": "The minimal RAM for this software image in bytes.\n", "type": "integer" }, "size": { "description": "Size of this software image in bytes.\n", "type": "integer" }, "userMetadata": { "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n", "type": "object" }, "imagePath": { "description": "Path in the VNF package, which identifies the image artifact and also allows to access a copy of the image artifact.\n", "type": "string" } } } }, "additionalArtifacts": { "description": "Information about VNF package artifacts contained in the VNF package that are not software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present if the VNF package contains additional artifacts.\n", "type": "array", "items": { "description": "This type represents an artifact other than a software image which is contained in a VNF package.\n", "type": "object", "required": [ "artifactPath", "checksum" ], "properties": { "artifactPath": { "description": "Path in the VNF package, which identifies the artifact and also allows to access a copy of the artifact.\n", "type": "string" }, "checksum": { "description": "This type represents the checksum of a VNF package or an artifact file.\n", "type": "object", "required": [ "algorithm", "hash" ], "properties": { "algorithm": { "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n", "type": "string" }, "hash": { "description": "The hexadecimal value of the checksum.\n", "type": "string" } } }, "metadata": { "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n", "type": "object" } } } }, "onboardingState": { "description": "CREATED: The VNF package resource has been created. UPLOADING: The associated VNF package content is being uploaded. PROCESSING: The associated VNF package content is being processed, e.g., validation.\nONBOARDED: The associated VNF package content has been successfully on-boarded.\n", "type": "string", "enum": [ "CREATED", "UPLOADING", "PROCESSING", "ONBOARDED" ] }, "operationalState": { "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for further VNF instantiation requests (unless and until the VNF package\n is re-enabled).\n", "type": "string", "enum": [ "ENABLED", "DISABLED" ] }, "usageState": { "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF package.\n" }, "userDefinedData": { "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n", "type": "object" }, "_links": { "description": "Links to resources related to this resource.\n", "type": "object", "required": [ "self", "packageContent" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } }, "vnfd": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } }, "packageContent": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } } } } } }} \ No newline at end of file diff --git a/SOL003/VNFPackageManagementNotification-API_nxw/schemas/PackageOnboardingNotification.schema.json b/SOL003/VNFPackageManagementNotification-API_nxw/schemas/PackageOnboardingNotification.schema.json deleted file mode 100644 index e69de29b..00000000 diff --git a/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot index f59058d8..fddc1e9d 100644 --- a/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot +++ b/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot @@ -23,7 +23,7 @@ GET Individual Subscription Should Contain ${contentType} application/json ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscriptions.schema.json ${json} + Validate Json PmSubscription.schema.json ${json} Log Validated PmSubscription schema GET Individual Subscription - Negative (Not Found) diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot index cf59dee9..a18862e1 100644 --- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot +++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot @@ -19,7 +19,7 @@ GET all Pm Jobs Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Checking that reports element is missing ${reports}= Get Value From Json ${json} $..reports @@ -37,7 +37,7 @@ GET all Pm Jobs - Filter Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK GET all Pm Jobs - all_fields @@ -51,7 +51,7 @@ GET all Pm Jobs - all_fields Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Trying to validate criteria schema ${criteria}= Get Value From Json ${json} $..criteria @@ -77,7 +77,7 @@ GET all Pm Jobs - exclude_default Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Checking that reports element is missing ${reports}= Get Value From Json ${json} $..reports @@ -96,7 +96,7 @@ GET all Pm Jobs - fields Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Trying to validate criteria schema ${criteria}= Get Value From Json ${json} $..criteria @@ -119,7 +119,7 @@ GET all Pm Jobs - exclude_fields Log Trying to validate response ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJobs.schema.json ${json} Log Validation OK Log Checking that reports element is missing ${reports}= Get Value From Json ${json} $..reports diff --git a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot index d17e152f..c2bada4a 100644 --- a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot +++ b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot @@ -98,7 +98,7 @@ POST Subscription Should Contain ${contentType} application/json ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscriptions.schema.json ${json} + Validate Json PmSubscription.schema.json ${json} Log Validated PmSubscription schema Log Trying to validate the Location header ${headers}= Output response headers @@ -153,7 +153,7 @@ POST Subscription - NO DUPLICATION Should Contain ${contentType} application/json ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscriptions.schema.json ${json} + Validate Json PmSubscription.schema.json ${json} Log Validated PmSubscription schema Log Trying to validate the Location header ${headers}= Output response headers diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot index 619ac560..7fb80edc 100644 --- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot +++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot @@ -21,7 +21,7 @@ GET Thresholds ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with thresholds schema - Validate Json Threshold.schema.json ${json} + Validate Json Thresholds.schema.json ${json} GET Thresholds - Filter [Documentation] The client can use this method to query information about thresholds. @@ -36,7 +36,7 @@ GET Thresholds - Filter ${result}= Output response body ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with Threshold schema - Validate Json Threshold.schema.json ${json} + Validate Json Thresholds.schema.json ${json} GET Thresholds - NEGATIVE Filter [Documentation] The client can use this method to query information about thresholds. diff --git a/SOL003/VNFPerformanceManagement-API/schemas/PmJobs.schema.json b/SOL003/VNFPerformanceManagement-API/schemas/PmJobs.schema.json new file mode 100644 index 00000000..654acdcf --- /dev/null +++ b/SOL003/VNFPerformanceManagement-API/schemas/PmJobs.schema.json @@ -0,0 +1,134 @@ +{ + "type": "array", + "items": { + "description": "This type represents a PM job.\n", + "type": "object", + "required": [ + "id", + "objectInstanceIds", + "criteria" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "objectInstanceIds": { + "description": "Identifiers of the VNF instances for which performance information is collected.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "criteria": { + "description": "Criteria of the collection of performance information.\n", + "type": "object", + "required": [ + "collectionPeriod", + "reportingPeriod" + ], + "properties": { + "performanceMetric": { + "description": "This defines the types of performance metrics for the specified object instances, as specified in ETSI GS NFV-IFA 027). At least one of the two attributes (performance metric or group) shall be present.\n", + "type": "array", + "items": { + "type": "string" + } + }, + "performanceMetricGroup": { + "description": "Group of performance metrics. A metric group is a pre-defined list of metrics, known to the producer that it can decompose to individual metrics. At least one of the two attributes (performance metric or group) shall be present.\n", + "type": "array", + "items": { + "type": "string" + } + }, + "collectionPeriod": { + "description": "Specifies the periodicity at which the producer will collect performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n", + "type": "integer" + }, + "reportingPeriod": { + "description": "Specifies the periodicity at which the producer will report to the consumer. about performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n", + "type": "integer" + }, + "reportingBoundary": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + } + } + }, + "reports": { + "description": "Information about available reports collected by this PM job.\n", + "type": "object", + "required": [ + "href", + "readyTime", + "_links" + ], + "properties": { + "href": { + "description": "The Uri where the report can be obtained.\n", + "type": "string", + "format": "url" + }, + "readyTime": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + }, + "expiryTime": { + "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n", + "type": "string", + "format": "date-time" + }, + "fileSize": { + "description": "The size of the report file in bytes, if known.\n", + "type": "integer" + }, + "_links": { + "description": "Links for this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + }, + "objects": { + "description": "Links to resources representing the VNF instances for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n", + "type": "array", + "items": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL003/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json b/SOL003/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json new file mode 100644 index 00000000..c9ad0513 --- /dev/null +++ b/SOL003/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json @@ -0,0 +1,142 @@ +{ + "description": "This type represents a subscription.\n", + "type": "object", + "required": [ + "id", + "callbackUri", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "filter": { + "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n", + "type": "object", + "properties": { + "vnfInstanceSubscriptionFilter": { + "description": "This type represents subscription filter criteria to match VNF instances.\n", + "type": "object", + "properties": { + "vnfdIds": { + "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "vnfProductsFromProviders": { + "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProvider" + ], + "properties": { + "vnfProvider": { + "description": "Name of the VNF provider to match.\n", + "type": "string" + }, + "vnfProducts": { + "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfProductName" + ], + "properties": { + "vnfProductName": { + "description": "Name of the VNF product to match.\n", + "type": "string" + }, + "versions": { + "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "type": "object", + "required": [ + "vnfSoftwareVersion" + ], + "properties": { + "vnfSoftwareVersion": { + "description": "A version.\n", + "type": "string" + }, + "vnfdVersions": { + "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", + "type": "array", + "items": { + "description": "A version.\n", + "type": "string" + } + } + } + } + } + } + } + } + } + } + }, + "vnfInstanceIds": { + "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + } + }, + "vnfInstanceNames": { + "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "notificationTypes": { + "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n", + "type": "string", + "enum": [ + "ThresholdCrossedNotification", + "PerformanceInformationAvailableNotification" + ] + } + } + }, + "callbackUri": { + "description": "The URI of the endpoint to send the notification to.\n", + "type": "string", + "format": "url" + }, + "_links": { + "description": "Links to resources related to this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/SOL003/VNFPerformanceManagement-API/schemas/Threshold.schema.json b/SOL003/VNFPerformanceManagement-API/schemas/Threshold.schema.json index d642b93f..d3138727 100644 --- a/SOL003/VNFPerformanceManagement-API/schemas/Threshold.schema.json +++ b/SOL003/VNFPerformanceManagement-API/schemas/Threshold.schema.json @@ -1 +1,85 @@ -{ "type": "array", "items": { "description": "This type represents a threshold.\n", "type": "object", "required": [ "id", "objectInstanceId", "criteria", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "objectInstanceId": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "criteria": { "description": "This type represents criteria that define a threshold.\n", "type": "object", "required": [ "performanceMetric", "thresholdType" ], "properties": { "performanceMetric": { "description": "Defines the performance metric associated with the threshold, as specified in ETSI GS NFV-IFA 027).\n", "type": "string" }, "thresholdType": { "description": "Type of threshold. This attribute determines which other attributes are present in the data structure. Permitted values: * SIMPLE: Single-valued static threshold In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification.\n", "type": "string", "enum": [ "SIMPLE" ] }, "simpleThresholdDetails": { "description": "Details of a simple threshold. Shall be present if thresholdType=\"SIMPLE\".\n", "type": "object", "required": [ "thresholdValue", "hysteresis" ], "properties": { "thresholdValue": { "description": "The threshold value. Shall be represented as a floating point number.\n", "type": "integer" }, "hysteresis": { "description": "The hysteresis of the threshold. Shall be represented as a non-negative floating point number. A notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or reject the request).\n", "type": "integer" } } } } }, "_links": { "description": "Links for this resource.\n", "type": "object", "required": [ "self" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } }, "object": { "description": "Link to a resource representing the VNF instance for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n" } } } } }} \ No newline at end of file +{ + "description": "This type represents a threshold.\n", + "type": "object", + "required": [ + "id", + "objectInstanceId", + "criteria", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "objectInstanceId": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "criteria": { + "description": "This type represents criteria that define a threshold.\n", + "type": "object", + "required": [ + "performanceMetric", + "thresholdType" + ], + "properties": { + "performanceMetric": { + "description": "Defines the performance metric associated with the threshold, as specified in ETSI GS NFV-IFA 027).\n", + "type": "string" + }, + "thresholdType": { + "description": "Type of threshold. This attribute determines which other attributes are present in the data structure. Permitted values: * SIMPLE: Single-valued static threshold In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification.\n", + "type": "string", + "enum": [ + "SIMPLE" + ] + }, + "simpleThresholdDetails": { + "description": "Details of a simple threshold. Shall be present if thresholdType=\"SIMPLE\".\n", + "type": "object", + "required": [ + "thresholdValue", + "hysteresis" + ], + "properties": { + "thresholdValue": { + "description": "The threshold value. Shall be represented as a floating point number.\n", + "type": "integer" + }, + "hysteresis": { + "description": "The hysteresis of the threshold. Shall be represented as a non-negative floating point number. A notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or reject the request).\n", + "type": "integer" + } + } + } + } + }, + "_links": { + "description": "Links for this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + }, + "object": { + "description": "Link to a resource representing the VNF instance for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n" + } + } + } + } +} \ No newline at end of file diff --git a/SOL003/VNFPerformanceManagement-API/schemas/Thresholds.schema.json b/SOL003/VNFPerformanceManagement-API/schemas/Thresholds.schema.json new file mode 100644 index 00000000..42ba2c0b --- /dev/null +++ b/SOL003/VNFPerformanceManagement-API/schemas/Thresholds.schema.json @@ -0,0 +1,88 @@ +{ + "type": "array", + "items": { + "description": "This type represents a threshold.\n", + "type": "object", + "required": [ + "id", + "objectInstanceId", + "criteria", + "_links" + ], + "properties": { + "id": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "objectInstanceId": { + "description": "An identifier with the intention of being globally unique.\n", + "type": "string" + }, + "criteria": { + "description": "This type represents criteria that define a threshold.\n", + "type": "object", + "required": [ + "performanceMetric", + "thresholdType" + ], + "properties": { + "performanceMetric": { + "description": "Defines the performance metric associated with the threshold, as specified in ETSI GS NFV-IFA 027).\n", + "type": "string" + }, + "thresholdType": { + "description": "Type of threshold. This attribute determines which other attributes are present in the data structure. Permitted values: * SIMPLE: Single-valued static threshold In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification.\n", + "type": "string", + "enum": [ + "SIMPLE" + ] + }, + "simpleThresholdDetails": { + "description": "Details of a simple threshold. Shall be present if thresholdType=\"SIMPLE\".\n", + "type": "object", + "required": [ + "thresholdValue", + "hysteresis" + ], + "properties": { + "thresholdValue": { + "description": "The threshold value. Shall be represented as a floating point number.\n", + "type": "integer" + }, + "hysteresis": { + "description": "The hysteresis of the threshold. Shall be represented as a non-negative floating point number. A notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or reject the request).\n", + "type": "integer" + } + } + } + } + }, + "_links": { + "description": "Links for this resource.\n", + "type": "object", + "required": [ + "self" + ], + "properties": { + "self": { + "description": "This type represents a link to a resource.\n", + "type": "object", + "required": [ + "href" + ], + "properties": { + "href": { + "description": "URI of the referenced resource.\n", + "type": "string", + "format": "url" + } + } + }, + "object": { + "description": "Link to a resource representing the VNF instance for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n" + } + } + } + } + } +} \ No newline at end of file -- GitLab