X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_06-k8s_secure_key_management.robot;h=6b8d3cfd41da5948ce2ee2c6a64636ce6d90aa16;hb=f25782945b1e3db0a2442c572a5f8607bb42460e;hp=d12153daf17b7d58204c7cc2a8b81b629f4e474c;hpb=4cf45d797499817b5f639bd6245c3f84e762de14;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
index d12153d..6b8d3cf 100644
--- a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
+++ b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
@@ -21,20 +21,32 @@ 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/k8s_06-k8s_secure_key_management_data.py
-
 Force Tags   k8s_06   cluster_ee_config   cluster_k8s_charms   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   charm-packages/nopasswd_k8s_proxy_charm_vnf
+${vnfd_name}   nopasswd_k8s_proxy_charm-vnf
+${nsd_pkg}   charm-packages/nopasswd_k8s_proxy_charm_ns
+${nsd_name}   nopasswd_k8s_proxy_charm-ns
+
+# NS instance name and configuration
+${ns_name}   k8s_06-nopasswd_k8s_proxy_charm
+${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
@@ -43,23 +55,26 @@ ${ns_timeout}   15min
 
 *** Test Cases ***
 Create Charm VNF Descriptor
-
+    [Tags]   prepare
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create Charm NS Descriptor
-
+    [Tags]   prepare
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Charm Network Service
-
+    [Tags]   prepare
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}  ${ns_timeout}
-    Set Suite Variable  ${ns_id}  ${id}
 
+Get Ns Id
+    [Tags]   verify
+    ${id}=   Get Ns Id   ${ns_name}
+    Set Suite Variable   ${ns_id}   ${id}
 
 Get Management Ip Addresses
-
+    [Tags]   verify
     ${ip_addr_1}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index_1}
     log  ${ip_addr_1}
     Set Suite Variable  ${vnf_1_ip_addr}  ${ip_addr_1}
@@ -69,7 +84,7 @@ Get Management Ip Addresses
 
 
 Test SSH Access
-
+    [Tags]   verify
     Variable Should Exist  ${vnf_1_ip_addr}  msg=IP address of the management VNF '${vnf_member_index_1}' is not available
     Variable Should Exist  ${vnf_2_ip_addr}  msg=IP address of the management VNF '${vnf_member_index_2}' is not available
     Sleep  30s  Waiting ssh daemon to be up
@@ -78,6 +93,7 @@ Test SSH Access
 
 
 Check Remote Files Created Via Day 1 Operations
+    [Tags]   verify
     [Documentation]     The Charm VNF has a Day 1 operation that creates a file named ${day_1_file_name}.
     ...                 This test checks whether that files have been created or not.
 
@@ -86,6 +102,7 @@ Check Remote Files Created Via Day 1 Operations
 
 
 Execute Day 2 Operations
+    [Tags]   verify
     [Documentation]     Performs one Day 2 operation per VNF that creates a new file.
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
@@ -94,6 +111,7 @@ Execute Day 2 Operations
 
 
 Check Remote Files Created Via Day 2 Operations
+    [Tags]   verify
     [Documentation]     Check whether the files created in the previous test via Day 2 operations exist or not.
 
     Check If remote File Exists  ${vnf_1_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_2_file_name_1}