projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 2220 to solve sol003_01 test
[osm/tests.git]
/
robot-systest
/
lib
/
nsd_lib.robot
diff --git
a/robot-systest/lib/nsd_lib.robot
b/robot-systest/lib/nsd_lib.robot
index
c7ebbe7
..
40132d7
100644
(file)
--- a/
robot-systest/lib/nsd_lib.robot
+++ b/
robot-systest/lib/nsd_lib.robot
@@
-34,34
+34,34
@@
${delete_pol_time} 15sec
*** Keywords ***
Get NSDs List
*** Keywords ***
Get NSDs List
- ${rc} ${stdout}= Run and Return RC and Output osm ns
d
-list
-
l
og ${stdout}
+ ${rc} ${stdout}= Run and Return RC and Output osm ns
pkg
-list
+
L
og ${stdout}
Should Be Equal As Integers ${rc} ${success_return_code}
Create NSD
[Arguments] ${nsd_pkg}
Should Be Equal As Integers ${rc} ${success_return_code}
Create NSD
[Arguments] ${nsd_pkg}
- ${rc} ${stdout}= Run and Return RC and Output osm ns
d
-create ${nsd_pkg}
-
l
og ${stdout}
+ ${rc} ${stdout}= Run and Return RC and Output osm ns
pkg
-create ${nsd_pkg}
+
L
og ${stdout}
Should Be Equal As Integers ${rc} ${success_return_code}
Should Be Equal As Integers ${rc} ${success_return_code}
- ${lines}=
Get Line Count
${stdout}
- ${last}=
Evaluate
${lines} - 1
- ${id}=
Get Line ${stdout}
${last}
- [Return] ${id}
+ ${lines}=
Get Line Count
${stdout}
+ ${last}=
Evaluate
${lines} - 1
+ ${id}=
Get Line ${stdout}
${last}
+ [Return]
${id}
Delete NSD
[Arguments] ${nsd_id}
Delete NSD
[Arguments] ${nsd_id}
- ${rc} ${stdout}= Run Keyword And Continue On Failure Run and Return RC and Output osm ns
d
-delete ${nsd_id}
+ ${rc} ${stdout}= Run Keyword And Continue On Failure Run and Return RC and Output osm ns
pkg
-delete ${nsd_id}
Should Be Equal As Integers ${rc} ${success_return_code}
Should Be Equal As Integers ${rc} ${success_return_code}
-
l
og ${stdout}
+
L
og ${stdout}
WAIT UNTIL KEYWORD SUCCEEDS ${delete_max_wait_time} ${delete_pol_time} Check For NSD ${nsd_id}
Check For NSD
[Arguments] ${nsd_id}
WAIT UNTIL KEYWORD SUCCEEDS ${delete_max_wait_time} ${delete_pol_time} Check For NSD ${nsd_id}
Check For NSD
[Arguments] ${nsd_id}
- ${rc} ${stdout}= Run and Return RC and Output osm ns
d
-list | awk '{print $2}' | grep ${nsd_id}
+ ${rc} ${stdout}= Run and Return RC and Output osm ns
pkg
-list | awk '{print $2}' | grep ${nsd_id}
Should Not Be Equal As Strings ${stdout} ${nsd_id}
Should Not Be Equal As Strings ${stdout} ${nsd_id}