Merge branch 'feature/refactoring' into 'master'

wording correction temp_failed

See merge request stf/stf-557/api-tests!11

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

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

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}

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

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

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}

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

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}"}