Updated VNF member identifier

[osm/tests.git] / robot-systest / testsuite / basic_13-ns_relations.robot

diff --git a/robot-systest/testsuite/basic_13-ns_relations.robot b/robot-systest/testsuite/basic_13-ns_relations.robot
index 04c0cff..eb8b352 100644 (file)
--- a/robot-systest/testsuite/basic_13-ns_relations.robot
+++ b/robot-systest/testsuite/basic_13-ns_relations.robot
@@ -20,47 +20,57 @@ 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_13-ns_relations.py
+Force Tags   basic_13    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 ***
+# 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}
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
 ${action_name}   touch
-${vnf_member_index_1}   1
-${vnf_member_index_2}   2
+${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
-${ns_timeout}   15min
 
 
 *** Test Cases ***
 Create Charm VNF Descriptor Provides
-    [Tags]   ns_relations   charm   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg1}'
 
 
 Create Charm VNF Descriptor Requires
-    [Tags]   ns_relations   charm   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg2}'
 
 
 Create Charm NS Descriptor
-    [Tags]   ns_relations   charm   sanity   regression
 
     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}
@@ -70,36 +80,36 @@ Instantiate Charm Network Service
 
 
 Delete NS Instance
-    [Tags]   ns_relations   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   ns_relations   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor Provides
-    [Tags]   ns_relations   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name1}
 
 
 Delete VNF Descriptor Requires
-    [Tags]   ns_relations   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name2}
 
 
 *** Keywords ***
-Test Cleanup
+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}