Modified testsuites to remove resource files

[osm/tests.git] / robot-systest / testsuite / k8s_05-k8s_proxy_charms.robot

diff --git a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
index a32ad66..5ea838a 100644 (file)
--- a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
+++ b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
@@ -21,24 +21,35 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_05-k8s_proxy_charms.py
-
 Force Tags   k8s_05   cluster_ee_config   cluster_k8s_charms   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   charm-packages/k8s_proxy_charm_vnf
+${vnfd_name}   k8s_proxy_charm-vnf
+${nsd_pkg}   charm-packages/k8s_proxy_charm_ns
+${nsd_name}   k8s_proxy_charm-ns
+
+# NS instance name and configuration
+${ns_name}   k8s_05-k8s_proxy_charm
+${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 ***