X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_15-rbac_configurations.robot;h=6cc62cc413afe69d9c23356816eb92bec7079fac;hb=f47542be165ebd69b91945041697181b4df63954;hp=56cddc0acab0ac22bae5f8cd83d1d685f99e6f8a;hpb=dce1fa815ef9b08b39cf878f13445898c262764c;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_15-rbac_configurations.robot b/robot-systest/testsuite/basic_15-rbac_configurations.robot
index 56cddc0..6cc62cc 100644
--- a/robot-systest/testsuite/basic_15-rbac_configurations.robot
+++ b/robot-systest/testsuite/basic_15-rbac_configurations.robot
@@ -21,24 +21,31 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/user_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/project_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/role_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_15-rbac_configurations_data.py
+Force Tags   basic_15   cluster_main   daily   regression
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# User, project and roles to use
+${user_name}   basic_15_test_user
+${user_password}   basic_15_user_pass
+${user_role}   project_user
+${user_project}   admin
+${project_name}   basic_15_test_project
+${new_project_name}   basic_15_project_test
+${role_name}   test_role
 ${success_return_code}   0
 
+
 *** Test Cases ***
 Create And Validate User
-    [Tags]   rbac_configurations   sanity   regression
 
     Create User   ${user_name}   ${user_password}
     Check If User Exists   ${user_name}
 
 
 Assign Role To User
-    [Tags]   rbac_configurations   sanity   regression
 
     Update User Role   ${user_name}  ${user_project}  ${user_role}
     Check If User Is Assigned To Project   ${user_name}   ${user_project}
@@ -46,35 +53,31 @@ Assign Role To User
 
 
 Run Action As User
-    [Tags]   rbac_configurations   sanity   regression
 
     ${rc}   ${stdout}=   Run And Return RC And Output   OSM_USER=${user_name} OSM_PROJECT=${user_project} OSM_PASSWORD=${user_password} osm ns-list
     Should Be Equal As Integers   ${rc}   ${success_return_code}
 
 
 Create And Update Project
-    [Tags]   rbac_configurations   sanity   regression
 
     Create Project   ${project_name}
     Update Project Name   ${project_name}   ${new_project_name}
 
 
 Create And Validate Role
-    [Tags]   rbac_configurations   sanity   regression
 
     Create Role   ${role_name}
     Check If Role Exists   ${role_name}
 
 
 Update Role Information
-    [Tags]   rbac_configurations   sanity   regression
 
     Update Role   ${role_name}   add='vims: true'
     Check If Role Exists   ${role_name}
 
 
 Delete Allocated Resources
-    [Tags]   rbac_configurations   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete User   ${user_name}
     Delete Project   ${new_project_name}
@@ -82,8 +85,8 @@ Delete Allocated Resources
 
 
 *** Keywords ***
-Test Cleanup
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete User  ${user_name}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete Role  ${role_name}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete Project  ${project_name}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete Project  ${new_project_name}
+Suite Cleanup
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete User  ${user_name}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete Role  ${role_name}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete Project  ${project_name}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete Project  ${new_project_name}