Fix Heal02 error when flavor already exists

[osm/tests.git] / robot-systest / testsuite / heal_02-scale_vdu_healing.robot

diff --git a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
index edb7a1a..bf88510 100644 (file)
--- a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
+++ b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
@@ -49,8 +49,9 @@ ${nsd_pkg}   volumes_nativecharm_ns
 ${nsd_name}   volumes_nativecharm-ns
 
 # NS instance name and configuration
+${flavor_name}   osm.heal_02
 ${ns_name}   heal_02
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${ns_timeout}   6min
 ${scale_wait_time}   4min
 
 # SSH keys and username to be used
@@ -75,8 +76,15 @@ Create NS Descriptor
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
+Create Test Flavor
+    Delete Flavor   ${flavor_name}
+    ${id}=   Create Flavor   ${flavor_name}   1   1024   10
+    Set Suite Variable   ${flavor_id}   ${id}
+
+
 Network Service Instance Test
-    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
+    ${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}   ${ns_timeout}
     Set Suite Variable   ${ns_id}   ${id}
 
 
@@ -166,6 +174,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   1
+    Should Contain   ${vim_info}   id: ${flavor_id}   msg=Flavor ID is incorrect
 
 
 Update VIM Objects
@@ -213,6 +223,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