From 8e540b9601a41a1c5ab4c2be8e17bd02a09e7b99 Mon Sep 17 00:00:00 2001 From: aureliano sinatra Date: Tue, 30 Jul 2019 15:29:22 +0200 Subject: [PATCH] wording correction temp_failed --- .../CancelOperationTask.robot | 2 +- .../FailOperationTask.robot | 1 + .../VnfLcmOperationKeywords.robot | 11 ++++++++--- .../CancelOperationTask.robot | 2 +- .../FailOperationTask.robot | 3 ++- .../VnfLcmMntOperationKeywords.robot | 6 +++++- .../CancelOperationTask.robot | 2 +- .../NSLCMOperationKeywords.robot | 2 +- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot index d80fb5aa..f9d96c47 100644 --- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot +++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot @@ -20,7 +20,7 @@ Post Cancel operation task ... Post-Conditions: none POST Cancel operation task Check HTTP Response Status Code Is 202 - Check resource has a temporary failure + Check operation resource state is FAILED_TEMP Post Cancel operation task Conflict [Documentation] Test ID: 6.3.5.16.2 diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot index 6fa0b8ba..5c871b01 100644 --- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot +++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot @@ -19,6 +19,7 @@ Post Fail operation task Post Fail operation Check HTTP Response Status Code Is 202 Check Operation Occurrence Id + Check operation resource state is FINALLY_FAILED Post Fail operation task Conflict (Not-FAILED_TEMP) # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot index 3d0477b4..1ccd255e 100644 --- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot +++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot @@ -58,11 +58,16 @@ Check VNF Status Should Be Equal As Strings ${current} ${expected} Log VNF Status in the correct status -Check resource has a temporary failure +Check operation resource state is FAILED_TEMP Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Get ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} - String response body instantiationState FAILED_TEMP - + String response body instantiationState FAILED_TEMP + +Check operation resource state is FINALLY_FAILED + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Get ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} + String response body instantiationState FINALLY_FAILED + Check HTTP Response Header Contains [Arguments] ${CONTENT_TYPE} Should Contain ${response.headers} ${CONTENT_TYPE} diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot index 1a84a332..59b0574e 100644 --- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot +++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot @@ -19,7 +19,7 @@ Post Cancel operation task ... 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 + Check operation resource state is FAILED_TEMP Post Cancel operation task Conflict [Documentation] Test ID: 7.3.1.16.2 diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot index 26f7e47c..af2287af 100644 --- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot +++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot @@ -16,10 +16,11 @@ Post Fail operation task ... Reference: section 5.4.16.3.1 - SOL003 v2.4.1 ... Config ID: Config_prod_VNFM ... Applicability: none - ... Post-Conditions: none + ... Post-Conditions: VNF resource state is FINALLY_FAILED Post Fail operation Check HTTP Response Status Code Is 202 Check Operation Occurrence Id + Check operation resource state is FINALLY_FAILED Post Fail operation task Conflict (Not-FAILED_TEMP) # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot index 2efc5fef..1e122404 100644 --- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot +++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot @@ -58,11 +58,15 @@ Check VNF Status Should Be Equal As Strings ${current} ${expected} Log VNF Status in the correct status -Check resource has a temporary failure +Check operation resource state is FAILED_TEMP Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Get ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} String response body instantiationState FAILED_TEMP +Check operation resource state is FINALLY_FAILED + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Get ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} + String response body instantiationState FINALLY_FAILED Get Vnf Scale Info [Arguments] ${vnfInstanceId} ${vnfInstance}= Get Vnf Instance ${vnfInstanceId} diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot index 6ae9e02f..d23a730b 100644 --- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot +++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot @@ -19,7 +19,7 @@ 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 resource has a temporary failure + Check operation resource state is FAILED_TEMP Post Cancel operation task Not Found [Documentation] Test ID: 5.3.2.14.2 diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot index fd1b42ed..ab9e2771 100644 --- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot +++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot @@ -114,7 +114,7 @@ Check resource not_instantiated Get ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} String response body instantiationState NOT_INSTANTIATED -Check resource has a temporary failure +Check operation resource state is FAILED_TEMP Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} -- GitLab