Revert "Modified testsuites to remove resource files"

[osm/tests.git] / robot-systest / testsuite / basic_12-ns_primitives.robot

diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot
index d1a0ebd..6b94d3a 100644 (file)
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -24,28 +24,15 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/packages_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_12-ns_primitives_data.py
+
 Force Tags   basic_12   cluster_ee_config   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg1}   nscharm_policy_vnf
-${vnfd_pkg2}   nscharm_user_vnf
-${vnfd_name1}   nscharm-policy-vnf
-${vnfd_name2}   nscharm-user-vnf
-${nsd_pkg}   nscharm_ns
-${new_nsd_pkg}   new_nscharm_ns
-${nsd_name}   nscharm-ns
-${nsd_file}   nscharm_nsd.yaml
-
-# NS instance name and configuration
-${ns_name}   test_nscharm
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${ns_timeout}   40min
-
-${old_juju_password}   a5611fc6452349cc6e45705d34c501d4
 ${publickey}   ${EMPTY}
 ${success_return_code}   0
 
@@ -71,7 +58,7 @@ Upload Nsd
 
 Instantiate NS
 
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}  ns_launch_max_wait_time=${ns_timeout}
+    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}  ns_launch_max_wait_time=40min
     Set Suite Variable  ${ns_id}  ${id}
 
 # TODO: Check Initial Config Primitives Status