X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fquotas_01-quota_enforcement.robot;fp=robot-systest%2Ftestsuite%2Fquotas_01-quota_enforcement.robot;h=339607dd8342afd6a282ca821cd5a6c8628aa861;hp=db91be032ea0abf0d39e37f2895fdc984771dcb3;hb=4cf45d797499817b5f639bd6245c3f84e762de14;hpb=499c86752f877c0007a0e4dde69c213d828047d0

diff --git a/robot-systest/testsuite/quotas_01-quota_enforcement.robot b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
index db91be0..339607d 100644
--- a/robot-systest/testsuite/quotas_01-quota_enforcement.robot
+++ b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
@@ -21,6 +21,8 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/project_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/quotas_01-quota_enforcement_data.py
 
+Force Tags   quotas_01   cluster_main   daily   regression
+
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
@@ -33,7 +35,6 @@ ${vnfd_pkg}   %{PACKAGES_FOLDER}/${vnfd_name}
 
 *** Test Cases ***
 Create First Project With Quotas
-    [Tags]   quota_enforcement   sanity   regression
 
     Create Project With Quotas   ${project_1_name}   ${project_1_quotas}
     ${project_1_vnfds}=   Get Project Quotas   ${project_1_name}   vnfds
@@ -45,7 +46,6 @@ Create First Project With Quotas
 
 
 Create Second Project With Quotas
-    [Tags]   quota_enforcement   sanity   regression
 
     Create Project With Quotas   ${project_2_name}   ${project_2_quotas}
     ${project_2_vnfds}=   Get Project Quotas   ${project_2_name}   vnfds
@@ -56,7 +56,6 @@ Create Second Project With Quotas
     Should Be Equal As Integers   1   ${project_2_ns_instances}
 
 Create User In Projects
-    [Tags]   quota_enforcement   sanity   regression
 
     ${rc}   ${stdout}=   Run And Return RC And Output   osm user-create ${user_name} --password ${user_password} --project-role-mappings ${project_1_name},project_admin --project-role-mappings ${project_2_name},project_admin
     Should Be Equal As Integers   ${rc}   ${success_return_code}
@@ -65,7 +64,6 @@ Create User In Projects
 
 
 Change First Project Name to Third Project Name
-    [Tags]   quota_enforcement   sanity   regression
 
     Update Project Name   ${project_1_name}   ${project_3_name}
     ${project_3_vnfds}=   Get Project Quotas   ${project_3_name}   vnfds
@@ -78,14 +76,12 @@ Change First Project Name to Third Project Name
 
 
 Create VNFDs On Third Project Until Exceed Quota
-    [Tags]   quota_enforcement   sanity   regression
 
     Create VNFD In Project   ${project_3_name}   ${vnfd_pkg}   ${user_name}   ${user_password}  override='id=v1;product-name=v1'
     Run Keyword And Expect Error  *  Create VNFD In Project   ${project_3_name}   ${vnfd_pkg}   ${user_name}   ${user_password}  override='id=v2;product-name=v2'
 
 
 Increase Third Project Quotas
-    [Tags]   quota_enforcement   sanity   regression
 
     Update Project Quotas   ${project_3_name}   ${project_3_quotas}
     ${project_3_vnfds}=   Get Project Quotas   ${project_3_name}   vnfds
@@ -93,7 +89,6 @@ Increase Third Project Quotas
 
 
 Create More VNFDs On Third Project Until Exceed Quota
-    [Tags]   quota_enforcement   sanity   regression
 
     Create VNFD In Project   ${project_3_name}   ${vnfd_pkg}   ${user_name}   ${user_password}  override='id=v2;product-name=v2'
     Create VNFD In Project   ${project_3_name}   ${vnfd_pkg}   ${user_name}   ${user_password}  override='id=v3;product-name=v3'
@@ -103,14 +98,12 @@ Create More VNFDs On Third Project Until Exceed Quota
 
 
 Create VNFDs On Second Project Until Exceed Quota
-    [Tags]   quota_enforcement   sanity   regression
 
     Create VNFD In Project   ${project_2_name}   ${vnfd_pkg}   ${user_name}   ${user_password}  override='id=vp2_1;product-name=vp2_1'
     Run Keyword And Expect Error  *  Create VNFD In Project   ${project_2_name}   ${vnfd_pkg}   ${user_name}   ${user_password}  override='id=vp2_2;product-name=vp2_2'
 
 
 Check Project Scopes
-    [Tags]   quota_enforcement   sanity   regression
 
     ${rc}   ${stdout}=   Run And Return RC And Output   osm --project ${project_3_name} --password ${user_password} --user ${user_name} vnfpkg-show vp2_1
     Log   ${stdout}
@@ -121,13 +114,13 @@ Check Project Scopes
 
 
 Delete Second Project VNFD
-    [Tags]   quota_enforcement   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD In Project  ${project_2_name}   vp2_1   ${user_name}   ${user_password}
 
 
 Delete Third Project VNFDs
-    [Tags]   quota_enforcement   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD In Project  ${project_3_name}   v1   ${user_name}   ${user_password}
     Delete VNFD In Project  ${project_3_name}   v2   ${user_name}   ${user_password}
@@ -137,7 +130,7 @@ Delete Third Project VNFDs
 
 
 Delete Second Project After Removing User From It
-    [Tags]   quota_enforcement   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Run Keyword And Expect Error  *  Delete Project  ${project_2_name}
     Remove User From Project  ${user_name}  ${project_2_name}
@@ -145,13 +138,13 @@ Delete Second Project After Removing User From It
 
 
 Delete Projects User
-    [Tags]   quota_enforcement   sanity   regression  cleanup
+    [Tags]   cleanup
 
     ${rc}=   Run And Return RC   osm user-delete ${user_name}
 
 
 Delete Third Project
-    [Tags]   quota_enforcement   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete Project  ${project_3_name}