X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_05-instantiation_parameters_in_cloud_init.robot;h=3175a8604e8f40bd0c80848df5b6209b6846ecec;hb=f25782945b1e3db0a2442c572a5f8607bb42460e;hp=62a4ca83f1176c44cb66de404e148d11d5e0107d;hpb=d225e550e79fdbb9f667975102b17232eca893c1;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot b/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
index 62a4ca8..3175a86 100644
--- a/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
+++ b/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
@@ -21,41 +21,47 @@ 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_05-instantiation_parameters_in_cloud_init_data.py
+Force Tags   basic_05   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   ubuntu_cloudinit_vnf
+${vnfd_name}   ubuntu_cloudinit-vnf
+${nsd_pkg}   ubuntu_cloudinit_ns
+${nsd_name}   ubuntu_cloudinit-ns
+
+# NS instance name and configuration
+${ns_name}   basic_05_instantiation_params_cloud_init
+${vnf_member_index}   vnf
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ], additionalParamsForVnf: [ { member-vnf-index: "${vnf_member_index}", additionalParams: { password: "${new_password}" } } ] }
+
+# SSH user and password
 ${username}   ubuntu
 ${new_password}   newpassword
-${vnf_member_index}   1
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ], additionalParamsForVnf: [ { member-vnf-index: "${vnf_member_index}", additionalParams: { password: "${new_password}" } } ] }
 
 
 *** Test Cases ***
 Create Cloudinit VNF Descriptor
-    [Tags]   instantiation_params   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create Cloudinit NS Descriptor
-    [Tags]   instantiation_params   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Cloudinit Network Service Using Instantiation Parameters
     [Documentation]     Instantiates the NS using the instantiation parameter 'additionalParamsForVnf' to change the password of the default user.
-    [Tags]   instantiation_params   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${EMPTY}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get Management Ip Addresses
-    [Tags]   instantiation_params   sanity   regression
 
     ${ip_addr}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index}
     log  ${ip_addr}
@@ -64,7 +70,6 @@ Get Management Ip Addresses
 
 Test SSH Access With The New Password
     [Documentation]     Test SSH access with the new password configured via cloud-init.
-    [Tags]   instantiation_params   sanity   regression
 
     Variable Should Exist  ${vnf_ip_addr}  msg=IP address of the management VNF is not available
     Sleep  30s  Waiting ssh daemon to be up
@@ -72,19 +77,19 @@ Test SSH Access With The New Password
 
 
 Delete NS Instance
-    [Tags]   instantiation_params   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   instantiation_params   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   instantiation_params   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name}