X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fvnf_lib.robot;h=9fa2f95cfced4e03f1e798ad9310494c4a76eee0;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hp=d58c3ddc9b0ff9ab95a44a5b576a0aec938d2ac4;hpb=d90c14aa761a796cf74563812fb5a01f3b145ee9;p=osm%2Ftests.git diff --git a/robot-systest/lib/vnf_lib.robot b/robot-systest/lib/vnf_lib.robot index d58c3dd..9fa2f95 100644 --- a/robot-systest/lib/vnf_lib.robot +++ b/robot-systest/lib/vnf_lib.robot @@ -22,7 +22,7 @@ Get VNF VIM ID ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | grep vim-id | awk '{print $2}' log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} - [Return] ${stdout} + [Return] ${stdout} Get VDU list from VNF @@ -51,24 +51,24 @@ Get VDU VIM Id Get Vnf Vdur IPs - [Documentation] Return a list with the IP addresses of the VDU records of a VNF instance. + [Documentation] Return a list with the IP addresses of the VDU records of a VNF instance. - [Arguments] ${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 \\" - Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False - @{ip} = Split String ${stdout} - [Return] @{ip} + ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq '.vdur[].interfaces[]."ip-address"' | tr -d \\" + Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False + @{ip} = Split String ${stdout} + [Return] @{ip} Get Vdu Attribute - [Documentation] Return an attribute from VDU records selected by count_index of a VNF instance. + [Documentation] Return an attribute from VDU records selected by count_index of a VNF instance. - [Arguments] ${vnf_id} ${attribute} ${count_index}=0 + [Arguments] ${vnf_id} ${attribute} ${count_index}=0 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 \\" - Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False - [Return] ${stdout} + ${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 \\" + Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False + [Return] ${stdout}