X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fhackfest_multivdu.robot;h=c30ef94b1c1daf39cb69d7088ff44677f090c9fd;hb=refs%2Fchanges%2F29%2F10629%2F1;hp=5bbdd1003a68714cc62d7991f3969c2e99f3554f;hpb=f96bb45c0a03f2188688d90d67ea718851cec2de;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/hackfest_multivdu.robot b/robot-systest/testsuite/hackfest_multivdu.robot
index 5bbdd10..c30ef94 100644
--- a/robot-systest/testsuite/hackfest_multivdu.robot
+++ b/robot-systest/testsuite/hackfest_multivdu.robot
@@ -25,13 +25,13 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_multivdu_ns_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
 ${ns_id}   ${EMPTY}
-${username}   osm
-${password}   osm4u
+${username}   ubuntu
+${password}   ${EMPTY}
 ${vnf_member_index}   1
 ${vnf_ip_addr}   ${EMPTY}
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
@@ -95,11 +95,11 @@ Delete VNF Descriptor Test
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting Descriptor, instance and vim
 
-    Run Keyword If Test Failed  Delete NS   ${ns_name}
+    Run Keyword If Any Tests Failed  Delete NS   ${ns_name}
 
-    Run Keyword If Test Failed  Delete NSD   ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete NSD   ${nsd_name}
 
-    Run Keyword If Test Failed  Delete VNFD   ${vnfd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name}