X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_21-support_of_volumes.robot;fp=robot-systest%2Ftestsuite%2Fbasic_21-support_of_volumes.robot;h=3e86b51e3f5743229e51d181cebcaaaaacc9b5d9;hp=a4de2aed38d6915885d92239cf894c0576336e5e;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hpb=d90c14aa761a796cf74563812fb5a01f3b145ee9 diff --git a/robot-systest/testsuite/basic_21-support_of_volumes.robot b/robot-systest/testsuite/basic_21-support_of_volumes.robot index a4de2ae..3e86b51 100644 --- a/robot-systest/testsuite/basic_21-support_of_volumes.robot +++ b/robot-systest/testsuite/basic_21-support_of_volumes.robot @@ -11,7 +11,7 @@ # limitations under the License. *** Settings *** -Documentation [BASIC-21] NS with only one VDU and several volumes +Documentation [BASIC-21] NS with only one VDU and several volumes Library OperatingSystem Library String @@ -55,17 +55,17 @@ ${success_return_code} 0 *** Test Cases *** Create VNF Descriptor - [Tags] prepare + [Tags] prepare Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg}' Create NS Descriptor - [Tags] prepare + [Tags] prepare Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' Network Service Instance Test - [Tags] prepare + [Tags] prepare ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} Set Suite Variable ${ns_id} ${id} @@ -78,41 +78,41 @@ Get NS Id END Get Volumes From VNFD - [Tags] verify - ${rc} ${stdout}= Run and Return RC and Output osm vnfpkg-show ${vnfd_name} --literal | yq '.vdu[0]."virtual-storage-desc" | length' - Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False + [Tags] verify + ${rc} ${stdout}= Run and Return RC and Output osm vnfpkg-show ${vnfd_name} --literal | yq '.vdu[0]."virtual-storage-desc" | length' + Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False ${num_virtual_storage}= Convert To Integer ${stdout} Set Suite Variable ${vnf_num_volumes} ${num_virtual_storage} log ${vnf_num_volumes} Get VNF IP Address - [Tags] verify - Variable Should Exist ${ns_id} msg=NS is not available - ${ip_addr}= Get Vnf Management Ip Address ${ns_id} ${vnf_member_index} + [Tags] verify + Variable Should Exist ${ns_id} msg=NS is not available + ${ip_addr}= Get Vnf Management Ip Address ${ns_id} ${vnf_member_index} log ${ip_addr} Set Suite Variable ${vnf_ip_addr} ${ip_addr} #Get Persistent Volume Id -# [Tags] cleanup -# Variable Should Exist ${ns_id} msg=NS is not available -# ${vnfs_list}= Get Ns Vnf List ${ns_id} -# ${vim_id}= Get VNF VIM ID ${vnfs_list}[0] -# ${volumes_attached}= Get Server Property ${vim_id} volumes_attached -# ${match}= Get Regexp Matches ${volumes_attached} '([0-9a-f\-]+)' 1 +# [Tags] cleanup +# Variable Should Exist ${ns_id} msg=NS is not available +# ${vnfs_list}= Get Ns Vnf List ${ns_id} +# ${vim_id}= Get VNF VIM ID ${vnfs_list}[0] +# ${volumes_attached}= Get Server Property ${vim_id} volumes_attached +# ${match}= Get Regexp Matches ${volumes_attached} '([0-9a-f\-]+)' 1 # Set Suite Variable ${volume_id} ${match}[0] Check VDU disks - [Tags] verify - Variable Should Exist ${vnf_ip_addr} msg=VNF is not available + [Tags] verify + Variable Should Exist ${vnf_ip_addr} msg=VNF is not available Sleep 30 seconds Wait for SSH daemon to be up ${stdout}= Execute Remote Command Check Rc Return Output ${vnf_ip_addr} ${username} ${password} ${privatekey} sudo lsblk -l - log ${stdout} + log ${stdout} ${lines}= Get Lines Containing String ${stdout} disk ${num_lines}= Get Line Count ${lines} - Run Keyword If ${num_lines} < ${vnf_num_volumes} Fail msg=Number of disks (${num_lines}) is less than specified in VDU (${vnf_num_volumes}) + Run Keyword If ${num_lines} < ${vnf_num_volumes} Fail msg=Number of disks (${num_lines}) is less than specified in VDU (${vnf_num_volumes}) Delete NS Instance Test @@ -122,7 +122,7 @@ Delete NS Instance Test #Check Persistent Volume Was Deleted # [Tags] cleanup -# Variable Should Exist ${volume_id} msg=Volume is not available +# Variable Should Exist ${volume_id} msg=Volume is not available # ${exists}= Check If Volume Exists ${volume_id} # log ${exists} # IF ${exists}==0 @@ -147,12 +147,12 @@ Delete VNF Descriptor Test *** Keywords *** Suite Cleanup - [Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim + [Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim - Run Keyword If Any Tests Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Any Tests Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} -# Run Keyword If Any Tests Failed Check Volume Was Deleted +# Run Keyword If Any Tests Failed Check Volume Was Deleted