From 3bdfc5cf3e6832a1cae764dd40f04e00a8467099 Mon Sep 17 00:00:00 2001
From: aureliano sinatra <sinaure@gmail.com>
Date: Thu, 25 Jul 2019 11:10:30 +0200
Subject: [PATCH] removed all should and replaced with shall
---
.../CancelOperationTask.robot | 6 +--
.../ChangeExternalVNFConnectivityTask.robot | 2 +-
.../ChangeVNFFlavourTask.robot | 2 +-
.../LCMParallelOperation.robot | 41 ------------------
.../Subscriptions.robot | 6 +--
.../CancelOperationTask.robot | 6 +--
.../ChangeExternalVNFConnectivityTask.robot | 2 +-
.../ChangeVNFFlavourTask.robot | 2 +-
.../LCMParallelOperation.robot | 42 -------------------
.../Subscriptions.robot | 6 +--
10 files changed, 16 insertions(+), 99 deletions(-)
delete mode 100644 SOL002/VNFLifecycleManagement-API/LCMParallelOperation.robot
delete mode 100644 SOL003/VNFLifecycleManagement-API/LCMParallelOperation.robot
diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index 0b2e1c1f..864b8f8a 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -17,7 +17,7 @@ Post Cancel operation task
... Reference: section 5.4.17.3.1 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: none
POST Cancel operation task
Check HTTP Response Status Code Is 202
Check resource has a temporary failure
@@ -30,7 +30,7 @@ Post Cancel operation task Conflict
... Reference: section 5.4.17.3.1 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: none
POST Cancel operation task
Check HTTP Response Status Code Is 409
Check HTTP Response Body Json Schema Is ProblemDetails
@@ -44,7 +44,7 @@ Post Cancel operation task Not Found
... Reference: section 5.4.17.3.1 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: none
POST Cancel operation task
Check HTTP Response Status Code Is 404
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 407f5a18..a61b5695 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -16,7 +16,7 @@ POST Change external VNF connectivity
... Reference: section 5.4.11.3.1 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
POST Change External VNF Connectivity
Check HTTP Response Status Code Is 202
Check Operation Occurrence Id
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index b730df48..8ccb0e8e 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -16,7 +16,7 @@ Change deployment flavour of a vnfInstance
... Reference: section 5.4.7.3.1 - SOL003 v2.4.1
... Config ID: Config_prod_VE
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
POST Change VNF deployment flavour
Check HTTP Response Status Code Is 202
Check Operation Occurrence Id
diff --git a/SOL002/VNFLifecycleManagement-API/LCMParallelOperation.robot b/SOL002/VNFLifecycleManagement-API/LCMParallelOperation.robot
deleted file mode 100644
index e01a43ac..00000000
--- a/SOL002/VNFLifecycleManagement-API/LCMParallelOperation.robot
+++ /dev/null
@@ -1,41 +0,0 @@
-*** Settings ***
-Resource environment/variables.txt
-Resource VnfLcmOperationKeywords.robot
-Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
-Library OperatingSystem
-Library JSONLibrary
-Library JSONSchemaLibrary schemas/
-
-*** Test Cases ***
-Scale a vnfInstance
- [Documentation] Instantiate VNF The POST method instantiates a VNF instance.
- Log Trying to Instantiate a vnf Instance
- Set Headers {"Accept":"${ACCEPT}"}
- Set Headers {"Content-Type": "${CONTENT_TYPE}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- ${body}= Get File jsons/scaleVnfRequest.json
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${conflicVnfInstanceId}/scale ${body}
- Integer response status 202
- Log Status code validated
- ${headers}= Output response headers
- Should Contain ${headers} Location
- Log Validation OK
-
-Scale a vnfInstance 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.
- ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error.
- log Trying to Scale a vnf Instance
- Set Headers {"Accept":"${ACCEPT}"}
- Set Headers {"Content-Type": "${CONTENT_TYPE}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- ${body}= Get File jsons/scaleVnfRequest.json
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${conflicVnfInstanceId}/scale ${body}
- Integer response status 409
- Log Status code validated
- ${problemDetails}= Output response body
- Validate Json ProblemDetails.schema.json ${problemDetails}
- Log Validation OK
-
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index d345f528..ee93b686 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -15,7 +15,7 @@ POST Create a new subscription
... Reference: section 5.4.18.3.1 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
... POST Cancel operation task
Post Create subscription
Check HTTP Response Status Code Is 201
@@ -28,7 +28,7 @@ Create a new Subscription - DUPLICATION
... Reference: section 5.4.18.3.1 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
... POST Cancel operation task
Post Create subscription - DUPLICATION
Check HTTP Response Status Code Is 201
@@ -42,7 +42,7 @@ Create a new Subscription - NO-DUPLICATION
... Reference: section 5.4.18.3.1 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
... POST Cancel operation task
Post Create subscription - NO-DUPLICATION
Check HTTP Response Status Code Is 303
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index 37615b49..0550cfa8 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -16,7 +16,7 @@ Post Cancel operation task
... Reference: section 5.4.17.3.1 - SOL003 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: VNF instance status equal to FAILED_TEMP
POST Cancel operation task
Check HTTP Response Status Code Is 202
Check resource has a temporary failure
@@ -29,7 +29,7 @@ Post Cancel operation task Conflict
... Reference: section 5.4.17.3.1 - SOL003 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: none
POST Cancel operation task
Check HTTP Response Status Code Is 409
Check HTTP Response Body Json Schema Is ProblemDetails
@@ -43,7 +43,7 @@ Post Cancel operation task Not Found
... Reference: section 5.4.17.3.1 - SOL003 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: none
POST Cancel operation task
Check HTTP Response Status Code Is 404
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index d57054da..450858a3 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -16,7 +16,7 @@ POST Change external VNF connectivity
... Reference: section 5.4.11.3.1 - SOL003 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
POST Change External VNF Connectivity
Check HTTP Response Status Code Is 202
Check Operation Occurrence Id
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 6cedd724..4770d21d 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -16,7 +16,7 @@ POST Change deployment flavour of a vnfInstance
... Reference: section 5.4.7.3.1 - SOL003 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
POST Change VNF deployment flavour
Check HTTP Response Status Code Is 202
Check Operation Occurrence Id
diff --git a/SOL003/VNFLifecycleManagement-API/LCMParallelOperation.robot b/SOL003/VNFLifecycleManagement-API/LCMParallelOperation.robot
deleted file mode 100644
index e4bb01b3..00000000
--- a/SOL003/VNFLifecycleManagement-API/LCMParallelOperation.robot
+++ /dev/null
@@ -1,42 +0,0 @@
-*** Settings ***
-Resource environment/configuration.txt
-Resource environment/variables.txt
-Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
-Library OperatingSystem
-Library JSONLibrary
-Library JSONSchemaLibrary schemas/
-
-*** Test Cases ***
-Scale a vnfInstance
- [Documentation] Instantiate VNF The POST method instantiates a VNF instance.
- Log Trying to Instantiate a vnf Instance
- Set Headers {"Accept":"${ACCEPT}"}
- Set Headers {"Content-Type": "${CONTENT_TYPE}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- ${body}= Get File jsons/scaleVnfRequest.json
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${conflicVnfInstanceId}/scale ${body}
- Integer response status 202
- Log Status code validated
- ${headers}= Output response headers
- Should Contain ${headers} Location
- Log Validation OK
-
-
-Scale a vnfInstance 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.
- ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error.
- log Trying to Scale a vnf Instance
- Set Headers {"Accept":"${ACCEPT}"}
- Set Headers {"Content-Type": "${CONTENT_TYPE}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- ${body}= Get File jsons/scaleVnfRequest.json
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${conflicVnfInstanceId}/scale ${body}
- Integer response status 409
- Log Status code validated
- ${problemDetails}= Output response body
- Validate Json ProblemDetails.schema.json ${problemDetails}
- Log Validation OK
-
diff --git a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
index ded88b62..15063cc8 100644
--- a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
@@ -17,7 +17,7 @@ POST Create a new subscription
... Reference: section 5.4.18.3.1 - SOL003 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
... POST Cancel operation task
Post Create subscription
Check HTTP Response Status Code Is 201
@@ -30,7 +30,7 @@ Create a new Subscription - DUPLICATION
... Reference: section 5.4.18.3.1 - SOL003 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
... POST Cancel operation task
Post Create subscription - DUPLICATION
Check HTTP Response Status Code Is 201
@@ -44,7 +44,7 @@ Create a new Subscription - NO-DUPLICATION
... Reference: section 5.4.18.3.1 - SOL003 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: in response header Location should not be null
+ ... Post-Conditions: in response header Location shall not be null
... POST Cancel operation task
Post Create subscription - NO-DUPLICATION
Check HTTP Response Status Code Is 303
--
GitLab