X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_13-ns_relations.robot;h=eb8b352aabc3c623e86ba581bffd9b51ace4bf41;hb=f25782945b1e3db0a2442c572a5f8607bb42460e;hp=50f0851096265507ef07dc8bdda7a13843e6740f;hpb=c0b3a8e31b493a7d4091562f3757e8fa6d724ba6;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_13-ns_relations.robot b/robot-systest/testsuite/basic_13-ns_relations.robot
index 50f0851..eb8b352 100644
--- a/robot-systest/testsuite/basic_13-ns_relations.robot
+++ b/robot-systest/testsuite/basic_13-ns_relations.robot
@@ -21,24 +21,37 @@ 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_13-ns_relations.py
-
 Force Tags   basic_13    cluster_ee_config   cluster_relations   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg1}   charm-packages/ns_relations_provides_vnf
+${vnfd_pkg2}   charm-packages/ns_relations_requires_vnf
+${vnfd_name1}   ns_relations_provides-vnf
+${vnfd_name2}   ns_relations_requires-vnf
+${nsd_pkg}   charm-packages/ns_relations_ns
+${nsd_name}   ns_relations-ns
+
+# NS instance name and configuration
+${ns_name}   basic_13_ns_relations_test
+${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
+${vnf_member_index_1}   vnf1
+${vnf_member_index_2}   vnf2
 ${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 ***