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=HEAD;hp=eb35010d9c24b0aa3f7e982d85e851033b37eccf;hpb=063677c719bd33d8674903ed5b7f11e7368da23a;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 eb35010..3d2ebc6 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
@@ -1,3 +1,4 @@
+*** Comments ***
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
@@ -10,62 +11,65 @@
 #   See the License for the specific language governing permissions and
 #   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.
 
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vim_lib.robot
+Resource   ../lib/vim_lib.resource
+Resource   ../lib/prometheus_lib.resource
+
+Variables   ../resources/basic_01-crud_operations_on_vim_targets_data.py
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_01-crud_operations_on_vim_targets_data.py
+Test Tags   basic_01   cluster_main   daily   regression
 
-Force Tags   basic_01   cluster_main   daily   regression
+Suite Setup   Run Keyword And Ignore Error   Suite Preparation
 
 
 *** 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.
-
-    Pass Execution If   '${vim_account_type}' != 'openstack'   Not applicable for ${vim_account_type} VIM
+    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}
-    ${stdout}=   Check for VIM Target Metric   ${vim_name}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
-
+    ${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}
+    ${stdout}=   Check For VIM Target Metric   ${VIM_NAME}   ${PROMETHEUS_HOST}   ${PROMETHEUS_PORT}   ${PROMETHEUS_USER}   ${PROMETHEUS_PASSWORD}
+    Log   ${stdout}
 
 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]   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}
-
+    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.
-
     ${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}   ${prometheus_user}   ${prometheus_password}
-
+    ${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}   ${PROMETHEUS_USER}   ${PROMETHEUS_PASSWORD}
 
 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]   cleanup
-
-    ${vim_account_id}=   Get VIM Target ID   ${vim_name}
-    Should Be Equal As Strings   ${vim_account_id}   ${created_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}
 
+
+*** Keywords ***
+Suite Preparation
+    [Documentation]   Test Suite Preparation: Setting Prometheus Testsuite Variables
+    Set Testsuite Prometheus Variables