projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Feature 11001: Robot framework linting for E2E tests"
[osm/tests.git]
/
robot-systest
/
lib
/
vnf_lib.robot
diff --git
a/robot-systest/lib/vnf_lib.robot
b/robot-systest/lib/vnf_lib.robot
index
78f971d
..
b7d6cc3
100644
(file)
--- a/
robot-systest/lib/vnf_lib.robot
+++ b/
robot-systest/lib/vnf_lib.robot
@@
-15,11
+15,18
@@
${success_return_code} 0
*** Keywords ***
*** Keywords ***
+Get Vnf List
+ ${rc} ${stdout}= Run and Return RC and Output osm vnf-list 2>&1
+ Log ${stdout}
+ Should Be Equal As Integers ${rc} ${success_return_code}
+ [Return] ${stdout}
+
+
Get VNF VIM ID
[Arguments] ${vnf_id}
Should Not Be Empty ${vnf_id}
Get VNF VIM ID
[Arguments] ${vnf_id}
Should Not Be Empty ${vnf_id}
- ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal |
grep vim-id | awk '{print $2}
'
+ ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal |
yq -r '.vdur[]."vim-id"
'
Log ${stdout}
Should Be Equal As Integers ${rc} ${success_return_code}
[Return] ${stdout}
Log ${stdout}
Should Be Equal As Integers ${rc} ${success_return_code}
[Return] ${stdout}
@@
-44,7
+51,7
@@
Get VDU VIM Id
[Arguments] ${vnf_id} ${vdur_id}
Should Not Be Empty ${vnf_id}
[Arguments] ${vnf_id} ${vdur_id}
Should Not Be Empty ${vnf_id}
- ${rc} ${vm_vim_id}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq '.vdur[] | select(.id == "'${vdur_id}'")' | yq
'."vim-id"' | tr -d \\"
+ ${rc} ${vm_vim_id}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq '.vdur[] | select(.id == "'${vdur_id}'")' | yq
-r '."vim-id"'
Log ${vm_vim_id}
Should Be Equal As Integers ${rc} ${success_return_code} msg=${vm_vim_id} values=False
[Return] ${vm_vim_id}
Log ${vm_vim_id}
Should Be Equal As Integers ${rc} ${success_return_code} msg=${vm_vim_id} values=False
[Return] ${vm_vim_id}
@@
-56,7
+63,7
@@
Get Vnf Vdur IPs
[Arguments] ${vnf_id}
Should Not Be Empty ${vnf_id}
[Arguments] ${vnf_id}
Should Not Be Empty ${vnf_id}
- ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq
'.vdur[].interfaces[]."ip-address"' | tr -d \\"
+ ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq
-r '.vdur[].interfaces[]."ip-address"'
Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False
@{ip} = Split String ${stdout}
[Return] @{ip}
Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False
@{ip} = Split String ${stdout}
[Return] @{ip}
@@
-69,6
+76,6
@@
Get Vdu Attribute
Should Not Be Empty ${vnf_id}
Should Not Be Empty ${attribute}
Should Not Be Empty ${vnf_id}
Should Not Be Empty ${attribute}
- ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq '.vdur[] | select(."count-index" == ${count_index})' | yq
'."${attribute}"' | tr -d \\"
+ ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq '.vdur[] | select(."count-index" == ${count_index})' | yq
-r '."${attribute}"'
Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False
[Return] ${stdout}
Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False
[Return] ${stdout}