X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fnsi_lib.robot;h=1b883960f1c928bd7f5c60602df00948e7fd9e5f;hb=43f34481b4c5ccfda407a7f82a124012aab0dccc;hp=7d61dd508e24565cd4e851770b3e8cd909a0efa1;hpb=347a779370b29bba7421cdfd9e30048b4ed559a5;p=osm%2Ftests.git

diff --git a/robot-systest/lib/nsi_lib.robot b/robot-systest/lib/nsi_lib.robot
index 7d61dd5..1b88396 100644
--- a/robot-systest/lib/nsi_lib.robot
+++ b/robot-systest/lib/nsi_lib.robot
@@ -13,15 +13,15 @@
 #   limitations under the License.
 
 *** Settings ***
-Library           Collections
+Library   Collections
 
 
 *** Variables ***
 ${success_return_code}   0
-${slice_launch_max_wait_time}   5min
 ${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 ***
 
@@ -36,17 +36,20 @@ Create Network Slice
     ...               Execution example:
     ...                  \${nsi}=   Create Network Slice   \${nst}   \${vim_name}   \${slice_name}   \${slice_config}   \${publickey}
 
-    [Arguments]   ${nst}   ${vim_name}   ${slice_name}   ${slice_config}   ${publickey}
+    [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}'   \
 
-    ${nsi_id}=   Instantiate Network Slice   ${slice_name}   ${nst}   ${vim_name}   ${config_attr}   ${sshkeys_attr}
-    log   ${nsi_id}
+    ${nsi_id}=   Instantiate Network Slice   ${slice_name}   ${nst}   ${vim_name}   ${config_attr} ${config_file_attr}   ${sshkeys_attr}
+    Log   ${nsi_id}
 
     WAIT UNTIL KEYWORD SUCCEEDS   ${slice_launch_max_wait_time}   ${slice_launch_pol_time}   Check For Network Slice Instance To Configured   ${slice_name}
     Check For Network Slice Instance For Failure   ${slice_name}
-    [Return]  ${nsi_id}
+    [Return]   ${nsi_id}
 
 
 Instantiate Network Slice
@@ -59,12 +62,12 @@ Instantiate Network Slice
     ...               Execution example:
     ...                  \${nsi}=   Instantiate Network Slice   \${slice_name}   \${nst}   \${vim_name}   \${config_attr}
 
-    [Arguments]   ${slice_name}   ${nst}   ${vim_name}   ${slice_extra_args}    ${sshkeys_attr}
+    [Arguments]   ${slice_name}   ${nst}   ${vim_name}   ${slice_extra_args}   ${sshkeys_attr}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm nsi-create --nsi_name ${slice_name} --nst_name ${nst} --vim_account ${vim_name} ${sshkeys_attr} ${slice_extra_args}
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
-    [Return]  ${stdout}
+    [Return]   ${stdout}
 
 
 Get Slice Ns List
@@ -79,9 +82,9 @@ Get Slice Ns List
     Should Not Be Empty   ${slice_name}
     @{ns_list_string}=   Run and Return RC and Output   osm ns-list | grep ${slice_name} | awk '{print $4}' 2>&1
     # Returns a String of ns_id and needs to be converted into a list
-    @{ns_list} =  Split String    ${ns_list_string}[1]
-    Log List    ${ns_list}
-    [Return]  @{ns_list}
+    @{ns_list} =   Split String   ${ns_list_string}[1]
+    Log List   ${ns_list}
+    [Return]   @{ns_list}
 
 
 Get Slice Ns List Except One
@@ -99,9 +102,9 @@ Get Slice Ns List Except One
 
     @{ns_list_string}=   Run and Return RC and Output   osm ns-list | grep ${slice_name} | awk '!/${exception_ns}/' | awk '{print $4}' 2>&1
     # Returns a String of ns_id and needs to be converted into a list
-    @{ns_list} =  Split String    ${ns_list_string}[1]
-    Log List    ${ns_list}
-    [Return]  @{ns_list}
+    @{ns_list} =   Split String   ${ns_list_string}[1]
+    Log List   ${ns_list}
+    [Return]   @{ns_list}
 
 
 Get Slice Ns Count
@@ -115,9 +118,9 @@ Get Slice Ns Count
 
     Should Not Be Empty   ${slice_name}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-list | grep ${slice_name} | wc -l 2>&1
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
-    [Return]  ${stdout}
+    [Return]   ${stdout}
 
 
 Get Slice Vnf Ip Addresses
@@ -130,16 +133,16 @@ Get Slice Vnf Ip Addresses
     [Arguments]   ${slice_name}
 
     # Get all the ns_id in the slice
-    @{slice_ns_list}  Get Slice Ns List   ${slice_name}
-    log many   @{slice_ns_list}
-    @{temp_list}=    Create List
+    @{slice_ns_list}   Get Slice Ns List   ${slice_name}
+    Log Many   @{slice_ns_list}
+    @{temp_list}=   Create List
     # For each ns_id in the list, get all the vnf_id and their IP addresses
     FOR   ${ns_id}   IN   @{slice_ns_list}
-        log   ${ns_id}
+        Log   ${ns_id}
         @{vnf_id_list}   Get Ns Vnf List   ${ns_id}
         # For each vnf_id in the list, get all its IP addresses
         @{ns_ip_list}   Get Ns Ip List   @{vnf_id_list}
-        @{temp_list}=   Combine Lists   ${temp_list}    ${ns_ip_list}
+        @{temp_list}=   Combine Lists   ${temp_list}   ${ns_ip_list}
     END
     Log List   ${temp_list}
     [Return]   @{temp_list}
@@ -152,12 +155,12 @@ Check For Network Slice Instance To Configured
     ...               Execution example:
     ...                  Check For Network Slice Instance To Configured   \${slice_name}
 
-    [Arguments]  ${slice_name}
+    [Arguments]   ${slice_name}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm nsi-list --filter name="${slice_name}"
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
-    Should Contain Any   ${stdout}   READY   BROKEN	configured
+    Should Contain Any   ${stdout}   READY   BROKEN   configured
 
 
 Check For Network Slice Instance For Failure
@@ -167,28 +170,31 @@ Check For Network Slice Instance For Failure
     ...               Execution example:
     ...                  Check For Network Slice Instance For Failure   \${slice_name}
 
-    [Arguments]  ${slice_name}
+    [Arguments]   ${slice_name}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm nsi-list --filter name="${slice_name}"
-    log   ${stdout}
+    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}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
 
-    WAIT UNTIL KEYWORD SUCCEEDS  ${slice_delete_max_wait_time}   ${slice_delete_pol_time}   Check For Network Slice Instance To Be Deleted   ${slice_name}
+    ${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}
 
 
 Check For Network Slice Instance To Be Deleted
@@ -198,7 +204,7 @@ Check For Network Slice Instance To Be Deleted
     ...               Execution example:
     ...                  Check For Network Slice Instance   \${slice_name}
 
-    [Arguments]  ${slice_name}
+    [Arguments]   ${slice_name}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm nsi-list | awk '{print $2}' | grep ${slice_name}
     Should Not Be Equal As Strings   ${stdout}   ${slice_name}