X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fhackfest_basic.robot;fp=robot-systest%2Ftestsuite%2Fhackfest_basic.robot;h=1c9d7c95e2f1b7c8a7ac3c3e1abc3fbcf5469ee1;hp=09d8aa58438eb909ef62ca6f21a895e36598ff4d;hb=23ff8f980f66ef57fb4d254336a018e3a697a187;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc

diff --git a/robot-systest/testsuite/hackfest_basic.robot b/robot-systest/testsuite/hackfest_basic.robot
index 09d8aa5..1c9d7c9 100644
--- a/robot-systest/testsuite/hackfest_basic.robot
+++ b/robot-systest/testsuite/hackfest_basic.robot
@@ -1,4 +1,3 @@
-*** Comments ***
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
@@ -11,7 +10,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-
 *** Settings ***
 Documentation   [HACKFEST-BASIC] Basic NS with a single-VDU VNF
 
@@ -21,87 +19,94 @@ Library   Collections
 Library   Process
 Library   SSHLibrary
 
-Resource   ../lib/vnfd_lib.resource
-Resource   ../lib/nsd_lib.resource
-Resource   ../lib/ns_lib.resource
-Resource   ../lib/connectivity_lib.resource
-Resource   ../lib/ssh_lib.resource
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
-Test Tags   hackfest_basic   cluster_main   daily   regression   sanity   azure
+Force Tags   hackfest_basic   cluster_main   daily   regression   sanity   azure
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
 # 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
+${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}} ] }
+${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}
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{HOME}/.ssh/id_rsa
+${username}   ubuntu
+${password}   ${EMPTY}
 
-${NS_ID}   ${EMPTY}
-${VNF_MEMBER_INDEX}   vnf
-${VNF_IP_ADDR}   ${EMPTY}
+${ns_id}   ${EMPTY}
+${vnf_member_index}   vnf
+${vnf_ip_addr}   ${EMPTY}
 
 
 *** Test Cases ***
 Create Hackfest Basic VNF Descriptor
-    [Documentation]   Upload VNF package for the testsuite.
-    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG}'
+
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+
 
 Create Hackfest Basic NS Descriptor
-    [Documentation]   Upload NS package for the testsuite.
-    Create NSD   '%{PACKAGES_FOLDER}/${NSD_PKG}'
+
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 Network Service Instance Test
-    [Documentation]   Instantiate NS for the testsuite.
-    ${id}=   Create Network Service   ${NSD_NAME}   %{VIM_TARGET}   ${NS_NAME}   ${NS_CONFIG}   ${PUBLICKEY}
-    Set Suite Variable   ${NS_ID}   ${id}
+
+    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
+    Set Suite Variable   ${ns_id}   ${id}
+
 
 Get Vnf Ip Address
-    [Documentation]   Get the mgmt IP address of the VNF of the NS.
-    ${ip_addr}=   Get Vnf Management Ip Address   ${NS_ID}   ${VNF_MEMBER_INDEX}
+
+    ${ip_addr}   Get Vnf Management Ip Address   ${ns_id}   ${vnf_member_index}
     Log   ${ip_addr}
-    Set Suite Variable   ${VNF_IP_ADDR}   ${ip_addr}
+    Set Suite Variable   ${vnf_ip_addr}   ${ip_addr}
 
 Test Ping
-    [Documentation]   Test that the mgmt IP address of the VNF is reachable with ping.
-    Test Connectivity   ${VNF_IP_ADDR}
+    Test Connectivity   ${vnf_ip_addr}
 
 Test SSH Access
-    [Documentation]   Check that the VNF is accessible via SSH in its mgmt IP address.
     Sleep   30s   Waiting ssh daemon to be up
-    Test SSH Connection   ${VNF_IP_ADDR}   ${USERNAME}   ${PASSWORD}   ${PRIVATEKEY}
+    Test SSH Connection   ${vnf_ip_addr}   ${username}   ${password}   ${privatekey}
 
 Delete NS Instance Test
-    [Documentation]   Delete NS instance.
     [Tags]   cleanup
-    Delete NS   ${NS_NAME}
+
+    Delete NS   ${ns_name}
+
 
 Delete NS Descriptor Test
-    [Documentation]   Delete NS package from OSM.
     [Tags]   cleanup
-    Delete NSD   ${NSD_NAME}
+
+    Delete NSD   ${nsd_name}
+
 
 Delete VNF Descriptor Test
-    [Documentation]   Delete VNF package from OSM.
     [Tags]   cleanup
-    Delete VNFD   ${VNFD_NAME}
+
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
 Suite Cleanup
     [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_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_name}
+
+