X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_31-multivdu_volume_multiattach.robot;h=c610447bebf38affc7b4f674f44ff90dddcaee5f;hb=refs%2Fchanges%2F16%2F14116%2F1;hp=f8fe60f32f79a21096dc069f0c4b4eed97bdc196;hpb=b91fc76ef46323c88e27610c06316af168549834;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_31-multivdu_volume_multiattach.robot b/robot-systest/testsuite/basic_31-multivdu_volume_multiattach.robot
index f8fe60f..c610447 100644
--- a/robot-systest/testsuite/basic_31-multivdu_volume_multiattach.robot
+++ b/robot-systest/testsuite/basic_31-multivdu_volume_multiattach.robot
@@ -42,10 +42,14 @@ ${ns_name}   multivdu_multiattach
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 # SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
-${username}   ubuntu
-${password}   ${EMPTY}
+${vdu0_username}   ubuntu
+${vdu0_password}   ${EMPTY}
+${vdu0_publickey}   %{HOME}/.ssh/id_rsa.pub
+${vdu0_privatekey}   %{HOME}/.ssh/id_rsa
+${vdu1_username}   ubuntu
+${vdu1_password}   osmpass
+${vdu1_publickey}   ${EMPTY}
+${vdu1_privatekey}   ${EMPTY}
 
 ${ns_id}   ${EMPTY}
 ${vnf_member_index}   vnf
@@ -54,21 +58,21 @@ ${wait_guard_for_vm_boot}   50s
 
 
 *** Test Cases ***
-Create Hackfest multivdu VNF Descriptor
+Create Multiattach VNF Descriptor
 
     Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
-Create Hackfest Multivdu NS Descriptor
+Create Multiattach NS Descriptor
 
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Network Service Instance Test
 
-    ${status}   ${message}=   Run Keyword And Ignore Error   Variable Should Exist   ${publickey}
-        Run Keyword If   "${status}" == "FAIL"   Set Global Variable   ${publickey}   ${EMPTY}
-    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
+    ${status}   ${message}=   Run Keyword And Ignore Error   Variable Should Exist   ${vdu0_publickey}
+        Run Keyword If   "${status}" == "FAIL"   Set Global Variable   ${vdu0_publickey}   ${EMPTY}
+    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${vdu0_publickey}
     Set Suite Variable   ${ns_id}   ${id}
     Sleep   ${wait_guard_for_vm_boot}   Waiting for VM's daemons to be up and running
 
@@ -81,17 +85,19 @@ Get Vnf ID
 
 Get Vnf Management Ip Addresses
 
-    ${rc}   ${vdu0_ip}=   Run and Return RC and Output   osm vnf-show ${vnf_id} --literal | yq '.vdur[0].interfaces[]."ip-address"' | tr -d \\"
-    ${rc}   ${vdu1_ip}=   Run and Return RC and Output   osm vnf-show ${vnf_id} --literal | yq '.vdur[1].interfaces[]."ip-address"' | tr -d \\"
+    ${rc}   ${vdu0_ip}=   Run and Return RC and Output   osm vnf-show ${vnf_id} --literal | yq -r '.vdur[0].interfaces[]."ip-address"'
+    ${rc}   ${vdu1_ip}=   Run and Return RC and Output   osm vnf-show ${vnf_id} --literal | yq -r '.vdur[1].interfaces[]."ip-address"'
     Set Suite Variable   ${mgmnt_ip_addr_0}   ${vdu0_ip}
     Set Suite Variable   ${mgmnt_ip_addr_1}   ${vdu1_ip}
 
 
 Ensure that VDUs can share data
 
-    Execute Remote Command Check Rc Return Output   ${mgmnt_ip_addr_0}   ${username}   ${EMPTY}   ${privatekey}   sudo mkfs.ext3 -F /dev/vdb && sudo mkdir /shared && sudo mount /dev/vdb /shared && sudo chown ubuntu /shared && echo "osmtest" > /shared/test_file
-    Execute Remote Command Check Rc Return Output   ${mgmnt_ip_addr_1}   ${username}   osmpass   ${privatekey}   sudo mkdir /shared && sudo mount /dev/vdb /shared && cat /shared/test_file
-    ${stdout}=   Execute Remote Command Check Rc Return Output   ${mgmnt_ip_addr_0}   ${username}   ${EMPTY}   ${privatekey}   cat /shared/test_file
+    Execute Remote Command Check Rc Return Output   ${mgmnt_ip_addr_0}   ${vdu0_username}   ${vdu0_password}   ${vdu0_privatekey}   sudo mkfs.ext3 -F /dev/vdb && sudo mkdir /shared && sudo mount /dev/vdb /shared && sudo chown ubuntu:ubuntu /shared && echo "osmtest" > /shared/test_file
+    Sleep   10s
+    Execute Remote Command Check Rc Return Output   ${mgmnt_ip_addr_1}   ${vdu1_username}   ${vdu1_password}   ${vdu1_privatekey}   sudo mkdir /shared && sudo mount /dev/vdb /shared && ls /shared
+    Execute Remote Command Check Rc Return Output   ${mgmnt_ip_addr_1}   ${vdu1_username}   ${vdu1_password}   ${vdu1_privatekey}   cat /shared/test_file
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${mgmnt_ip_addr_0}   ${vdu0_username}   ${vdu0_password}   ${vdu0_privatekey}   cat /shared/test_file
     Log   ${stdout}
     Should Be Equal   ${stdout}   osmtest   Shared data can't be read