Modified testsuites to remove resource files

[osm/tests.git] / robot-systest / testsuite / slice_01-network_slicing.robot

diff --git a/robot-systest/testsuite/slice_01-network_slicing.robot b/robot-systest/testsuite/slice_01-network_slicing.robot
index 5831e36..d9c8d59 100644 (file)
--- a/robot-systest/testsuite/slice_01-network_slicing.robot
+++ b/robot-systest/testsuite/slice_01-network_slicing.robot
@@ -30,25 +30,44 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/slice_01-network_slicing_data.py
-
 Force Tags   slice_01   cluster_slices   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-
-${ns_id}   ${EMPTY}
+# NS and VNF descriptor package files
+${vnfd1_pkg}   slice_basic_vnf
+${vnfd2_pkg}   slice_basic_middle_vnf
+${nsd1_pkg}   slice_basic_ns
+${nsd2_pkg}   slice_basic_middle_ns
+${nst}   slice_basic_nst/slice_basic_nst.yaml
+
+# Descriptor names
+${nst_name}   slice_basic_nst
+${vnfd1_name}   slice_basic_vnf
+${vnfd2_name}   slice_basic_middle_vnf
+${nsd1_name}   slice_basic_ns
+${nsd2_name}   slice_basic_middle_ns
+
+# Instance names
+${slice_name}   slicebasic
+${middle_ns_name}   slicebasic.slice_basic_nsd_2
+
+# SSH keys and username to be used
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   ${EMPTY}
+
+${ns_id}   ${EMPTY}
 ${vnf_member_index}   middle
 ${vnf_ip_addr}   ${EMPTY}
 ${mgmt_vnf_ip}   ${EMPTY}
 ${nst_config}   {netslice-vld: [ {name: slice_vld_mgmt, vim-network-name: %{VIM_MGMT_NET}} ] }
 
-*** Test Cases ***
 
+*** Test Cases ***
 Create Slice VNF Descriptors
     [Documentation]   Onboards all the VNFDs required for the test: vnfd1_pkg and vnfd2_pkg (in the variables file)