X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_15-rbac_configurations.robot;h=55e011364f80a0498cf6e3ecff8f213656db9b76;hb=4cf45d797499817b5f639bd6245c3f84e762de14;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..55e0113 100644 --- a/robot-systest/testsuite/basic_15-rbac_configurations.robot +++ b/robot-systest/testsuite/basic_15-rbac_configurations.robot @@ -23,7 +23,9 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/role_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_15-rbac_configurations_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Force Tags basic_15 cluster_main daily regression + +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -31,14 +33,12 @@ ${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 +46,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 +78,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}