projects / osm / tests.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update quotas_01 to follow the same format than other tests
[osm/tests.git] / robot-systest / testsuite / quotas_01-quota_enforcement.robot
diff --git a/robot-systest/testsuite/quotas_01-quota_enforcement.robot b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
index 339607d..5cebb0f 100644 (file)
--- a/robot-systest/testsuite/quotas_01-quota_enforcement.robot
+++ b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [QUOTAS-01] Quota enforcement.
+Documentation   [QUOTAS-01] Quota enforcement.
 
 Library   OperatingSystem
 Library   String
@@ -19,19 +19,29 @@ Library   Collections
 
 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
 
 
 *** Variables ***
-${success_return_code}   0
+# VNFD package to use during test
+${vnfd_pkg}   hackfest_basic_vnf
+
+# Project names and quotas to use
+${project_1_name}   quotas_01_proj_1
+${project_2_name}   quotas_01_proj_2
+${project_3_name}   quotas_01_proj_3
 ${project_1_quotas}   vnfds=1,nsds=2,ns_instances=3
 ${project_2_quotas}   vnfds=1,nsds=1,ns_instances=1
 ${project_3_quotas}   vnfds=5,nsds=,ns_instances=
-${vnfd_pkg}   %{PACKAGES_FOLDER}/${vnfd_name}
+
+# User name and password for project
+${user_name}   quotas_01_user
+${user_password}   quotas_01_pass
+
+${success_return_code}   0
+
 
 *** Test Cases ***
 Create First Project With Quotas
@@ -77,8 +87,8 @@ Change First Project Name to Third Project Name
 
 Create VNFDs On Third Project Until Exceed Quota
 
-    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'
+    Create VNFD In Project   ${project_3_name}   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   ${user_name}   ${user_password}   override='id=v1;product-name=v1'
+    Run Keyword And Expect Error   *   Create VNFD In Project   ${project_3_name}   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   ${user_name}   ${user_password}   override='id=v2;product-name=v2'
 
 
 Increase Third Project Quotas
@@ -90,17 +100,17 @@ Increase Third Project Quotas
 
 Create More VNFDs On Third Project Until Exceed Quota
 
-    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'
-    Create VNFD In Project   ${project_3_name}   ${vnfd_pkg}   ${user_name}   ${user_password}  override='id=v4;product-name=v4'
-    Create VNFD In Project   ${project_3_name}   ${vnfd_pkg}   ${user_name}   ${user_password}  override='id=v5;product-name=v5'
-    Run Keyword And Expect Error  *  Create VNFD In Project   ${project_3_name}   ${vnfd_pkg}   ${user_name}   ${user_password}  override='id=v6;product-name=v6'
+    Create VNFD In Project   ${project_3_name}   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   ${user_name}   ${user_password}   override='id=v2;product-name=v2'
+    Create VNFD In Project   ${project_3_name}   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   ${user_name}   ${user_password}   override='id=v3;product-name=v3'
+    Create VNFD In Project   ${project_3_name}   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   ${user_name}   ${user_password}   override='id=v4;product-name=v4'
+    Create VNFD In Project   ${project_3_name}   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   ${user_name}   ${user_password}   override='id=v5;product-name=v5'
+    Run Keyword And Expect Error   *   Create VNFD In Project   ${project_3_name}   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   ${user_name}   ${user_password}   override='id=v6;product-name=v6'
 
 
 Create VNFDs On Second Project Until Exceed Quota
 
-    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'
+    Create VNFD In Project   ${project_2_name}   '%{PACKAGES_FOLDER}/${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}   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   ${user_name}   ${user_password}   override='id=vp2_2;product-name=vp2_2'
 
 
 Check Project Scopes
@@ -116,25 +126,25 @@ Check Project Scopes
 Delete Second Project VNFD
     [Tags]   cleanup
 
-    Delete VNFD In Project  ${project_2_name}   vp2_1   ${user_name}   ${user_password}
+    Delete VNFD In Project   ${project_2_name}   vp2_1   ${user_name}   ${user_password}
 
 
 Delete Third Project VNFDs
     [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}
-    Delete VNFD In Project  ${project_3_name}   v3   ${user_name}   ${user_password}
-    Delete VNFD In Project  ${project_3_name}   v4   ${user_name}   ${user_password}
-    Delete VNFD In Project  ${project_3_name}   v5   ${user_name}   ${user_password}
+    Delete VNFD In Project   ${project_3_name}   v1   ${user_name}   ${user_password}
+    Delete VNFD In Project   ${project_3_name}   v2   ${user_name}   ${user_password}
+    Delete VNFD In Project   ${project_3_name}   v3   ${user_name}   ${user_password}
+    Delete VNFD In Project   ${project_3_name}   v4   ${user_name}   ${user_password}
+    Delete VNFD In Project   ${project_3_name}   v5   ${user_name}   ${user_password}
 
 
 Delete Second Project After Removing User From It
     [Tags]   cleanup
 
-    Run Keyword And Expect Error  *  Delete Project  ${project_2_name}
-    Remove User From Project  ${user_name}  ${project_2_name}
-    Delete Project  ${project_2_name}
+    Run Keyword And Expect Error   *   Delete Project   ${project_2_name}
+    Remove User From Project   ${user_name}   ${project_2_name}
+    Delete Project   ${project_2_name}
 
 
 Delete Projects User
@@ -146,18 +156,18 @@ Delete Projects User
 Delete Third Project
     [Tags]   cleanup
 
-    Delete Project  ${project_3_name}
+    Delete Project   ${project_3_name}
 
 
 *** Keywords ***
 Suite Cleanup
-    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_2_name}   vp2_1   ${user_name}   ${user_password}
-    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v1   ${user_name}   ${user_password}
-    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v2   ${user_name}   ${user_password}
-    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v3   ${user_name}   ${user_password}
-    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v4   ${user_name}   ${user_password}
-    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v5   ${user_name}   ${user_password}
-    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete Project  ${project_1_name}
-    Run Keyword If Any Tests Failed  Delete Project  ${project_2_name}
-    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete Project  ${project_3_name}
+    Run Keyword If Any Tests Failed   Run Keyword And Ignore Error   Delete VNFD In Project   ${project_2_name}   vp2_1   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed   Run Keyword And Ignore Error   Delete VNFD In Project   ${project_3_name}   v1   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed   Run Keyword And Ignore Error   Delete VNFD In Project   ${project_3_name}   v2   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed   Run Keyword And Ignore Error   Delete VNFD In Project   ${project_3_name}   v3   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed   Run Keyword And Ignore Error   Delete VNFD In Project   ${project_3_name}   v4   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed   Run Keyword And Ignore Error   Delete VNFD In Project   ${project_3_name}   v5   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed   Run Keyword And Ignore Error   Delete Project   ${project_1_name}
+    Run Keyword If Any Tests Failed   Delete Project   ${project_2_name}
+    Run Keyword If Any Tests Failed   Run Keyword And Ignore Error   Delete Project   ${project_3_name}
     Run And Return RC   osm user-delete ${user_name}