Commit 56c31764 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

implemented deltas for SOL005 NSLCM v2.8.1

parent d00f3dc2
......@@ -19,6 +19,8 @@ POST Cancel operation task
... Post-Conditions: NS instance status equal to FAILED_TEMP
POST Cancel operation task
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check operation resource state is FAILED_TEMP
POST Cancel operation task Not Found
......
......@@ -19,6 +19,8 @@ POST Continue operation task
... Post-Conditions: NS instance status not equal to FAILED_TEMP
POST Continue operation task
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check operation resource state is not FAILED_TEMP
POST Continue operation task Not Found
......
......@@ -19,6 +19,8 @@ POST Fail operation task
... Post-Conditions: none
POST Fail operation task
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check resource is finally failed
POST Fail operation task Not Found
......
......@@ -20,6 +20,7 @@ POST Heal a NSInstance
POST Heal NSInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
POST Heal a NSInstance - Conflict (Not Instantited)
[Documentation] Test ID: 5.3.2.6.2
......
......@@ -22,7 +22,7 @@ Heal Flow of NS lifecycle management operations
POST Heal NSInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Operation Occurrence Id
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check Operation Notification Status is START
Check Operation Notification Status is RESULT
Check resource instantiated
......
......@@ -20,6 +20,7 @@ POST Instantiate a nsInstance
POST Instantiate nsInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check resource INSTANTIATED
POST Instantiate a nsInstance Conflict
......
......@@ -22,7 +22,7 @@ Instantiate Flow of NS lifecycle management operations
POST Instantiate nsInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Operation Occurrence Id
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check Operation Notification Status is START
Check Operation Notification Status is RESULT
Check resource instantiated
......
......@@ -18,11 +18,7 @@ Initialize System
Start Process java -jar ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
Check Operation Occurrence Id
Set Global Variable @{nsLcmOpOccId} ${response['headers']['Location']}
Should Not Be Empty ${nsLcmOpOccId}
Create Sessions
Start Process java -jar ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
......@@ -211,7 +207,16 @@ Check HTTP Response Header Contains
[Arguments] ${HEADER_TOCHECK}
Should Contain ${response['headers']} ${HEADER_TOCHECK}
Log Header is present
Check Individual NS LCM operation occurrence operationState is
[Arguments] ${status}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
Get ${response['headers']['Location']}
Log Validate operationState
Should Be Equal as Strings ${response['body']['operationState']} ${status}
Log operationState validated
Set Global Variable @{nsLcmOpOccId} ${response['headers']['Location']}
Check HTTP Response Body Json Schema Is
[Arguments] ${input}
${schema} = Catenate SEPARATOR= ${input} .schema.json
......@@ -1137,6 +1142,8 @@ POST subscriptions
Post ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body}
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
Log Verify that NFVO tested the notification endpoint
Verify Mock Expectation ${notification_request}
Clear Requests ${callback_endpoint}
POST subscriptions DUPLICATION
......@@ -1156,6 +1163,8 @@ POST subscriptions DUPLICATION
Post ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body}
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
Log Verify that NFVO tested the notification endpoint
Verify Mock Expectation ${notification_request}
Clear Requests ${callback_endpoint}
POST subscriptions NO DUPLICATION
......@@ -1175,6 +1184,8 @@ POST subscriptions NO DUPLICATION
Post ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body}
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
Log Verify that NFVO tested the notification endpoint
Verify Mock Expectation ${notification_request}
Clear Requests ${callback_endpoint}
GET Subscriptions
......
......@@ -19,7 +19,8 @@ Post Retry operation task
... Post-Conditions: NS instance status not equal to FAILED_TEMP
POST Retry operation task
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check operation resource state is not FAILED_TEMP
Post Retry operation task Not Found
......
......@@ -19,6 +19,8 @@ POST Rollback operation task
... Post-Conditions: NS instance status not equal to FAILED_TEMP
POST Rollback operation task
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check operation resource state is not FAILED_TEMP
POST Rollback operation task Not Found
......
......@@ -20,6 +20,7 @@ POST Scale a nsInstance
POST scale nsInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check resource existence
POST Scale a nsInstance - Conflict (Not Instantited)
......
......@@ -22,7 +22,7 @@ Scale Flow of NS lifecycle management operations
POST scale nsInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Operation Occurrence Id
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check Operation Notification Status is START
Check Operation Notification Status is RESULT
Check resource instantiated
......
......@@ -19,6 +19,7 @@ POST Terminate a NSInstance
POST Terminate NSInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check resource not_instantiated
POST Terminate a NSInstance - Conflict (Not Instantited)
......
......@@ -22,7 +22,7 @@ Terminate Flow of NS lifecycle management operations
POST Terminate NSInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Operation Occurrence Id
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check Operation Notification Status is START
Check Operation Notification Status is RESULT
Check NS resource not_instantiated
......
......@@ -20,6 +20,7 @@ POST Update a NSInstance
POST Update NSInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Individual NS LCM operation occurrence operationState is PROCESSING
POST Update a NSInstance - Conflict (Not Instantited)
[Documentation] Test ID: 5.3.2.5.2
......
......@@ -22,7 +22,7 @@ Update Flow of NS lifecycle management operations
POST Update NSInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check Operation Occurrence Id
Check Individual NS LCM operation occurrence operationState is PROCESSING
Check Operation Notification Status is START
Check Operation Notification Status is RESULT
Check resource instantiated
......
......@@ -1043,61 +1043,58 @@
}
},
"virtualStorageResourceInfo": {
"description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
"type": "array",
"items": {
"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
"type": "object",
"required": [
"id",
"virtualStorageDescId",
"storageResource"
],
"properties": {
"id": {
"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
"type": "string"
},
"virtualStorageDescId": {
"description": "Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.\n",
"type": "string"
},
"storageResource": {
"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance or by an NS instance. Information about the resource is available from the VIM.\n",
"type": "object",
"required": [
"resourceId"
],
"properties": {
"vimId": {
"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. Representation: string of variable length.\n",
"type": "string"
},
"vimLevelResourceType": {
"description": "Type of the resource in the scope of the VIM or the resource provider. The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle.\n",
"type": "string"
}
}
},
"reservationId": {
"description": "An identifier with the intention of being globally unique.\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"
}
}
}
}
"description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
"type": "array",
"items": {
"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
"type": "object",
"required": ["id", "virtualStorageDescId", "storageResource"],
"properties": {
"id": {
"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
"type": "string"
},
"virtualStorageDescId": {
"description": "Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.\n",
"type": "string"
},
"vnfdId": {
"description": "An identifier with the intention of being globally unique.\n",
"type": "string"
},
"storageResource": {
"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance or by an NS instance. Information about the resource is available from the VIM.\n",
"type": "object",
"required": ["resourceId"],
"properties": {
"vimId": {
"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. Representation: string of variable length.\n",
"type": "string"
},
"vimLevelResourceType": {
"description": "Type of the resource in the scope of the VIM, the WIM or the resource provider. The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM, the WIM or the resource provider and can be used as information that complements the ResourceHandle.\n",
"type": "string"
}
}
},
"reservationId": {
"description": "An identifier with the intention of being globally unique.\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"
}
}
}
}
},
"metadata": {
......
......@@ -1045,61 +1045,58 @@
}
},
"virtualStorageResourceInfo": {
"description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
"type": "array",
"items": {
"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
"type": "object",
"required": [
"id",
"virtualStorageDescId",
"storageResource"
],
"properties": {
"id": {
"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
"type": "string"
},
"virtualStorageDescId": {
"description": "Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.\n",
"type": "string"
},
"storageResource": {
"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance or by an NS instance. Information about the resource is available from the VIM.\n",
"type": "object",
"required": [
"resourceId"
],
"properties": {
"vimId": {
"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. Representation: string of variable length.\n",
"type": "string"
},
"vimLevelResourceType": {
"description": "Type of the resource in the scope of the VIM or the resource provider. The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle.\n",
"type": "string"
}
}
},
"reservationId": {
"description": "An identifier with the intention of being globally unique.\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"
}
}
}
}
"description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
"type": "array",
"items": {
"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
"type": "object",
"required": ["id", "virtualStorageDescId", "storageResource"],
"properties": {
"id": {
"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
"type": "string"
},
"virtualStorageDescId": {
"description": "Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.\n",
"type": "string"
},
"vnfdId": {
"description": "An identifier with the intention of being globally unique.\n",
"type": "string"
},
"storageResource": {
"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance or by an NS instance. Information about the resource is available from the VIM.\n",
"type": "object",
"required": ["resourceId"],
"properties": {
"vimId": {
"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. Representation: string of variable length.\n",
"type": "string"
},
"vimLevelResourceType": {
"description": "Type of the resource in the scope of the VIM, the WIM or the resource provider. The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM, the WIM or the resource provider and can be used as information that complements the ResourceHandle.\n",
"type": "string"
}
}
},
"reservationId": {
"description": "An identifier with the intention of being globally unique.\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"
}
}
}
}
},
"metadata": {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment