X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fvnf_lib.robot;h=78f971d6ac2eadd2fca82fc6fb9df48f8f68db7f;hb=ebf4c40bba9c901188c22d3a3867a215d2fda386;hp=d58c3ddc9b0ff9ab95a44a5b576a0aec938d2ac4;hpb=845c2ea1f8d825af847dbb94ac14e77eb8b3c169;p=osm%2Ftests.git diff --git a/robot-systest/lib/vnf_lib.robot b/robot-systest/lib/vnf_lib.robot index d58c3dd..78f971d 100644 --- a/robot-systest/lib/vnf_lib.robot +++ b/robot-systest/lib/vnf_lib.robot @@ -20,9 +20,9 @@ Get VNF VIM 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}' - log ${stdout} + Log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} - [Return] ${stdout} + [Return] ${stdout} Get VDU list from VNF @@ -32,7 +32,7 @@ Get VDU list from VNF Should Not Be Empty ${vnf_id} ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq '.vdur[].id' - log ${stdout} + Log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False @{vdur_ids}= Split String ${stdout} [Return] @{vdur_ids} @@ -45,30 +45,30 @@ Get VDU VIM 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 \\" - log ${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} 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}