ns_lib: update scaling timeout with the env modifier OSM_VIM_MULTIPLIER_TIMEOUT

[osm/tests.git] / robot-systest / testsuite / basic_05-instantiation_parameters_in_cloud_init.robot

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 22cee7c..b0d66d8 100644 (file)
--- a/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
+++ b/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
@@ -23,7 +23,9 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_05-instantiation_parameters_in_cloud_init_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Force Tags   basic_05   cluster_main   daily   regression
+
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -35,27 +37,23 @@ ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ], add
 
 *** 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 +62,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,30 +69,30 @@ 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}
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
 
-    Run Keyword If Test Failed  Delete NS  ${ns_name}
+    Run Keyword If Any Tests Failed  Delete NS  ${ns_name}
 
-    Run Keyword If Test Failed  Delete NSD  ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
 
-    Run Keyword If Test Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}