X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Ffail_01-insufficient_resources.robot;h=e15e1d95160ae3ded6a6388faabd6424ddf1803c;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hp=b89f861b949da6c1e36edcefaf71d7477c480736;hpb=3422ec3dae4cb95c855f8809e70a126ae6d23558;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/fail_01-insufficient_resources.robot b/robot-systest/testsuite/fail_01-insufficient_resources.robot
index b89f861..e15e1d9 100644
--- a/robot-systest/testsuite/fail_01-insufficient_resources.robot
+++ b/robot-systest/testsuite/fail_01-insufficient_resources.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [FAIL-01] A single VNF with 2 VDUs, one of them unallocatable because of resources.
+Documentation   [FAIL-01] A single VNF with 2 VDUs, one of them unallocatable because of resources.
 
 Library   OperatingSystem
 Library   String
@@ -42,8 +42,9 @@ ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 # SSH keys to be used
 ${publickey}   %{HOME}/.ssh/id_rsa.pub
 
-# Default memory for dataVM VDU (can be overwritten by VM_MEMORY_OVERRIDE environment variable)
-${default_memory}   100
+# Default memory in GB for dataVM VDU (can be overwritten by VM_MEMORY_OVERRIDE environment variable)
+# Only used if no quota is defined in Openstack's project (VDU tries to allocate the full memory of the quota)
+${default_memory}   250
 
 # NS launch timeout and polling time
 ${ns_launch_max_wait_time}   5min
@@ -57,24 +58,30 @@ ${os_delete_pol_time}   20
 *** Test Cases ***
 Create VNF Descriptor
 
-    ${memory}=   Get Environment Variable    VM_MEMORY_OVERRIDE   default=${default_memory}
+    ${ram_quota}=   Get Project Quota   ram
+    IF   ${ram_quota} == -1
+        ${memory}=   Get Environment Variable   VM_MEMORY_OVERRIDE   default=${default_memory}
+    ELSE
+        ${memory}=   Evaluate   ${ram_quota} / 1000
+    END
+    log   ${memory}
     Create VNFD Overriding Fields   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   virtual-compute-desc.1.virtual-memory.size=${memory}
 
 
 Create NS Descriptor
 
-    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Cannot Instantiate Network Service
 
-    ${rand}=  Generate Random String  4  [NUMBERS]
-    ${ns_name}=  Catenate   SEPARATOR=_   ${ns_name_prefix}   ${rand}
-    Set Suite Variable  ${ns_name}
+    ${rand}=   Generate Random String   4   [NUMBERS]
+    ${ns_name}=   Catenate   SEPARATOR=_   ${ns_name_prefix}   ${rand}
+    Set Suite Variable   ${ns_name}
     log   ${ns_name}
     ${id}=   Instantiate Network Service   ${ns_name}   ${nsd_name}   %{VIM_TARGET}   --config '${ns_config}' --ssh_keys ${publickey}
     log   ${id}
-    Set Suite Variable  ${ns_id}  ${id}
+    Set Suite Variable   ${ns_id}   ${id}
     WAIT UNTIL KEYWORD SUCCEEDS   ${ns_launch_max_wait_time}   ${ns_launch_pol_time}   Check For Ns Instance To Configured   ${ns_name}
     ${rc}   ${stdout}=   run and return rc and output   osm ns-list --filter id="${ns_id}" | grep ${ns_id} | awk '{print $8}'
     log   ${stdout}
@@ -87,26 +94,26 @@ Cannot Instantiate Network Service
 Delete NS Instance And Check VIM
     [Tags]   cleanup
 
-    Delete NS  ${ns_name}
+    Delete NS   ${ns_name}
     WAIT UNTIL KEYWORD SUCCEEDS   ${os_delete_max_wait_time}   ${os_delete_pol_time}   Check NS Servers In VIM   ${ns_name}   0
  
 
 Delete NS Descriptor
     [Tags]   cleanup
 
-    Delete NSD  ${nsd_name}
+    Delete NSD   ${nsd_name}
 
 
 Delete VNF Descriptor
     [Tags]   cleanup
 
-    Delete VNFD  ${vnfd_name}
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
+    [Documentation]   Test Suite Cleanup: Deleting descriptors and NS instance
 
-    Run Keyword If Any Tests Failed  Delete NS  ${ns_name}
-    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
-    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed   Delete NS   ${ns_name}
+    Run Keyword If Any Tests Failed   Delete NSD   ${nsd_name}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_name}