Revert "Revert "Modified testsuites to remove resource files""
This reverts commit c0b3a8e31b493a7d4091562f3757e8fa6d724ba6.
As requested by TSC
Change-Id: Iab49a93c14499ef5ab3cc8d243fc336bc63df977
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/robot-systest/testsuite/hackfest_cloudinit.robot b/robot-systest/testsuite/hackfest_cloudinit.robot
index 0836006..389dea7 100644
--- a/robot-systest/testsuite/hackfest_cloudinit.robot
+++ b/robot-systest/testsuite/hackfest_cloudinit.robot
@@ -25,21 +25,30 @@
Resource %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
-Variables %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_cloudinit_ns_data.py
-
Force Tags hackfest_cloudinit cluster_main daily regression sanity
Suite Teardown Run Keyword And Ignore Error Suite Cleanup
*** Variables ***
-${ns_id} ${EMPTY}
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg} hackfest_cloudinit_vnf
+${vnfd_name} hackfest_cloudinit-vnf
+${nsd_pkg} hackfest_cloudinit_ns
+${nsd_name} hackfest_cloudinit-ns
+
+# NS instance name and configuration
+${ns_name} hfcloudinit
+${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
+# SSH user and password
${username} ubuntu
${password} osm4u
+
+${ns_id} ${EMPTY}
${vnf_member_index} 1
${vnf_ip_addr} ${EMPTY}
-${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-# ${ns_config} ${EMPTY}
+
*** Test Cases ***
Create Hackfest Cloudinit VNF Descriptor
@@ -68,12 +77,12 @@
Test SSH Access
Sleep 30s Waiting ssh daemon to be up
- Test SSH Connection ${vnf_ip_addr} ${username} ${password} ${privatekey}
+ Test SSH Connection ${vnf_ip_addr} ${username} ${password} ${EMPTY}
Check Remote File Injected Via Cloud-init
- ${stdout}= Execute Remote Command Check Rc Return Output ${vnf_ip_addr} ${username} ${password} ${privatekey} sudo cat /root/helloworld.txt
+ ${stdout}= Execute Remote Command Check Rc Return Output ${vnf_ip_addr} ${username} ${password} ${EMPTY} sudo cat /root/helloworld.txt
log ${stdout}