Revert "Modified testsuites to remove resource files"

[osm/tests.git] / robot-systest / testsuite / basic_06-vnf_with_charm.robot

diff --git a/robot-systest/testsuite/basic_06-vnf_with_charm.robot b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
index 704f04f..e455e08 100644 (file)
--- a/robot-systest/testsuite/basic_06-vnf_with_charm.robot
+++ b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
@@ -21,28 +21,17 @@ 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/basic_06-vnf_with_charm_data.py
+
 Force Tags   basic_06   cluster_ee_config   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/ha_proxy_charm_vnf
-${vnfd_name}   ha_proxy_charm-vnf
-${nsd_pkg}   charm-packages/ha_proxy_charm_ns
-${nsd_name}   ha_proxy_charm-ns
-
-# NS instance name and configuration
-${ns_name}   basic_06_charm_test
-${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}
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${action_name}   touch
 ${vnf_member_index_1}   1
 ${vnf_member_index_2}   2