X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_13-ns_relations.robot;h=a405c6441726f5a40eba747747ac7bc5225c43b3;hb=7d7628b6b0033b2026e60bbbde7cb1d9a46f388f;hp=cdc61d653f9b947d6c471386725f6bdb8b543820;hpb=d225e550e79fdbb9f667975102b17232eca893c1;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_13-ns_relations.robot b/robot-systest/testsuite/basic_13-ns_relations.robot
index cdc61d6..a405c64 100644
--- a/robot-systest/testsuite/basic_13-ns_relations.robot
+++ b/robot-systest/testsuite/basic_13-ns_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,96 +11,96 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+
 *** Settings ***
-Documentation     [BASIC-13] NS Relations
+Documentation   [BASIC-13] NS 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_13-ns_relations.py
+Test Tags   basic_13   cluster_ee_config   cluster_relations   regression   azure
 
 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_PKG1}   charm-packages/ns_relations_provides_vnf
+${VNFD_PKG2}   charm-packages/ns_relations_requires_vnf
+${VNFD_NAME1}   ns_relations_provides-vnf
+${VNFD_NAME2}   ns_relations_requires-vnf
+${NSD_PKG}   charm-packages/ns_relations_ns
+${NSD_NAME}   ns_relations-ns
+
+# NS instance name and configuration
+${NS_NAME}   basic_13_ns_relations_test
+${NS_CONFIG}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${NS_TIMEOUT}   15min
+
+# SSH keys and username to be used
+${PUBLICKEY}   %{HOME}/.ssh/id_rsa.pub
+${PRIVATEKEY}   %{HOME}/.ssh/id_rsa
+${USERNAME}   ubuntu
+${PASSWORD}   ${EMPTY}
+
+${ACTION_NAME}   touch
+${VNF_MEMBER_INDEX_1}   vnf1
+${VNF_MEMBER_INDEX_2}   vnf2
+${DAY_1_FILE_NAME}   /home/ubuntu/first-touch
+${DAY_2_FILE_NAME_1}   /home/ubuntu/mytouch1
+${DAY_2_FILE_NAME_2}   /home/ubuntu/mytouch2
 
 
 *** Test Cases ***
 Create Charm VNF Descriptor Provides
-    [Tags]   ns_relations   charm   sanity   regression
-
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg1}'
-
+    [Documentation]   Upload VNF package for the testsuite with a charm providing a relation.
+    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG1}'
 
 Create Charm VNF Descriptor Requires
-    [Tags]   ns_relations   charm   sanity   regression
-
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg2}'
-
+    [Documentation]   Upload VNF package for the testsuite with a charm requiring a relation.
+    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG2}'
 
 Create Charm NS Descriptor
-    [Tags]   ns_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]   ns_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]   ns_relations   charm   sanity   regression  cleanup
-
-    Delete NS  ${ns_name}
-
+    [Documentation]   Delete NS instance.
+    [Tags]   cleanup
+    Delete NS   ${NS_NAME}
 
 Delete NS Descriptor
-    [Tags]   ns_relations   charm   sanity   regression  cleanup
-
-    Delete NSD  ${nsd_name}
-
+    [Documentation]   Delete NS package from OSM.
+    [Tags]   cleanup
+    Delete NSD   ${NSD_NAME}
 
 Delete VNF Descriptor Provides
-    [Tags]   ns_relations   charm   sanity   regression  cleanup
-
-    Delete VNFD  ${vnfd_name1}
-
+    [Documentation]   Delete first VNF package from OSM.
+    [Tags]   cleanup
+    Delete VNFD   ${VNFD_NAME1}
 
 Delete VNF Descriptor Requires
-    [Tags]   ns_relations   charm   sanity   regression  cleanup
-
-    Delete VNFD  ${vnfd_name2}
+    [Documentation]   Delete second VNF package from OSM.
+    [Tags]   cleanup
+    Delete VNFD   ${VNFD_NAME2}
 
 
 *** 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}
-
+    [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_NAME1}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${VNFD_NAME2}