X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fnsi_lib.robot;h=7d5f8fa73727d4894e9628e64f9391ffefa20293;hb=b62293cbc54c9681085ea84bd1fcc2b04f0a1646;hp=abbba52a92f6cee8b1d9aaf7a39b229d24c6d51d;hpb=9e22ea8cfc255c97ce3f65bb9eaf801b936fe53b;p=osm%2Ftests.git

diff --git a/robot-systest/lib/nsi_lib.robot b/robot-systest/lib/nsi_lib.robot
index abbba52..7d5f8fa 100644
--- a/robot-systest/lib/nsi_lib.robot
+++ b/robot-systest/lib/nsi_lib.robot
@@ -19,8 +19,9 @@ Library           Collections
 *** Variables ***
 ${success_return_code}   0
 ${slice_launch_pol_time}   30sec
-${slice_delete_max_wait_time}   4min
 ${slice_delete_pol_time}   15sec
+${vim_timeout_multiplier}   %{OSM_VIM_MULTIPLIER_TIMEOUT=1.0}
+
 
 *** Keywords ***
 
@@ -37,6 +38,8 @@ Create Network Slice
 
     [Arguments]   ${nst}   ${vim_name}   ${slice_name}   ${slice_config}   ${publickey}   ${slice_launch_max_wait_time}=6min   ${config_file}=${EMPTY}
 
+    ${slice_launch_max_wait_time}=   Convert Time   ${slice_launch_max_wait_time}   result_format=number
+    ${slice_launch_max_wait_time}=   Evaluate   ${slice_launch_max_wait_time} * ${vim_timeout_multiplier}
     ${config_attr}   Set Variable If   '${slice_config}'!='${EMPTY}'   --config '${slice_config}'   \
     ${sshkeys_attr}   Set Variable If   '${publickey}'!='${EMPTY}'   --ssh_keys ${publickey}   \
     ${config_file_attr}   Set Variable If   '${config_file}'!='${EMPTY}'   --config_file '${config_file}'   \
@@ -172,22 +175,25 @@ Check For Network Slice Instance For Failure
     ${rc}   ${stdout}=   Run and Return RC and Output   osm nsi-list --filter name="${slice_name}"
     log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
-    Should Not Contain   ${stdout}   BROKEN
+    Should Not Contain   ${stdout}   failed
 
 
 Delete NSI
     [Documentation]   Delete Network Slice Instance (NSI)
     ...               Parameters:
     ...                  slice_name: Name of the slice instance
+    ...                  slice_delete_max_wait_time: Delete operation timeout
     ...               Execution example:
     ...                  Delete NST   \${slice_name}
 
-    [Arguments]  ${slice_name}
+    [Arguments]  ${slice_name}   ${slice_delete_max_wait_time}=4min
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm nsi-delete ${slice_name}
     log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
 
+    ${slice_delete_max_wait_time}=   Convert Time   ${slice_delete_max_wait_time}   result_format=number
+    ${slice_delete_max_wait_time}=   Evaluate   ${slice_delete_max_wait_time} * ${vim_timeout_multiplier}
     WAIT UNTIL KEYWORD SUCCEEDS  ${slice_delete_max_wait_time}   ${slice_delete_pol_time}   Check For Network Slice Instance To Be Deleted   ${slice_name}