From aeb8d9cd1f8678865d9a98bba905c905b7726315 Mon Sep 17 00:00:00 2001
From: mxzhao <mengxuan.zhao@eglobalmark.com>
Date: Mon, 5 Nov 2018 17:09:12 +0100
Subject: [PATCH] SOL3 VNF LCM MNT completed
---
.../ChangeExternalVNFConnectivityTask.robot | 11 +++++++----
.../ChangeVNFFlavourTask.robot | 17 +++++++++++------
.../HealVNFTask.robot | 17 +++++++++++------
.../IndividualVNFInstance.robot | 13 +++++++++----
.../InstantiateVNFTask.robot | 9 ++++++---
.../OperateVNFTask.robot | 17 +++++++++++------
.../ScaleVNFTask.robot | 18 ++++++++++++------
.../ScaleVNFToLevelTask.robot | 18 +++++++++++-------
.../TerminateVNFTask.robot | 14 +++++++++-----
.../variables.txt | 10 ----------
TrackingStatus.txt | 8 ++++----
11 files changed, 91 insertions(+), 61 deletions(-)
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot
index 18461a3a..9114703b 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot
@@ -2,7 +2,7 @@
Resource variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
-Library DependencyLibrary
+Library OperatingSystem
Suite setup Check resource existance
*** Test Cases ***
@@ -12,7 +12,8 @@ Change external VNF connectivity
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn ${Change_Ext_Vnf_Connectivity_REQUEST}
+ ${body}= Get File json/changeExtVnfConnectivityRequest .json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn ${body}
Integer response status 202
Log Status code validated
@@ -27,7 +28,8 @@ Change external VNF connectivity Conflict (parallel LCM operation)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn ${Change_Ext_Vnf_Connectivity_REQUEST}
+ ${body}= Get File json/changeExtVnfConnectivityRequest .json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn ${body}
Log Validate Status code
Output response
Integer response status 409
@@ -78,5 +80,6 @@ Launch another LCM operation
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot
index e9d7dd9f..6738d165 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot
@@ -2,7 +2,7 @@
Resource variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
-Library DependencyLibrary
+Library OperatingSystem
Suite setup Check resource existance
*** Test Cases ***
@@ -12,7 +12,8 @@ Change deployment flavour of a vnfInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${Change_Vnf_Flavour_REQUEST}
+ ${body}= Get File json/changeVnfFlavourRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${body}
Integer response status 202
Log Status code validated
@@ -28,7 +29,8 @@ Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${Change_Vnf_Flavour_REQUEST}
+ ${body}= Get File json/changeVnfFlavourRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${body}
Output response
Integer response status 409
Log Status code validated
@@ -45,7 +47,8 @@ Change deployment flavour of a vnfInstance Conflict (parallel LCM operation)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${Change_Vnf_Flavour_REQUEST}
+ ${body}= Get File json/changeVnfFlavourRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${body}
Log Validate Status code
Output response
Integer response status 409
@@ -62,7 +65,8 @@ Change deployment flavour of a vnfInstance Not Found
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${Change_Vnf_Flavour_REQUEST}
+ ${body}= Get File json/changeVnfFlavourRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${body}
Integer response status 404
Log Status code validated
@@ -125,5 +129,6 @@ Launch another LCM operation
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot
index b672d98c..7ae0a75f 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot
@@ -2,7 +2,7 @@
Resource variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
-Library DependencyLibrary
+Library OperatingSystem
Suite setup Check resource existance
*** Test Cases ***
@@ -12,7 +12,8 @@ Heal a vnfInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${Heal_Vnf_REQUEST}
+ ${body}= Get File json/healVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${body}
Integer response status 202
Log Status code validated
@@ -28,7 +29,8 @@ Heal a vnfInstance Conflict (Not-Instantiated)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${Heal_Vnf_REQUEST}
+ ${body}= Get File json/healVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${body}
Output response
Integer response status 409
Log Status code validated
@@ -45,7 +47,8 @@ Heal a vnfInstance Conflict (parallel LCM operation)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${Heal_Vnf_REQUEST}
+ ${body}= Get File json/healVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${body}
Log Validate Status code
Output response
Integer response status 409
@@ -62,7 +65,8 @@ Heal a vnfInstance Not Found
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${Heal_Vnf_REQUEST}
+ ${body}= Get File json/healVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${body}
Integer response status 404
Log Status code validated
@@ -125,5 +129,6 @@ Launch another LCM operation
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot
index 4e983aad..ca8f3c03 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot
@@ -3,6 +3,7 @@
Resource variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
+Library OperatingSystem
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
@@ -53,7 +54,8 @@ PATCH Individual VNFInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} ${PATCH_BODY_REQUEST}
+ ${body}= Get File json/patchBodyRequest.json
+ Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} ${body}
Log Validate Status code
Output response
Integer response status 202
@@ -68,7 +70,8 @@ PATCH Individual VNFInstance Precondition failed
Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
Set Headers {"If-Match": "${Etag}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} ${PATCH_BODY_REQUEST}
+ ${body}= Get File json/patchBodyRequest.json
+ Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} ${body}
Log Validate Status code
Output response
Integer response status 412
@@ -83,7 +86,8 @@ PATCH Individual VNFInstance Conflict
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} ${PATCH_BODY_REQUEST_CONFLICT}
+ ${body}= Get File json/patchBodyRequest.json
+ Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} ${body}
Log Validate Status code
Output response
Integer response status 409
@@ -133,6 +137,7 @@ Launch another LCM operation
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfToLevelRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${body}
Integer response status 202
diff --git a/SOL003/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot
index 1189d3ec..2b26a0b6 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot
@@ -2,7 +2,8 @@
Resource variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
-Library DependencyLibrary
+Library DependencyLibrary
+Library OperatingSystem
Suite setup Check resource existance
@@ -13,7 +14,8 @@ Instantiate a vnfInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate ${INSTANTIATE_VNF_REQUEST}
+ ${body}= Get File json/instantiateVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate ${body}
Output response
Integer response status 202
Log Status code validated
@@ -29,7 +31,8 @@ Instantiate a vnfInstance Conflict
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate ${INSTANTIATE_VNF_REQUEST}
+ ${body}= Get File json/instantiateVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate ${body}
Output response
Integer response status 409
Log Status code validated
diff --git a/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot
index bb2efcab..b4255b8f 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot
@@ -2,7 +2,7 @@
Resource variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
-Library DependencyLibrary
+Library OperatingSystem
Suite setup Check resource existance
*** Test Cases ***
@@ -12,7 +12,8 @@ Operate a vnfInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${Operate_Vnf_REQUEST}
+ ${body}= Get File json/operateVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${body}
Integer response status 202
Log Status code validated
@@ -28,7 +29,8 @@ Operate a vnfInstance Conflict (Not-Instantiated)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${Operate_Vnf_REQUEST}
+ ${body}= Get File json/operateVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${body}
Output response
Integer response status 409
Log Status code validated
@@ -45,7 +47,8 @@ Operate a vnfInstance Conflict (parallel LCM operation)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${Operate_Vnf_REQUEST}
+ ${body}= Get File json/operateVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${body}
Log Validate Status code
Output response
Integer response status 409
@@ -62,7 +65,8 @@ Operate a vnfInstance Not Found
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${Operate_Vnf_REQUEST}
+ ${body}= Get File json/operateVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${body}
Integer response status 404
Log Status code validated
@@ -125,5 +129,6 @@ Launch another LCM operation
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
index 5d33f7b0..c22da346 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
@@ -2,7 +2,8 @@
Resource variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
-Library DependencyLibrary
+Library DependencyLibrary
+Library OperatingSystem
Suite setup Check resource existance
*** Test Cases ***
@@ -12,7 +13,8 @@ Scale a vnfInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Integer response status 202
Log Status code validated
@@ -27,7 +29,8 @@ Scale a vnfInstance Conflict (Not-Instantiated)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Output response
Integer response status 409
Log Status code validated
@@ -43,7 +46,8 @@ Scale a vnfInstance Conflict (parallel LCM operation)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Log Validate Status code
Output response
Integer response status 409
@@ -60,7 +64,8 @@ Scale a vnfInstance Not Found
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Integer response status 404
Log Status code validated
@@ -123,5 +128,6 @@ Launch another LCM operation
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${Scale_Vnf_to_level_REQUEST}
+ ${body}= Get File json/scaleVnfToLevelRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${body}
Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
index 60996716..59cd8657 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
@@ -2,7 +2,7 @@
Resource variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
-Library DependencyLibrary
+Library OperatingSystem
Suite setup Check resource existance
*** Test Cases ***
@@ -12,7 +12,8 @@ Scale a vnfInstance to level
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${Scale_Vnf_to_Level_REQUEST}
+ ${body}= Get File json/scaleVnfToLevelRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${body}
Integer response status 202
Log Status code validated
@@ -27,13 +28,13 @@ Scale a vnfInstance to level Conflict (Not-Instantiated)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfToLevelRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${body}
Output response
Integer response status 409
Log Status code validated
Scale a vnfInstance to level Conflict (parallel LCM operation)
- # 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 the VNF instance resource is in NOT-INSTANTIATED state, or that another lifecycle management operation is ongoing.
@@ -43,7 +44,8 @@ Scale a vnfInstance to level Conflict (parallel LCM operation)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfToLevelRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${body}
Log Validate Status code
Output response
Integer response status 409
@@ -60,7 +62,8 @@ Scale a vnfInstance Not Found
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfToLevelRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${body}
Integer response status 404
Log Status code validated
@@ -123,5 +126,6 @@ Launch another LCM operation
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot
index a4d7e5db..bba27460 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot
@@ -2,7 +2,7 @@
Resource variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
-Library DependencyLibrary
+Library OperatingSystem
Suite setup Check resource existance
*** Test Cases ***
@@ -12,7 +12,8 @@ Terminate a vnfInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate ${Terminate_Vnf_REQUEST}
+ ${body}= Get File json/terminateVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate ${body}
Integer response status 202
Log Status code validated
@@ -28,7 +29,8 @@ Terminate a vnfInstance Conflict (Not-Instantiated)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate ${Terminate_Vnf_REQUEST}
+ ${body}= Get File json/terminateVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate ${body}
Output response
Integer response status 409
Log Status code validated
@@ -45,7 +47,8 @@ Terminate a vnfInstance Conflict (parallel LCM operation)
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate ${Terminate_Vnf_REQUEST}
+ ${body}= Get File json/terminateVnFRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate ${body}
Log Validate Status code
Output response
Integer response status 409
@@ -110,5 +113,6 @@ Launch another LCM operation
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ ${body}= Get File json/scaleVnfRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${body}
Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/variables.txt b/SOL003/VNFLifecycleManagement-API_egm/variables.txt
index 2c109dad..d144946f 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API_egm/variables.txt
@@ -8,9 +8,6 @@ ${NFVO_SCHEMA} https
${AUTHORIZATION} Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ==
${CONTENT_TYPE} application/json
${CONTENT_TYPE_PATCH} application/merge-patch+json
-${PATCH_BODY_REQUEST} {}
-${PATCH_BODY_REQUEST_CONFLICT} {}
-${INSTANTIATE_VNF_REQUEST} {}
${ACCEPT} application/json
${apiRoot} /
${apiName} vnflcm
@@ -28,13 +25,6 @@ ${vnfPkgId_processing} 007c111c-38a1-42c0-a666-7475ecb1567c
${ARTIFACT_TYPE} application/octet-stream
${ARTIFACT_ID} artifactId
${WRONG_ACCEPT} application/json
-${Scale_Vnf_REQUEST} {}
-${Scale_Vnf_to_Level_REQUEST} {}
-${Change_Vnf_Flavour_REQUEST} {}
-${Terminate_Vnf_REQUEST} {}
-${Heal_Vnf_REQUEST} {}
-${Operate_Vnf_REQUEST} {}
-${Change_Ext_Vnf_Connectivity_REQUEST} {}
${vnfLcmOpOccId} 6fc3539c-e602-4afa-8e13-962fb5a7d81d
${CancelMode} GRACEFUL
${LccnSubscriptionRequest} {}
diff --git a/TrackingStatus.txt b/TrackingStatus.txt
index 9b9a9c90..57df1354 100644
--- a/TrackingStatus.txt
+++ b/TrackingStatus.txt
@@ -41,7 +41,7 @@ SOL003
- VNFIndicatorNotification-API_nxw ------------------------> [NOT STARTED]
- - VNFLifecycleManagement-API_egm -------------------------> [DONE] // with request content to be specified
+ - VNFLifecycleManagement-API_egm -------------------------> [DONE]
* VNFInstances ----------------------------------------------> [DONE]
* IndividualVNFInstance -------------------------------------> [DONE]
* InstantiateVNFTask ----------------------------------------> [DONE]
@@ -58,9 +58,9 @@ SOL003
* RollbackOperationTask ------------------------------------> [DONE]
* FailOperationTask ----------------------------------------> [DONE]
* CancelOperationTask --------------------------------------> [DONE]
- * Subscriptions --------------------------------------------> [DONE]
- * IndividualSubscription -----------------------------------> [DONE]
- * NotificationEndpoint -------------------------------------> [DONE]
+ * Subscriptions --------------------------------------------> [DONE] //to be reviewed with nxw on how notification server will be configured
+ * IndividualSubscription -----------------------------------> [DONE] //same as above
+ * NotificationEndpoint -------------------------------------> [DONE] //same as above
- VNFLifecycleOperationGranting-API_egm -------------------> [NOT STARTED]
--
GitLab