projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New test basic_16: advanced onboarding with override and scaling in
[osm/tests.git]
/
robot-systest
/
lib
/
ns_lib.robot
diff --git
a/robot-systest/lib/ns_lib.robot
b/robot-systest/lib/ns_lib.robot
index
7126811
..
c81e33f
100644
(file)
--- a/
robot-systest/lib/ns_lib.robot
+++ b/
robot-systest/lib/ns_lib.robot
@@
-17,15
+17,13
@@
${ns_delete_max_wait_time} 4min
${ns_delete_pol_time} 15sec
${ns_action_max_wait_time} 1min
${ns_action_pol_time} 15sec
${ns_delete_pol_time} 15sec
${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
+${vnf_scale_max_wait_time} 2min
+${vnf_scale_pol_time} 15sec
*** Keywords ***
Create Network Service
*** 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} \
${config_attr} Set Variable If '${ns_config}'!='${EMPTY}' --config '${ns_config}' \
${sshkeys_attr} Set Variable If '${publickey}'!='${EMPTY}' --ssh_keys ${publickey} \
@@
-204,7
+202,7
@@
Execute Manual VNF Scale
${osm_vnf_scale_command}= Catenate ${osm_vnf_scale_command} ${ns_name} ${vnf_member_index}
${rc} ${stdout}= Run and Return RC and Output ${osm_vnf_scale_command}
Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False
${osm_vnf_scale_command}= Catenate ${osm_vnf_scale_command} ${ns_name} ${vnf_member_index}
${rc} ${stdout}= Run and Return RC and Output ${osm_vnf_scale_command}
Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False
- Wait Until Keyword Succeeds ${
ns_action_max_wait_time} ${ns_action
_pol_time} Check For NS Operation Completed ${stdout}
+ Wait Until Keyword Succeeds ${
vnf_scale_max_wait_time} ${vnf_scale
_pol_time} Check For NS Operation Completed ${stdout}
[Return] ${stdout}
[Return] ${stdout}