X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fhackfest_multivdu.robot;h=229e9e656e72173d4352613d83590d06abea796d;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hp=131c5ac50d568ee5996183fea86d3c9ff4369398;hpb=4cf45d797499817b5f639bd6245c3f84e762de14;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/hackfest_multivdu.robot b/robot-systest/testsuite/hackfest_multivdu.robot
index 131c5ac..229e9e6 100644
--- a/robot-systest/testsuite/hackfest_multivdu.robot
+++ b/robot-systest/testsuite/hackfest_multivdu.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [HACKFEST-MULTIVDU] Basic NS with two multi-VDU VNF
+Documentation   [HACKFEST-MULTIVDU] Basic NS with two multi-VDU VNF
 
 Library   OperatingSystem
 Library   String
@@ -25,22 +25,33 @@ 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_multivdu_ns_data.py
-
 Force Tags   hackfest_multivdu   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-${ns_id}   ${EMPTY}
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   hackfest_multivdu_vnf
+${vnfd_name}   hackfest_multivdu-vnf
+${nsd_pkg}   hackfest_multivdu_ns
+${nsd_name}   hackfest_multivdu-ns
+
+# NS instance name and configuration
+${ns_name}   hfmultivdu
+${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}   vnf1
 ${vnf_ip_addr}   ${EMPTY}
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${wait_guard_for_vm_boot}   50s
-# ${ns_config}   ${EMPTY}
+
 
 *** Test Cases ***
 Create Hackfest multivdu VNF Descriptor
@@ -54,15 +65,15 @@ Create Hackfest Multivdu NS Descriptor
 
 Network Service Instance Test
 
-    ${status}   ${message}=   Run Keyword And Ignore Error  Variable Should Exist   ${publickey}
+    ${status}   ${message}=   Run Keyword And Ignore Error   Variable Should Exist   ${publickey}
         Run Keyword If   "${status}" == "FAIL"   Set Global Variable   ${publickey}   ${EMPTY}
     ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
     Set Suite Variable   ${ns_id}   ${id}
-    Sleep   ${wait_guard_for_vm_boot}  Waiting for VM's daemons to be up and running
+    Sleep   ${wait_guard_for_vm_boot}   Waiting for VM's daemons to be up and running
 
 Get Vnf Ip Address
 
-    ${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}
 
@@ -70,9 +81,9 @@ Test Ping
     Test Connectivity   ${vnf_ip_addr}
 
 Test SSH Access
-    ${status}   ${message}=   Run Keyword And Ignore Error  Variable Should Exist   ${privatekey}
+    ${status}   ${message}=   Run Keyword And Ignore Error   Variable Should Exist   ${privatekey}
         Run Keyword If   "${status}" == "FAIL"   Set Global Variable   ${privatekey}   ${EMPTY}
-    Test SSH Connection   ${vnf_ip_addr}  ${username}  ${password}  ${privatekey} 
+    Test SSH Connection   ${vnf_ip_addr}   ${username}   ${password}   ${privatekey} 
 
 Delete NS Instance Test
     [Tags]   cleanup
@@ -94,10 +105,10 @@ Delete VNF Descriptor Test
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suit Cleanup: Deleting Descriptor, instance and vim
+    [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 NS   ${ns_name}
 
-    Run Keyword If Any Tests Failed  Delete NSD   ${nsd_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 VNFD   ${vnfd_name}