X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_01-crud_operations_on_vim_targets.robot;h=b7e641a04a110fd702dafeabdac717de827b360c;hb=7acf3bacf7f1172b55e4e0a95bf583cf2f3b6757;hp=d848bd8ed4bd4f7277e93003ca12e9edfb395e2e;hpb=f96bb45c0a03f2188688d90d67ea718851cec2de;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_01-crud_operations_on_vim_targets.robot b/robot-systest/testsuite/basic_01-crud_operations_on_vim_targets.robot
index d848bd8..b7e641a 100644
--- a/robot-systest/testsuite/basic_01-crud_operations_on_vim_targets.robot
+++ b/robot-systest/testsuite/basic_01-crud_operations_on_vim_targets.robot
@@ -18,26 +18,30 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vim_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_01-crud_operations_on_vim_targets_data.py
 
+Force Tags   basic_01   cluster_main   daily    regression
+
 
 *** Test Cases ***
 Create VIM Target Basic
     [Documentation]     Create a VIM Target only with the mandatory parameters.
     ...                 Checks the status of the VIM in Prometheus after it creation.
-    [Tags]  vim  sanity   regression
 
-    ${rand}=  Generate Random String  8  [NUMBERS]
+    Pass Execution If   '${vim_account_type}' != 'openstack'   Not applicable for ${vim_account_type} VIM
+    ${rand}=  Generate Random String  6  [NUMBERS]
     ${vim_name}=  Catenate  SEPARATOR=_  ${vim_name_prefix}  ${rand}
     Set Suite Variable  ${vim_name}
     ${created_vim_account_id}=  Create VIM Target  ${vim_name}  ${vim_user}  ${vim_password}  ${vim_auth_url}  ${vim_tenant}  ${vim_account_type}
     Set Suite Variable  ${created_vim_account_id}
-    Check for VIM Target Status  ${vim_name}  ${prometheus_host}  ${prometheus_port}
+    Check VIM Target Operational State  ${vim_name}
+    Check for VIM Target Metric  ${vim_name}  ${prometheus_host}  ${prometheus_port}
 
 
 Delete VIM Target By Name
     [Documentation]     Delete the VIM Target created in previous test-case by its name.
     ...                 Checks whether the VIM Target was created or not before perform the deletion.
-    [Tags]  vim  sanity   regression  cleanup
+    [Tags]   cleanup
 
+    Pass Execution If   '${vim_account_type}' != 'openstack'   Not applicable for ${vim_account_type} VIM
     ${vim_account_id}=  Get VIM Target ID  ${vim_name}
     Should Be Equal As Strings  ${vim_account_id}  ${created_vim_account_id}
     Delete VIM Target  ${vim_name}
@@ -46,20 +50,20 @@ Delete VIM Target By Name
 Create VIM Target With Extra Config
     [Documentation]     Create a VIM Target using the extra parameter 'config'.
     ...                 Checks the status of the VIM in Prometheus after it creation.
-    [Tags]  vim  sanity   regression
 
-    ${rand}=  Generate Random String  8  [NUMBERS]
+    ${rand}=  Generate Random String  6  [NUMBERS]
     ${vim_name}=  Catenate  SEPARATOR=_  ${vim_name_prefix}  ${rand}
     Set Suite Variable  ${vim_name}
     ${created_vim_account_id}=  Create VIM Target  ${vim_name}  ${vim_user}  ${vim_password}  ${vim_auth_url}  ${vim_tenant}  ${vim_account_type}  config=${vim_config}
     Set Suite Variable  ${created_vim_account_id}
+    Check VIM Target Operational State  ${vim_name}
     Check for VIM Target Status  ${vim_name}  ${prometheus_host}  ${prometheus_port}
 
 
 Delete VIM Target By ID
     [Documentation]     Delete the VIM Target created in previous test-case by its ID.
     ...                 Checks whether the VIM Target was created or not before perform the deletion.
-    [Tags]  vim  sanity   regression  cleanup
+    [Tags]   cleanup
 
     ${vim_account_id}=  Get VIM Target ID  ${vim_name}
     Should Be Equal As Strings  ${vim_account_id}  ${created_vim_account_id}