X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fheal_02-scale_vdu_healing.robot;h=86886ef960df8827fa9b9a345998354da6300d97;hb=refs%2Fchanges%2F16%2F14116%2F1;hp=fc79217428e3831ffb448c6b5646a4a1f1fdfdbf;hpb=8218c9ae676ae2f0e6d292e1d29ff2c42abbc9f4;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
index fc79217..86886ef 100644
--- a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
+++ b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
@@ -49,10 +49,10 @@ ${nsd_pkg}   volumes_nativecharm_ns
 ${nsd_name}   volumes_nativecharm-ns
 
 # NS instance name and configuration
-${flavor_name}   osm.heal_02
+${flavor_name_prefix}   osm.heal02
 ${ns_name}   heal_02
 ${ns_timeout}   6min
-${scale_wait_time}   4min
+${scale_wait_time}   5min
 
 # SSH keys and username to be used
 ${publickey}   %{HOME}/.ssh/id_rsa.pub
@@ -77,7 +77,9 @@ Create NS Descriptor
 
 
 Create Test Flavor
-    ${id}=   Create Flavor   ${flavor_name}
+    ${rand}=   Generate Random String   6   [NUMBERS]
+    ${flavor_name}=   Catenate   SEPARATOR=_   ${flavor_name_prefix}   ${rand}
+    ${id}=   Create Flavor   ${flavor_name}   1   1024   10
     Set Suite Variable   ${flavor_id}   ${id}
 
 
@@ -222,6 +224,7 @@ Delete VNF Descriptors
 
 Delete Objects in VIM
     [Tags]   cleanup
+    Delete Flavor   ${flavor_id}
     ${error}=   Set Variable   0
     FOR   ${vol_id}   IN   @{vim_volumes}
         Log   Checking if volume ${vol_id} is still in VIM
@@ -247,10 +250,6 @@ Delete Objects in VIM
     END
 
 
-Delete flavor
-    Delete Flavor   ${flavor_id}
-
-
 *** Keywords ***
 Suite Cleanup
     [Documentation]   Test Suit Cleanup: Deleting Descriptor, instance and vim
@@ -260,4 +259,3 @@ Suite Cleanup
     Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_volumes_name}
     Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_charm_name}
     Run Keyword If Any Tests Failed   Delete Objects in VIM
-    Run Keyword If Any Tests Failed   Delete Flavor   ${flavor_id}
\ No newline at end of file