Revert "Revert "Modified testsuites to remove resource files""

[osm/tests.git] / robot-systest / testsuite / basic_07-secure_key_management.robot

diff --git a/robot-systest/testsuite/basic_07-secure_key_management.robot b/robot-systest/testsuite/basic_07-secure_key_management.robot
index 9ef5da3..8d57bb6 100644 (file)
--- a/robot-systest/testsuite/basic_07-secure_key_management.robot
+++ b/robot-systest/testsuite/basic_07-secure_key_management.robot
@@ -21,46 +21,51 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_07-secure_key_management_data.py
-
 Force Tags   basic_07   cluster_ee_config   daily   regression   sanity
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   charm-packages/nopasswd_proxy_charm_vnf
+${vnfd_name}   nopasswd_proxy_charm-vnf
+${nsd_pkg}   charm-packages/nopasswd_proxy_charm_ns
+${nsd_name}   nopasswd_proxy_charm-ns
+
+# NS instance name and configuration
+${ns_name}   basic_07_secure_key_management
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${ns_timeout}   15min
+
+# SSH username and passwod
 ${username}   ubuntu
 ${password}   osm4u
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
 ${action_name}   touch
 ${vnf_member_index}   1
 ${day_1_file_name}   /home/ubuntu/first-touch
 ${day_2_file_name}   /home/ubuntu/mytouch1
-${ns_timeout}   15min
 
 
 *** Test Cases ***
 Create Nopasswd Charm VNF Descriptor
-    [Tags]   nopasswd   charm   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create Nopasswd Charm NS Descriptor
-    [Tags]   nopasswd   charm   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Nopasswd Charm Network Service
-    [Tags]   nopasswd   charm   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${EMPTY}  ${ns_timeout}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get Management Ip Addresses
-    [Tags]   nopasswd   charm   sanity   regression
 
     ${ip_addr}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index}
     log  ${ip_addr}
@@ -68,7 +73,6 @@ Get Management Ip Addresses
 
 
 Test SSH Access
-    [Tags]   nopasswd   charm   sanity   regression
 
     Variable Should Exist  ${vnf_ip_addr}  msg=IP address of the management VNF is not available
     Sleep  30s  Waiting ssh daemon to be up
@@ -78,14 +82,12 @@ Test SSH Access
 Check Remote Files Created Via Day 1 Operations
     [Documentation]     The Nopasswd VNF has a Day 1 operation that creates a file named ${day_1_file_name} and performs it without password.
     ...                 This test checks whether that files have been created or not.
-    [Tags]   nopasswd   charm   sanity   regression
 
     Check If remote File Exists  ${vnf_ip_addr}  ${username}  ${password}  ${EMPTY}  ${day_1_file_name}
 
 
 Execute Day 2 Operations
     [Documentation]     Performs one Day 2 operation that creates a new file, this action is executed without password too.
-    [Tags]   nopasswd   charm   sanity   regression
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     ${ns_op_id}=  Execute NS Action  ${ns_name}  ${action_name}  ${vnf_member_index}  filename=${day_2_file_name}
@@ -93,25 +95,24 @@ Execute Day 2 Operations
 
 Check Remote Files Created Via Day 2 Operations
     [Documentation]     Check whether the file created in the previous test via Day 2 operation exists or not.
-    [Tags]   nopasswd   charm   sanity   regression
 
     Check If remote File Exists  ${vnf_ip_addr}  ${username}  ${password}  ${EMPTY}  ${day_2_file_name}
 
 
 Delete NS Instance
-    [Tags]   nopasswd   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   nopasswd   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   nopasswd   charm   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name}