X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fns_lib.resource;h=f76478e0df2402bc76bf2fad1b05bb44cad723e9;hb=refs%2Fchanges%2F22%2F14122%2F10;hp=9d7276f77145e305ee36832e5049ed4f90fdb3e9;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc;p=osm%2Ftests.git diff --git a/robot-systest/lib/ns_lib.resource b/robot-systest/lib/ns_lib.resource index 9d7276f..f76478e 100644 --- a/robot-systest/lib/ns_lib.resource +++ b/robot-systest/lib/ns_lib.resource @@ -35,9 +35,9 @@ Create Network Service ${ns_launch_max_wait_time}= Convert Time ${ns_launch_max_wait_time} result_format=number ${ns_launch_max_wait_time}= Evaluate ${ns_launch_max_wait_time} * ${VIM_TIMEOUT_MULTIPLIER} Log ${ns_launch_max_wait_time} - ${config_attr}= Set Variable If "${ns_config}" != "${EMPTY}" --config '${ns_config}' ${EMPTY} - ${sshkeys_attr}= Set Variable If "${publickey}" != "${EMPTY}" --ssh_keys ${publickey} ${EMPTY} - ${config_file_attr}= Set Variable If "${config_file}" != "${EMPTY}" --config_file '${config_file}' ${EMPTY} + ${config_attr}= Set Variable If '${ns_config}'!='${EMPTY}' --config '${ns_config}' ${EMPTY} + ${sshkeys_attr}= Set Variable If '${publickey}'!='${EMPTY}' --ssh_keys ${publickey} ${EMPTY} + ${config_file_attr}= Set Variable If '${config_file}'!='${EMPTY}' --config_file '${config_file}' ${EMPTY} ${ns_id}= Instantiate Network Service ${ns_name} ${nsd} ${vim_name} ${config_attr} ${sshkeys_attr} ${config_file_attr} Log ${ns_id} Wait Until Keyword Succeeds ${ns_launch_max_wait_time} ${NS_LAUNCH_POL_TIME} Check For NS Instance To Configured ${ns_name}