X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Flib%2Fns_lib.robot;fp=robot-systest%2Flib%2Fns_lib.robot;h=a37e509d9eb24125e24ff8f43bbab3d059069790;hp=aa0830ff414d9ddc067db7a99cbebef5b3d4308f;hb=db73aa70f10d7da6ee7387b1854c6b22d871b6f3;hpb=97dcbb6cede16bb1c98057127d1080435ac24659

diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot
index aa0830f..a37e509 100644
--- a/robot-systest/lib/ns_lib.robot
+++ b/robot-systest/lib/ns_lib.robot
@@ -284,7 +284,7 @@ Get Operations List
 
 
 Check For NS Operation Completed
-    [Documentation]   Check wheter the status of the desired operation is "COMPLETED" or not.
+    [Documentation]   Check whether the status of the desired operation is "COMPLETED" or not.
 
     [Arguments]   ${ns_operation_id}
 
@@ -296,7 +296,7 @@ Check For NS Operation Completed
 
 
 Check For NS Operation Failed
-    [Documentation]   Check wheter the status of the desired operation is "FAILED" or not.
+    [Documentation]   Check whether the status of the desired operation is "FAILED" or not.
 
     [Arguments]   ${ns_operation_id}
 
@@ -308,7 +308,7 @@ Check For NS Operation Failed
 
 
 Check For NS Operation Ended
-    [Documentation]   Check wheter the status of the desired operation is "FAILED" or "COMPLETED".
+    [Documentation]   Check whether the status of the desired operation is "FAILED" or "COMPLETED".
 
     [Arguments]   ${ns_operation_id}
 
@@ -319,6 +319,18 @@ Check For NS Operation Ended
     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 Ns Vnfr Ids
     [Documentation]   Return a list with the IDs of the VNF records of a NS instance.
 
@@ -393,3 +405,14 @@ Get Operations By Type
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Not Be Empty   ${stdout}
     [Return]   ${stdout}
+
+Cancel operation By Id
+    [Documentation]   Cancels an ongoing operation by operation ID
+
+    [Arguments]   ${op_id}   ${cancel_mode}=GRACEFUL
+
+    Should Not Be Empty   ${op_id}
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-op-cancel ${op_id} --cancel_mode ${cancel_mode} --wait
+    Log   ${stdout}
+    Should Be Equal As Integers   ${rc}   ${success_return_code}
+    [Return]   ${stdout}
\ No newline at end of file