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=229a60cec212c1bd0b0311db6ff0380b39120959;hp=c0a5043cebdace87d300a4533c07ed99211b29eb;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hpb=d90c14aa761a796cf74563812fb5a01f3b145ee9

diff --git a/robot-systest/testsuite/quotas_01-quota_enforcement.robot b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
index c0a5043..229a60c 100644
--- 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
@@ -88,8 +88,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}   ${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
@@ -101,17 +101,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}   ${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 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}   ${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
@@ -127,25 +127,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
@@ -157,18 +157,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}