X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fhackfest_basic.robot;h=1996d81e8038c55c25d20967911da2db7024167d;hb=f25782945b1e3db0a2442c572a5f8607bb42460e;hp=c3f90685e63ae657d909c9cfcbd7035739a4ee25;hpb=f96bb45c0a03f2188688d90d67ea718851cec2de;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/hackfest_basic.robot b/robot-systest/testsuite/hackfest_basic.robot
index c3f9068..1996d81 100644
--- a/robot-systest/testsuite/hackfest_basic.robot
+++ b/robot-systest/testsuite/hackfest_basic.robot
@@ -11,6 +11,8 @@
 #   limitations under the License.
 
 *** Settings ***
+Documentation     [HACKFEST-BASIC] Basic NS with a single-VDU VNF
+
 Library   OperatingSystem
 Library   String
 Library   Collections
@@ -23,81 +25,88 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_basic_ns_data.py
+Force Tags   hackfest_basic   cluster_main   daily   regression   sanity
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-${ns_id}   ${EMPTY}
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   hackfest_basic_vnf
+${vnfd_name}   hackfest_basic-vnf
+${nsd_pkg}   hackfest_basic_ns
+${nsd_name}   hackfest_basic-ns
+
+# NS instance name and configuration
+${ns_name}   hfbasic
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
+# SSH keys and username to be used
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   ${EMPTY}
-${vnf_member_index}   1
+
+${ns_id}   ${EMPTY}
+${vnf_member_index}   vnf
 ${vnf_ip_addr}   ${EMPTY}
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-# ${ns_config}   ${EMPTY}
+
 
 *** Test Cases ***
 Create Hackfest Basic VNF Descriptor
-    [Tags]   hackfest_basic   sanity   regression
 
     Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create Hackfest Basic NS Descriptor
-    [Tags]   hackfest_basic   sanity   regression
 
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 Network Service Instance Test
-    [Tags]   hackfest_basic   sanity   regression
 
     ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
     Set Suite Variable   ${ns_id}   ${id}
 
 
 Get Vnf Ip Address
-    [Tags]   hackfest_basic   sanity   regression
 
     ${ip_addr}  Get Vnf Management Ip Address   ${ns_id}   ${vnf_member_index}
     log   ${ip_addr}
     Set Suite Variable   ${vnf_ip_addr}   ${ip_addr}
 
 Test Ping
-    [Tags]   hackfest_basic   sanity   regression
     Test Connectivity  ${vnf_ip_addr}
 
 Test SSH Access
-    [Tags]   hackfest_basic   sanity   regression
     Sleep   30s   Waiting ssh daemon to be up
     Test SSH Connection  ${vnf_ip_addr}  ${username}  ${password}  ${privatekey} 
 
 Delete NS Instance Test
-    [Tags]   hackfest_basic   sanity   regression   cleanup
+    [Tags]   cleanup
 
     Delete NS   ${ns_name}
 
 
 Delete NS Descriptor Test
-    [Tags]   hackfest_basic   sanity   regression   cleanup
+    [Tags]   cleanup
 
     Delete NSD   ${nsd_name}
 
 
 Delete VNF Descriptor Test
-    [Tags]   hackfest_basic   sanity   regression   cleanup
+    [Tags]   cleanup
 
     Delete VNFD   ${vnfd_name}
 
 
 *** 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}