X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fheal_03-multiple_healing.robot;h=3b0baaefef21df97c76cb95416d5d7e58e7568de;hb=58710335f2db1e82ec171784891b7cbee71fd360;hp=3c2dd23bfd29aafe90c87ead27e576cf06d6a7cd;hpb=845c2ea1f8d825af847dbb94ac14e77eb8b3c169;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/heal_03-multiple_healing.robot b/robot-systest/testsuite/heal_03-multiple_healing.robot
index 3c2dd23..3b0baae 100644
--- a/robot-systest/testsuite/heal_03-multiple_healing.robot
+++ b/robot-systest/testsuite/heal_03-multiple_healing.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [HEAL-03] Healing of multiple VDUs
+Documentation   [HEAL-03] Healing of multiple VDUs
 
 Library   OperatingSystem
 Library   String
@@ -64,24 +64,21 @@ ${success_return_code}   0
 
 *** Test Cases ***
 Create VNF Descriptors
-    [Tags]  prepare
     Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_charm_pkg}'
     Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_volumes_pkg}'
 
 
 Create NS Descriptor
-    [Tags]  prepare
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Network Service Instance Test
-    [Tags]  prepare
     ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
     Set Suite Variable   ${ns_id}   ${id}
 
 
 Get NS Id
-    [Tags]   verify   cleanup
+    [Tags]   cleanup
     ${variables}   Get Variables
     IF   not "\${ns_id}" in "${variables}"
         ${id}=   Get Ns Id   ${ns_name}
@@ -90,56 +87,52 @@ Get NS Id
 
 
 Scale Out Charm VNF
-    [Tags]  prepare
-    ${vnf_id}=  Get Vnf Id   ${ns_id}   ${vnf_charm_index}
+    ${vnf_id}=   Get Vnf Id   ${ns_id}   ${vnf_charm_index}
     Set Suite Variable   ${vnf_charm_id}   ${vnf_id}
-    @{vdur_list}=  Get Vnf Vdur Names   ${vnf_charm_id}
-    ${vdurs}=  Get Length   ${vdur_list}
+    @{vdur_list}=   Get Vnf Vdur Names   ${vnf_charm_id}
+    ${vdurs}=   Get Length   ${vdur_list}
     Set Suite Variable   ${initial_vdur_count}   ${vdurs}
-    Execute Manual VNF Scale   ${ns_name}   ${vnf_charm_index}   ${vnf_charm_scaling_group}  SCALE_OUT  ${scale_wait_time}
-    @{vdur_list}=  Get Vnf Vdur Names  ${vnf_charm_id}
-    ${vdurs}=  Get Length   ${vdur_list}
-    Run Keyword Unless  ${vdurs} == ${initial_vdur_count} + 1  Fail  msg=There is no new VDU records in the VNF after Scale Out
+    Execute Manual VNF Scale   ${ns_name}   ${vnf_charm_index}   ${vnf_charm_scaling_group}   SCALE_OUT   ${scale_wait_time}
+    @{vdur_list}=   Get Vnf Vdur Names   ${vnf_charm_id}
+    ${vdurs}=   Get Length   ${vdur_list}
+    Run Keyword If   ${vdurs} != ${initial_vdur_count} + 1   Fail   msg=There is no new VDU records in the VNF after Scale Out
 
 
 Get Charm VNF Info
-    [Tags]  verify
-    Variable Should Exist  ${ns_id}  msg=NS is not available
+    Variable Should Exist   ${ns_id}   msg=NS is not available
     ${variables}   Get Variables
     IF   not "\${vnf_charm_id}" in "${variables}"
-        ${vnf_id}=  Get Vnf Id   ${ns_id}   ${vnf_charm_index}
+        ${vnf_id}=   Get Vnf Id   ${ns_id}   ${vnf_charm_index}
         Set Suite Variable   ${vnf_charm_id}   ${vnf_id}
     END
-    ${id}=  Get VNF VIM ID   ${vnf_charm_id}
-    @{vdu_charm_ids}=  Split String   ${id}
+    ${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]
-    @{charm_ip_list}=  Get Vnf Vdur IPs   ${vnf_charm_id}
+    @{charm_ip_list}=   Get Vnf Vdur IPs   ${vnf_charm_id}
     Set Suite Variable   @{charm_ip_list}   @{charm_ip_list}
 
 
 Get Volume VNF Info
-    [Tags]  verify
-    Variable Should Exist  ${ns_id}  msg=NS is not available
-    ${ip_addr}=  Get Vnf Management Ip Address   ${ns_id}   ${vnf_several_index}
+    Variable Should Exist   ${ns_id}   msg=NS is not available
+    ${ip_addr}=   Get Vnf Management Ip Address   ${ns_id}   ${vnf_several_index}
     log   ${ip_addr}
     Set Suite Variable   ${vnf_volumes_ip_addr}   ${ip_addr}
 
