X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fns_operation_lib.resource;h=71be6bf9cf5f0a1cf9d4dfb319515a1b922e89b8;hb=refs%2Fchanges%2F22%2F14122%2F10;hp=968fdd99bbfe314116f12f40e2210991a1cbd91f;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc;p=osm%2Ftests.git

diff --git a/robot-systest/lib/ns_operation_lib.resource b/robot-systest/lib/ns_operation_lib.resource
index 968fdd9..71be6bf 100644
--- a/robot-systest/lib/ns_operation_lib.resource
+++ b/robot-systest/lib/ns_operation_lib.resource
@@ -105,7 +105,7 @@ Execute Manual VNF Scale
     ${vnf_scale_max_wait_time}=   Evaluate   ${vnf_scale_max_wait_time} * ${VIM_TIMEOUT_MULTIPLIER}
     Should Contain Any   ${scale_type}   SCALE_IN   SCALE_OUT   msg=Unknown scale type: ${scale_type}   values=False
     ${osm_vnf_scale_command}=   Set Variable   osm vnf-scale --scaling-group ${scaling_group}
-    IF   ${scale_type}=='SCALE_IN'
+    IF   '${scale_type}'=='SCALE_IN'
         ${osm_vnf_scale_command}=   Catenate   ${osm_vnf_scale_command}   --scale-in
     ELSE
         ${osm_vnf_scale_command}=   Catenate   ${osm_vnf_scale_command}   --scale-out
@@ -167,6 +167,15 @@ Check For NS Operation Ended
     Should Be Equal As Integers   ${rc}   ${SUCCESS_RETURN_CODE}
     Should Contain Any   ${stdout}   FAILED   COMPLETED   msg=Timeout waiting for ns-action with id ${ns_operation_id}   values=False
 
+Check For NS Operation Cancelled
+    [Documentation]   Check whether the operation was cancelled or not.
+    [Arguments]   ${ns_operation_id}
+    Should Not Be Empty   ${ns_operation_id}
+    ${rc}   ${stdout}=   Run And Return Rc And Output   osm ns-op-show ${ns_operation_id} --literal | yq -r '.operationState, .isCancelPending'
+    Log   ${stdout}
+    Should Be Equal As Integers   ${rc}   ${SUCCESS_RETURN_CODE}
+    Should Contain   ${stdout}   FAILED_TEMP\nfalse   msg=Timeout waiting for ns-action with id ${ns_operation_id}   values=False
+
 Get Operations By Type
     [Documentation]   Keyword to get the operation by type
     [Arguments]   ${ns_id}   ${type}