X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_06-k8s_secure_key_management.robot;h=40611ab934af945d29918622fc62a868b1d06f0d;hb=61bbf92c1b2a4563f1636f053a4846b669161714;hp=3bbe5b06a29a9ad443de450e55e5ab78a26373cf;hpb=576487e73575ad72071aa5680b8d17b2d8ff8027;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 3bbe5b0..40611ab 100644
--- a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
+++ b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [K8s-06] K8s Secure Key Management.
+Documentation   [K8s-06] K8s Secure Key Management.
 
 Library   OperatingSystem
 Library   SSHLibrary
@@ -45,8 +45,8 @@ ${username}   ubuntu
 ${password}   ${EMPTY}
 
 ${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
@@ -55,88 +55,94 @@ ${ns_timeout}   15min
 
 *** Test Cases ***
 Create Charm VNF Descriptor
-
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+    [Tags]   prepare
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create Charm NS Descriptor
-
-    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
+    [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}
 
-    ${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
-
-    ${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}
-    ${ip_addr_2}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index_2}
-    log  ${ip_addr_2}
-    Set Suite Variable  ${vnf_2_ip_addr}  ${ip_addr_2}
+    [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}
+    ${ip_addr_2}   Get Vnf Management Ip Address   ${ns_id}   ${vnf_member_index_2}
+    log   ${ip_addr_2}
+    Set Suite Variable   ${vnf_2_ip_addr}   ${ip_addr_2}
 
 
 Test SSH Access
-
-    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
-    Test SSH Connection  ${vnf_1_ip_addr}  ${username}  ${password}  ${privatekey}
-    Test SSH Connection  ${vnf_2_ip_addr}  ${username}  ${password}  ${privatekey}
+    [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
+    Test SSH Connection   ${vnf_1_ip_addr}   ${username}   ${password}   ${privatekey}
+    Test SSH Connection   ${vnf_2_ip_addr}   ${username}   ${password}   ${privatekey}
 
 
 Check Remote Files Created Via Day 1 Operations
-    [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.
+    [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.
 
-    Check If remote File Exists  ${vnf_1_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_1_file_name}
-    Check If remote File Exists  ${vnf_2_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_1_file_name}
+    Check If remote File Exists   ${vnf_1_ip_addr}   ${username}   ${password}   ${privatekey}   ${day_1_file_name}
+    Check If remote File Exists   ${vnf_2_ip_addr}   ${username}   ${password}   ${privatekey}   ${day_1_file_name}
 
 
 Execute Day 2 Operations
-    [Documentation]     Performs one Day 2 operation per VNF that creates a new file.
+    [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
-    ${ns_op_id_1}=  Execute NS Action  ${ns_name}  ${action_name}  ${vnf_member_index_1}  filename=${day_2_file_name_1}
-    ${ns_op_id_2}=  Execute NS Action  ${ns_name}  ${action_name}  ${vnf_member_index_2}  filename=${day_2_file_name_2}
+    Variable Should Exist   ${ns_id}   msg=Network service instance is not available
+    ${ns_op_id_1}=   Execute NS Action   ${ns_name}   ${action_name}   ${vnf_member_index_1}   filename=${day_2_file_name_1}
+    ${ns_op_id_2}=   Execute NS Action   ${ns_name}   ${action_name}   ${vnf_member_index_2}   filename=${day_2_file_name_2}
 
 
 Check Remote Files Created Via Day 2 Operations
-    [Documentation]     Check whether the files created in the previous test via Day 2 operations exist or not.
+    [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}
-    Check If remote File Exists  ${vnf_2_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_2_file_name_2}
+    Check If remote File Exists   ${vnf_1_ip_addr}   ${username}   ${password}   ${privatekey}   ${day_2_file_name_1}
+    Check If remote File Exists   ${vnf_2_ip_addr}   ${username}   ${password}   ${privatekey}   ${day_2_file_name_2}
 
 
 Delete NS Instance
     [Tags]   cleanup
 
-    Delete NS  ${ns_name}
+    Delete NS   ${ns_name}
 
 
 Delete NS Descriptor
     [Tags]   cleanup
 
-    Delete NSD  ${nsd_name}
+    Delete NSD   ${nsd_name}
 
 
 Delete VNF Descriptor
     [Tags]   cleanup
 
-    Delete VNFD  ${vnfd_name}
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
+    [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 NS   ${ns_name}
 
-    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
+    Run Keyword If Any Tests Failed   Delete NSD   ${nsd_name}
 
-    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_name}