X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_01-crud_operations_on_vim_targets.robot;h=9445a979d3c3873c2e27f978bc2b5d2630ee2e84;hb=fccb028b493afafb8a602953ed5125303423d3ff;hp=a47d61b199f2c709e6adfa2b50e10150baf95fb4;hpb=4cf45d797499817b5f639bd6245c3f84e762de14;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 a47d61b..9445a97 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
@@ -11,57 +11,61 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [BASIC-01] CRUD operations on VIM targets.
-...               All tests will be performed over an Openstack VIM, and the credentials will be loaded from clouds.yaml file.
+Documentation   [BASIC-01] CRUD operations on VIM targets.
+...             All tests will be performed over an Openstack VIM, and the credentials will be loaded from clouds.yaml file.
 
 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
+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.
+    [Documentation]   Create a VIM Target only with the mandatory parameters.
+    ...               Checks the status of the VIM in Prometheus after it creation.
 
-    ${rand}=  Generate Random String  8  [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 Metric  ${vim_name}  ${prometheus_host}  ${prometheus_port}
+    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 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.
+    [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]   cleanup
 
-    ${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}
+    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}
 
 
 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.
+    [Documentation]   Create a VIM Target using the extra parameter 'config'.
+    ...               Checks the status of the VIM in Prometheus after it creation.
 
-    ${rand}=  Generate Random String  8  [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 for VIM Target Status  ${vim_name}  ${prometheus_host}  ${prometheus_port}
+    ${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.
+    [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]   cleanup
 
-    ${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_account_id}
+    ${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_account_id}