X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fheal_02-scale_vdu_healing.robot;h=86886ef960df8827fa9b9a345998354da6300d97;hb=db73aa70f10d7da6ee7387b1854c6b22d871b6f3;hp=edeec97636bb9ee07b5bd83f4a8f28619b74ece5;hpb=8f994ccfd43dbc1db7c3fdb3410d98dd235a3529;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 edeec97..86886ef 100644
--- a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
+++ b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
@@ -49,9 +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
-${scale_wait_time}   4min
+${ns_timeout}   6min
+${scale_wait_time}   5min
 
 # SSH keys and username to be used
 ${publickey}   %{HOME}/.ssh/id_rsa.pub
@@ -76,13 +77,15 @@ 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}
 
 
 Network Service Instance Test
     ${ns_config}=   Set Variable   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}}],vnf: [ {member-vnf-index: charm_vnf, vdu: [{ id: mgmtVM, vim-flavor-id: ${flavor_id}}]}] }
-    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
+    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}   ${ns_timeout}
     Set Suite Variable   ${ns_id}   ${id}
 
 
@@ -172,8 +175,8 @@ Check VNF After Healing
     ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip}   ${username}   ${password}   ${privatekey}   sudo ls ${vnf_charm_cloudinit_file}
     Log   ${stdout}
     Check If remote File Exists   ${ip}   ${username}   ${password}   ${privatekey}   ${vnf_charm_day1_file}
-    ${vim_info}=   Get Vdu Attribute   ${vnf_charm_id}   vim_info
-    Should Contain   ${vim_info}   flavor: {id: ${flavor_id},   msg=Flavor ID is incorrect
+    ${vim_info}=   Get Vdu Attribute   ${vnf_charm_id}   vim_info   1
+    Should Contain   ${vim_info}   id: ${flavor_id}   msg=Flavor ID is incorrect
 
 
 Update VIM Objects
@@ -221,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
@@ -246,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
@@ -259,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