X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_22-cross_model_relations.robot;h=e63c4629d99fc63daa4d299668d07c004376e24d;hb=refs%2Fchanges%2F72%2F12172%2F1;hp=83b523b7c51212516c1251a044bbb0f29f4bc606;hpb=2467b9bf99fdeb9d0e848d966c7e5d232a3f8c79;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_22-cross_model_relations.robot b/robot-systest/testsuite/basic_22-cross_model_relations.robot
index 83b523b..e63c462 100644
--- a/robot-systest/testsuite/basic_22-cross_model_relations.robot
+++ b/robot-systest/testsuite/basic_22-cross_model_relations.robot
@@ -20,9 +20,7 @@ Resource    %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
 Resource    %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource    %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource    %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
-
-Variables    %{ROBOT_DEVOPS_FOLDER}/resources/basic_22-cross_model_relations.py
+Resource    %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
 Force Tags    basic_22    cluster_ee_config    cluster_relations    daily    regression
 
@@ -33,12 +31,26 @@ Suite Teardown    Run Keyword And Ignore Error    Suite Cleanup
 # K8s cluster name and version
 ${k8scluster_name}   k8sbasic_22
 ${k8scluster_version}   v1
-${username}       ubuntu
-${password}       ${EMPTY}
-${ns_config}      {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${action_name}    touch
+
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg_1}    charm-packages/cmr_relation_vnf
+${vnfd_pkg_2}    charm-packages/cmr_no_relation_vnf
+${nsd_pkg}       charm-packages/cmr_relation_ns
+${vnfd_name_1}   cross_model_relation-vnf
+${vnfd_name_2}   cross_model_no_relation-vnf
+${nsd_name}      cross_model_relation-ns
+
+# NS instance name and configuration
+${ns_name}       basic_22
+${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}
+
 
 *** Test Cases ***
 Create Charm VNF Descriptor 1