Update from master part 2

[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 df655b0..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}
 
@@ -104,9 +110,9 @@ Scale Out Charm VNF
 Get VIM Objects
     Variable Should Exist   ${ns_id}   msg=NS is not available
     @{vnf_id_list}=   Get Ns Vnf List   ${ns_id}
-    log   ${vnf_id_list}
+    Log   ${vnf_id_list}
     FOR   ${vnf_id}   IN   @{vnf_id_list}
-        log   ${vnf_id}
+        Log   ${vnf_id}
         ${id}=   Get VNF VIM ID   ${vnf_id}
         @{vdu_ids}=   Split String   ${id}
         Append To List   ${vim_vdus}   @{vdu_ids}
@@ -120,8 +126,8 @@ Get VIM Objects
             END
         END
     END
-    log Many   @{vim_vdus}
-    log Many   @{vim_volumes}
+    Log Many   @{vim_vdus}
+    Log Many   @{vim_volumes}
 
 
 Get Charm VNF Info
@@ -134,7 +140,7 @@ Get Charm VNF Info
     ${id}=   Get VNF VIM ID   ${vnf_charm_id}
     @{vdu_charm_ids}=   Split String   ${id}
     Set Suite Variable   @{vdu_charm_ids}   @{vdu_charm_ids}
-    log   ${vdu_charm_ids}[1]
+    Log   ${vdu_charm_ids}[1]
     @{charm_ip_list}=   Get Vnf Vdur IPs   ${vnf_charm_id}
     Set Suite Variable   @{charm_ip_list}   @{charm_ip_list}
 
@@ -164,8 +170,10 @@ Check VNF After Healing
 
     ${ip}=   Get Vdu Attribute   ${vnf_charm_id}   ip-address   1
     ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip}   ${username}   ${password}   ${privatekey}   sudo ls ${vnf_charm_cloudinit_file}
-    log   ${stdout}
+    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
@@ -191,8 +199,8 @@ Update VIM Objects
             END
         END
     END
-    log Many   @{vim_vdus}
-    log Many   @{vim_volumes}
+    Log Many   @{vim_vdus}
+    Log Many   @{vim_volumes}
 
 
 Delete NS Instance
@@ -215,21 +223,21 @@ Delete Objects in VIM
     [Tags]   cleanup
     ${error}=   Set Variable   0
     FOR   ${vol_id}   IN   @{vim_volumes}
-        log   Checking if volume ${vol_id} is still in VIM
+        Log   Checking if volume ${vol_id} is still in VIM
         ${exists}=   Check If Volume Exists   ${vol_id}
         IF   ${exists}!=0
             ${error}=   Set Variable   1
-            log   Deleting volume ${vol_id}
+            Log   Deleting volume ${vol_id}
             Run Keyword And Ignore Error   Delete Volume   ${vol_id}
         END
     END
     FOR   ${vdu_id}   IN   @{vim_vdus}
-        log   Checking if server ${vdu_id} is still in VIM
+        Log   Checking if server ${vdu_id} is still in VIM
         ${status}=   Run Keyword And Ignore Error   Get Server Property   ${vdu_id}   id
-        log   ${status}[0]
+        Log   ${status}[0]
         IF   '${status}[0]' == 'PASS'
             ${error}=   Set Variable   1
-            log   Deleting server ${vdu_id}
+            Log   Deleting server ${vdu_id}
             Run Keyword And Ignore Error   Delete Server   ${vdu_id}
         END
     END
@@ -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