X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_14-vnf_relations.robot;h=dfe164a76495cef17805323f3699146466af48da;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hp=adc308d34f3dd87c014694d11a47358f64d5041e;hpb=b72faf377dd4f809b9439d5ca9de8b7f03c82ee8;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_14-vnf_relations.robot b/robot-systest/testsuite/basic_14-vnf_relations.robot
index adc308d..dfe164a 100644
--- a/robot-systest/testsuite/basic_14-vnf_relations.robot
+++ b/robot-systest/testsuite/basic_14-vnf_relations.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [BASIC-14] VNF Relations
+Documentation   [BASIC-14] VNF Relations
 
 Library   OperatingSystem
 Library   SSHLibrary
@@ -20,74 +20,73 @@ 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/ssh_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_14-vnf_relations.py
+Force Tags   basic_14   cluster_ee_config   cluster_relations   daily   regression
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-${username}   ubuntu
-${password}   ${EMPTY}
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   charm-packages/vnf_relations_vnf
+${vnfd_name}   vnf_relations-vnf
+${nsd_pkg}   charm-packages/vnf_relations_ns
+${nsd_name}   vnf_relations-ns
+
+# NS instance name and configuration
+${ns_name}   basic_14_vnf_relations_test
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${action_name}   touch
-${vnf_member_index_1}   1
-${vnf_member_index_2}   2
-${day_1_file_name}   /home/ubuntu/first-touch
-${day_2_file_name_1}   /home/ubuntu/mytouch1
-${day_2_file_name_2}   /home/ubuntu/mytouch2
 ${ns_timeout}   15min
 
+# SSH public keys file
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+
 
 *** Test Cases ***
 Create Charm VNF Descriptor
-    [Tags]   vnf_relations   charm   sanity   regression
 
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create Charm NS Descriptor
-    [Tags]   vnf_relations   charm   sanity   regression
 
-    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Charm Network Service
-    [Tags]   vnf_relations   charm   sanity   regression
 
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}  ${ns_timeout}
-    Set Suite Variable  ${ns_id}  ${id}
+    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}   ${ns_timeout}
+    Set Suite Variable   ${ns_id}   ${id}
 
 
 # TODO Check juju status for relations
 
 
 Delete NS Instance
-    [Tags]   vnf_relations   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
-    Delete NS  ${ns_name}
+    Delete NS   ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   vnf_relations   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
-    Delete NSD  ${nsd_name}
+    Delete NSD   ${nsd_name}
 
 
 Delete VNF Descriptor Provides
-    [Tags]   vnf_relations   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
-    Delete VNFD  ${vnfd_name}
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
-Test Cleanup
-    [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
+Suite Cleanup
+    [Documentation]   Test Suite Cleanup: Deleting descriptors and NS instance
 
-    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}