From: garciadeblas Date: Wed, 24 Mar 2021 08:51:30 +0000 (+0100) Subject: Revert "ns_lib: new env variable to set NS instantiation timeout for testing" X-Git-Tag: branch-sol006v331-start~17 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f21267893020608172b5cd94a0c889c83697cab5;p=osm%2Ftests.git Revert "ns_lib: new env variable to set NS instantiation timeout for testing" This reverts commit 74181401ccc81d7d696637b6ea8a86061e87881a. Change-Id: I620644fa362b9fddf584dba196da3b5f9ce5e090 Signed-off-by: garciadeblas --- diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot index 7126811..57eb6f5 100644 --- a/robot-systest/lib/ns_lib.robot +++ b/robot-systest/lib/ns_lib.robot @@ -19,13 +19,11 @@ ${ns_action_max_wait_time} 1min ${ns_action_pol_time} 15sec ${vnf_scale_max_wait_time} 5min ${vnf_scale_pol_time} 30sec -# If env variable "OSM_NS_TIMEOUT" exists, it prevails over the default timeout -${default_ns_launch_max_wait_time}= Get Environment Variable OSM_NS_TIMEOUT default=5min *** Keywords *** Create Network Service - [Arguments] ${nsd} ${vim_name} ${ns_name} ${ns_config} ${publickey} ${ns_launch_max_wait_time}=${default_ns_launch_max_wait_time} ${config_file}=${EMPTY} + [Arguments] ${nsd} ${vim_name} ${ns_name} ${ns_config} ${publickey} ${ns_launch_max_wait_time}=5min ${config_file}=${EMPTY} ${config_attr} Set Variable If '${ns_config}'!='${EMPTY}' --config '${ns_config}' \ ${sshkeys_attr} Set Variable If '${publickey}'!='${EMPTY}' --ssh_keys ${publickey} \