Modified testsuites to remove resource files
Moved variables from resource file to .robot file (where possible) and removed first one.
Change-Id: I4d71b33d738e1c4ae3835581f462d6a6975d66a8
Signed-off-by: aguilarherna <daguilarh@indra.es>
diff --git a/robot-systest/testsuite/basic_11-native_charms.robot b/robot-systest/testsuite/basic_11-native_charms.robot
index 89f5e63..be3af67 100644
--- a/robot-systest/testsuite/basic_11-native_charms.robot
+++ b/robot-systest/testsuite/basic_11-native_charms.robot
@@ -21,24 +21,35 @@
Resource %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
-Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_11-native_charms.py
-
Force Tags basic_11 cluster_ee_config cluster_relations daily regression sanity
Suite Teardown Run Keyword And Ignore Error Suite Cleanup
*** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg} charm-packages/native_charm_vnf
+${vnfd_name} native_charm-vnf
+${nsd_pkg} charm-packages/native_charm_ns
+${nsd_name} native_charm-ns
+
+# NS instance name and configuration
+${ns_name} basic_11_native_charms
+${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${ns_timeout} 15min
+
+# SSH keys and username to be used
+${publickey} %{HOME}/.ssh/id_rsa.pub
+${privatekey} %{HOME}/.ssh/id_rsa
${username} ubuntu
${password} ${EMPTY}
-${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
${action_name} touch
${vnf_member_index_1} 1
${vnf_member_index_2} 2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
-${ns_timeout} 15min
*** Test Cases ***