X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_14-vnf_relations.robot;fp=robot-systest%2Ftestsuite%2Fbasic_14-vnf_relations.robot;h=dbe232dcfec27e42aecd4965ba6a484f652a67cc;hp=ed4b1678b6859c50fe747efc98e63d1b3ace9d20;hb=23ff8f980f66ef57fb4d254336a018e3a697a187;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc

diff --git a/robot-systest/testsuite/basic_14-vnf_relations.robot b/robot-systest/testsuite/basic_14-vnf_relations.robot
index ed4b167..dbe232d 100644
--- a/robot-systest/testsuite/basic_14-vnf_relations.robot
+++ b/robot-systest/testsuite/basic_14-vnf_relations.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,74 +10,83 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-
 *** Settings ***
 Documentation   [BASIC-14] VNF Relations
 
 Library   OperatingSystem
 Library   SSHLibrary
 
-Resource   ../lib/vnfd_lib.resource
-Resource   ../lib/nsd_lib.resource
-Resource   ../lib/ns_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/ssh_lib.robot
 
-Test Tags   basic_14   cluster_ee_config   cluster_relations   regression   azure
+Force Tags   basic_14   cluster_ee_config   cluster_relations   regression   azure
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
 # 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
+${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}} ] }
-${NS_TIMEOUT}   15min
+${ns_name}   basic_14_vnf_relations_test
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${ns_timeout}   15min
 
 # SSH public keys file
-${PUBLICKEY}   %{HOME}/.ssh/id_rsa.pub
+${publickey}   %{HOME}/.ssh/id_rsa.pub
 
 
 *** Test Cases ***
 Create Charm VNF Descriptor
-    [Documentation]   Upload VNF package for the testsuite.
-    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG}'
+
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+
 
 Create Charm NS Descriptor
-    [Documentation]   Upload NS package for the testsuite.
-    Create NSD   '%{PACKAGES_FOLDER}/${NSD_PKG}'
+
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
+
 
 Instantiate Charm Network Service
-    [Documentation]   Instantiate NS for the testsuite.
-    ${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
+    ${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
-    [Documentation]   Delete NS instance.
     [Tags]   cleanup
-    Delete NS   ${NS_NAME}
+
+    Delete NS   ${ns_name}
+
 
 Delete NS Descriptor
-    [Documentation]   Delete NS package from OSM.
     [Tags]   cleanup
-    Delete NSD   ${NSD_NAME}
 
-Delete VNF Descriptor
-    [Documentation]   Delete VNF package from OSM.
+    Delete NSD   ${nsd_name}
+
+
+Delete VNF Descriptor Provides
     [Tags]   cleanup
-    Delete VNFD   ${VNFD_NAME}
+
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
 Suite Cleanup
     [Documentation]   Test Suite Cleanup: Deleting descriptors and NS instance
-    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}
+