X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fhackfest_cloudinit.robot;h=3ac1189d7121a2727696d3d79eae2344a79f723b;hb=refs%2Fchanges%2F14%2F10114%2F2;hp=693348ef2613ebaefedc120d350f743f09d4a53b;hpb=f96bb45c0a03f2188688d90d67ea718851cec2de;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/hackfest_cloudinit.robot b/robot-systest/testsuite/hackfest_cloudinit.robot
index 693348e..3ac1189 100644
--- a/robot-systest/testsuite/hackfest_cloudinit.robot
+++ b/robot-systest/testsuite/hackfest_cloudinit.robot
@@ -25,13 +25,13 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_cloudinit_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}   ubuntu
-${password}   ${EMPTY}
+${password}   osm4u
 ${vnf_member_index}   1
 ${vnf_ip_addr}   ${EMPTY}
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
@@ -53,7 +53,7 @@ Create Hackfest Cloudinit NS Descriptor
 Network Service Instance Test
     [Tags]   hackfest_cloudinit   sanity   regression
 
-    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
+    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${EMPTY}
     Set Suite Variable   ${ns_id}   ${id}
 
 
@@ -98,13 +98,13 @@ 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}