-    ${vnf_id}=  Get Vnf Id   ${ns_id}   ${vnf_several_index}
+    ${vnf_id}=   Get Vnf Id   ${ns_id}   ${vnf_several_index}
     Set Suite Variable   ${vnf_volumes_id}   ${vnf_id}
-    ${id}=  Get VNF VIM ID   ${vnf_id}
+    ${id}=   Get VNF VIM ID   ${vnf_id}
     Set Suite Variable   ${vdu_volumes_id}   ${id}
     log   ${vdu_volumes_id}
 
-    @{volumes_ip_list}=  Get Vnf Vdur IPs   ${vnf_volumes_id}
+    @{volumes_ip_list}=   Get Vnf Vdur IPs   ${vnf_volumes_id}
     Set Suite Variable   @{volumes_ip_list}   @{volumes_ip_list}
     log   @{volumes_ip_list}
 
 
 Stop VDUs
-    [Tags]  verify
-    Variable Should Exist  @{vdu_charm_ids}  msg=Charm VDUs are not available
-    Variable Should Exist  ${vdu_volumes_id}  msg=Volume VDU is not available
+    Variable Should Exist   @{vdu_charm_ids}   msg=Charm VDUs are not available
+    Variable Should Exist   ${vdu_volumes_id}   msg=Volume VDU is not available
     Stop Server   ${vdu_charm_ids}[1]
     Stop Server   ${vdu_charm_ids}[2]
     Stop Server   ${vdu_volumes_id}
@@ -147,29 +140,27 @@ Stop VDUs
 
 
 Heal VDUs
-    [Tags]  verify
-    Variable Should Exist  ${vnf_charm_id}  msg=Charm VNF is not available
-    Variable Should Exist  ${vnf_volumes_id}  msg=Volume VNF is not available
+    Variable Should Exist   ${vnf_charm_id}   msg=Charm VNF is not available
+    Variable Should Exist   ${vnf_volumes_id}   msg=Volume VNF is not available
     Heal Network Service   ${ns_id}   --vnf ${vnf_volumes_id} --cause "Heal myvdu1 of several_volumes_vnf" --vdu several_volumes-VM --vnf ${vnf_charm_id} --cause "Heal two VMs of native_manual_scale_charm_vnf" --vdu mgmtVM --count-index 1 --run-day1 --vdu mgmtVM --count-index 2
 
 
 Check VNFs After Healing
-    [Tags]  verify
-    Variable Should Exist  ${vnf_charm_id}  msg=Charm VNF is not available
-    Variable Should Exist  ${vnf_volumes_id}  msg=Volume VNF is not available
-    ${id}=  Get VNF VIM ID   ${vnf_charm_id}
-    @{ids}=  Split String   ${id}
+    Variable Should Exist   ${vnf_charm_id}   msg=Charm VNF is not available
+    Variable Should Exist   ${vnf_volumes_id}   msg=Volume VNF is not available
+    ${id}=   Get VNF VIM ID   ${vnf_charm_id}
+    @{ids}=   Split String   ${id}
     Should Be Equal   ${vdu_charm_ids}[0]   ${ids}[0]   VDU[0] id has changed after healing
     Should Not Be Equal   ${vdu_charm_ids}[1]   ${ids}[1]   VDU[1] id has not changed after healing
     Should Not Be Equal   ${vdu_charm_ids}[2]   ${ids}[2]   VDU[2] id has not changed after healing
 
-    ${id}=  Get VNF VIM ID   ${vnf_volumes_id}
+    ${id}=   Get VNF VIM ID   ${vnf_volumes_id}
     Should Not Be Equal   ${id}   ${vdu_volumes_id}   VDU id has not changed after healing
 
-    ${ip}=  Get Vdu Attribute   ${vnf_charm_id}   ip-address   2
+    ${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}
-    Check If remote File Exists  ${ip}  ${username}  ${password}  ${privatekey}  ${vnf_charm_day1_file}
+    log   ${stdout}
+    Check If remote File Exists   ${ip}   ${username}   ${password}   ${privatekey}   ${vnf_charm_day1_file}
 
 
 Delete NS Instance
@@ -190,9 +181,9 @@ Delete VNF Descriptors
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suit Cleanup: Deleting Descriptor, instance and vim
+    [Documentation]   Test Suit Cleanup: Deleting Descriptor, instance and vim
 
-    Run Keyword If Any Tests Failed  Delete NS   ${ns_name}
-    Run Keyword If Any Tests Failed  Delete NSD   ${nsd_name}
-    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 NS   ${ns_name}
+    Run Keyword If Any Tests Failed   Delete NSD   ${nsd_name}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_volumes_name}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_charm_name}