X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fheal_03-multiple_healing.robot;h=856bcfdd78e363918dd0aa43367e217982a6ad3a;hb=d7f75d7d293999d41af88ef4752906b134f58930;hp=c6b9e2438470dfb2e30902e03c9dcdbc494819c3;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;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 c6b9e24..856bcfd 100644
--- a/robot-systest/testsuite/heal_03-multiple_healing.robot
+++ b/robot-systest/testsuite/heal_03-multiple_healing.robot
@@ -26,7 +26,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot
 
-Force Tags   heal_03   cluster_main   daily   regression
+Force Tags   heal_03   cluster_heal   daily
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
@@ -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,7 +87,6 @@ Get NS Id
 
 
 Scale Out Charm VNF
-    [Tags]   prepare
     ${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}
@@ -99,11 +95,10 @@ Scale Out Charm VNF
     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
+    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
     ${variables}   Get Variables
     IF   not "\${vnf_charm_id}" in "${variables}"
@@ -119,7 +114,6 @@ Get Charm VNF Info
 
 
 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}
     log   ${ip_addr}
@@ -137,7 +131,6 @@ Get Volume VNF Info
 
 
 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
     Stop Server   ${vdu_charm_ids}[1]
@@ -147,14 +140,12 @@ 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
     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}