Bug 873: Robot Automation improvement: NS_CONFIG Provided via both 1. Using Environment variable/file 2. Using Testsuit Variable
Change-Id: I762e6a6f00ec02604b588f808955bd780f679555
Signed-off-by: yadavmr <my00514913@techmahindra.com>
diff --git a/robot-systest/lib/cli/ns_lib.robot b/robot-systest/lib/cli/ns_lib.robot
index 9588527..8be124d 100644
--- a/robot-systest/lib/cli/ns_lib.robot
+++ b/robot-systest/lib/cli/ns_lib.robot
@@ -29,6 +29,7 @@
${ns_launch_pol_time} 30sec
${ns_delete_max_wait_time} 1min
${ns_delete_pol_time} 15sec
+${nsconfig}
*** Keywords ***
@@ -41,20 +42,33 @@
Launch Network Services and Return
- [Arguments] ${vim_name}
+ [Arguments] ${vim_name} ${ns_config}=''
+ Run Keyword If ${ns_config}=='' Get NS Config
+ ... ELSE Set NS Config ${ns_config}
+ Log To Console \n${nsconfig}
Should Not Be Empty ${nsd_ids} There are no NS descriptors to launch the NS
:FOR ${nsd} IN @{nsd_ids}
\ ${ns_name}= GENERATE NAME
\ Append To List ${ns_ids} ${ns_name}
- \ Create Network Service ${nsd} ${vim_name} ${ns_name}
+ \ Create Network Service ${nsd} ${vim_name} ${ns_name} ${nsconfig}
+
+
+Set NS Config
+ [Arguments] ${ns_config}
+ ${nsconfig}= Get Variable Value ${ns_config} ''
+ Set Test Variable ${nsconfig}
+
+
+Get NS Config
+ ${nsconfig}= Get Environment Variable NS_CONFIG ''
+ Set Test Variable ${nsconfig}
Create Network Service
[Documentation] Create ns at osm
- [Arguments] ${nsd} ${vim_name} ${ns_name}
+ [Arguments] ${nsd} ${vim_name} ${ns_name} ${ns_config}
- ${ns_config}= Get Environment Variable NS_CONFIG ''
Run Keyword If ${ns_config}!='' Create Network Service With Config ${nsd} ${vim_name} ${ns_name} ${ns_config}
... ELSE Create Network Service Without Config ${nsd} ${vim_name} ${ns_name}