Feature 10975: Modify heal_02 to test instantiation, scaling and healing using an...

Change-Id: Ic9c02b13dda5c2e8eac3b8bfe027bd858d49a367
Signed-off-by: Gabriel Cuba <gcuba@whitestack.com>

diff --git a/robot-systest/lib/openstack_lib.robot b/robot-systest/lib/openstack_lib.robot
index b95b0c3..bdf49aa 100644 (file)
--- a/robot-systest/lib/openstack_lib.robot
+++ b/robot-systest/lib/openstack_lib.robot
@@ -191,3 +191,23 @@ Delete Server
     [Return]   ${stdout}
 
 
+Create Flavor
+    [Documentation]   Create a Flavor
+    [Arguments]   ${flavor_name}   ${cpu}=1   ${ram}=1024   ${disk}=10
+
+    Should Not Be Empty   ${flavor_name}
+    ${rc}   ${flavor_id}=   Run and Return RC and Output   openstack flavor create ${flavor_name} --ram ${ram} --disk ${disk} --vcpus ${cpu} -f yaml | yq '.id' | tr -d \\"
+    Log   ${flavor_id}
+    Should Be Equal As Integers   ${rc}   ${success_return_code}
+    [Return]   ${flavor_id}
+
+
+Delete Flavor
+    [Documentation]   Delete a Flavor
+    [Arguments]   ${flavor_id}
+
+    Should Not Be Empty   ${flavor_id}
+    ${rc}   ${stdout}=   Run and Return RC and Output   openstack flavor delete ${flavor_id}
+    Log   ${stdout}
+    Should Be Equal As Integers   ${rc}   ${success_return_code}
+    [Return]   ${stdout}

diff --git a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
index edb7a1a..edeec97 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,8 @@ ${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}} ] }
 ${scale_wait_time}   4min
 
 # SSH keys and username to be used
@@ -75,7 +75,13 @@ Create NS Descriptor
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
+Create Test Flavor
+    ${id}=   Create Flavor   ${flavor_name}
+    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}
     Set Suite Variable   ${ns_id}   ${id}
 
@@ -166,6 +172,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
 
 
 Update VIM Objects
@@ -238,6 +246,10 @@ Delete Objects in VIM
     END
 
 
+Delete flavor
+    Delete Flavor   ${flavor_id}
+
+
 *** Keywords ***
 Suite Cleanup
     [Documentation]   Test Suit Cleanup: Deleting Descriptor, instance and vim
@@ -247,3 +259,4 @@ 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