X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_14-vnf_relations.robot;h=ed4b1678b6859c50fe747efc98e63d1b3ace9d20;hb=refs%2Fheads%2Fmaster;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..ed4b167 100644
--- a/robot-systest/testsuite/basic_14-vnf_relations.robot
+++ b/robot-systest/testsuite/basic_14-vnf_relations.robot
@@ -1,3 +1,4 @@
+*** 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
@@ -10,84 +11,74 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+
 *** Settings ***
-Documentation     [BASIC-14] VNF Relations
+Documentation   [BASIC-14] VNF Relations
 
 Library   OperatingSystem
 Library   SSHLibrary
 
-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
+Resource   ../lib/vnfd_lib.resource
+Resource   ../lib/nsd_lib.resource
+Resource   ../lib/ns_lib.resource
+Resource   ../lib/ssh_lib.resource
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_14-vnf_relations.py
+Test Tags   basic_14   cluster_ee_config   cluster_relations   regression   azure
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-${username}   ubuntu
-${password}   ${EMPTY}
-${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
+# 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}} ] }
+${NS_TIMEOUT}   15min
 
-*** Test Cases ***
-Create Charm VNF Descriptor
-    [Tags]   vnf_relations   charm   sanity   regression
+# SSH public keys file
+${PUBLICKEY}   %{HOME}/.ssh/id_rsa.pub
 
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
+*** Test Cases ***
+Create Charm VNF Descriptor
+    [Documentation]   Upload VNF package for the testsuite.
+    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG}'
 
 Create Charm NS Descriptor
-    [Tags]   vnf_relations   charm   sanity   regression
-
-    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
-
+    [Documentation]   Upload NS package for the testsuite.
+    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}
-
-
-# TODO Check juju status for relations
+    [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
 
 Delete NS Instance
-    [Tags]   vnf_relations   charm   sanity   regression  cleanup
-
-    Delete NS  ${ns_name}
-
+    [Documentation]   Delete NS instance.
+    [Tags]   cleanup
+    Delete NS   ${NS_NAME}
 
 Delete NS Descriptor
-    [Tags]   vnf_relations   charm   sanity   regression  cleanup
-
-    Delete NSD  ${nsd_name}
-
-
-Delete VNF Descriptor Provides
-    [Tags]   vnf_relations   charm   sanity   regression  cleanup
+    [Documentation]   Delete NS package from OSM.
+    [Tags]   cleanup
+    Delete NSD   ${NSD_NAME}
 
-    Delete VNFD  ${vnfd_name}
+Delete VNF Descriptor
+    [Documentation]   Delete VNF package from OSM.
+    [Tags]   cleanup
+    Delete VNFD   ${VNFD_NAME}
 
 
 *** Keywords ***
-Test Cleanup
-    [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
-
-    Run Keyword If Test Failed  Delete NS  ${ns_name}
-
-    Run Keyword If Test Failed  Delete NSD  ${nsd_name}
-
-    Run Keyword If Test Failed  Delete VNFD  ${vnfd_name}
-
+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}