From 9e22ea8cfc255c97ce3f65bb9eaf801b936fe53b Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 14 Jan 2021 12:12:31 +0000 Subject: [PATCH] nsi_lib: updated Create Network Slice, max_wait_time as param, config_file as param Change-Id: I15981d8015d0125a581cda400d75f939a2deefdd Signed-off-by: garciadeblas --- robot-systest/lib/nsi_lib.robot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/robot-systest/lib/nsi_lib.robot b/robot-systest/lib/nsi_lib.robot index 7d61dd5..abbba52 100644 --- a/robot-systest/lib/nsi_lib.robot +++ b/robot-systest/lib/nsi_lib.robot @@ -18,7 +18,6 @@ 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 @@ -36,12 +35,13 @@ 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} ${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} + ${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} @@ -59,7 +59,7 @@ 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} -- 2.17.1