X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fhackfest_cloudinit.robot;h=cd695adcf7f2da6d97742a22a47d8e125c64be54;hb=23ff8f980f66ef57fb4d254336a018e3a697a187;hp=89aeb22ccd79f973e1d15c4c1ad57fd8bd45e137;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/hackfest_cloudinit.robot b/robot-systest/testsuite/hackfest_cloudinit.robot
index 89aeb22..cd695ad 100644
--- a/robot-systest/testsuite/hackfest_cloudinit.robot
+++ b/robot-systest/testsuite/hackfest_cloudinit.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-CLOUDINIT] Basic NS with two multi-VDU VNF with cloudinit
 
@@ -21,86 +19,99 @@ 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_cloudinit   cluster_main   daily   regression   sanity   azure
+Force Tags   hackfest_cloudinit   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_cloudinit_vnf
-${VNFD_NAME}   hackfest_cloudinit-vnf
-${NSD_PKG}   hackfest_cloudinit_ns
-${NSD_NAME}   hackfest_cloudinit-ns
+${vnfd_pkg}   hackfest_cloudinit_vnf
+${vnfd_name}   hackfest_cloudinit-vnf
+${nsd_pkg}   hackfest_cloudinit_ns
+${nsd_name}   hackfest_cloudinit-ns
 
 # NS instance name and configuration
-${NS_NAME}   hfcloudinit
-${NS_CONFIG}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${ns_name}   hfcloudinit
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 # SSH user and password
-${USERNAME}   ubuntu
-${PASSWORD}   osm4u
+${username}   ubuntu
+${password}   osm4u
 
-${NS_ID}   ${EMPTY}
-${VNF_MEMBER_INDEX}   vnf1
-${VNF_IP_ADDR}   ${EMPTY}
+${ns_id}   ${EMPTY}
+${vnf_member_index}   vnf1
+${vnf_ip_addr}   ${EMPTY}
 
 
 *** Test Cases ***
 Create Hackfest Cloudinit VNF Descriptor
-    [Documentation]   Upload VNF package for the testsuite.
-    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG}'
+
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+
 
 Create Hackfest Cloudinit 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}   ${EMPTY}
-    Set Suite Variable   ${NS_ID}   ${id}
+
+    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${EMPTY}
+    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 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}   ${EMPTY}
+    Test SSH Connection   ${vnf_ip_addr}   ${username}   ${password}   ${EMPTY}
+
 
 Check Remote File Injected Via Cloud-init
-    [Documentation]   Check that the day-0 configuration via cloudinit worked as expected in the VNF. A file should exist in the VM.
-    ${stdout}=   Execute Remote Command Check Rc Return Output   ${VNF_IP_ADDR}   ${USERNAME}   ${PASSWORD}   ${EMPTY}   sudo cat /root/helloworld.txt
+
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${vnf_ip_addr}   ${username}   ${password}   ${EMPTY}   sudo cat /root/helloworld.txt
     Log   ${stdout}
 
+
 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}
+
+