X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_07-secure_key_management.robot;h=506e2a3016f3e7adab42ff3986ad811c8055b410;hb=HEAD;hp=9ef5da30951e5476a5399135e28f9ef06348619b;hpb=4cf45d797499817b5f639bd6245c3f84e762de14;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_07-secure_key_management.robot b/robot-systest/testsuite/basic_07-secure_key_management.robot
index 9ef5da3..506e2a3 100644
--- a/robot-systest/testsuite/basic_07-secure_key_management.robot
+++ b/robot-systest/testsuite/basic_07-secure_key_management.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,119 +11,120 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+
 *** Settings ***
-Documentation     [BASIC-07] Secure key management.
+Documentation   [BASIC-07] Secure key management.
 
 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
-
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_07-secure_key_management_data.py
+Resource   ../lib/vnfd_lib.resource
+Resource   ../lib/nsd_lib.resource
+Resource   ../lib/ns_lib.resource
+Resource   ../lib/ns_operation_lib.resource
+Resource   ../lib/ssh_lib.resource
 
-Force Tags   basic_07   cluster_ee_config   daily   regression   sanity
+Test Tags   basic_07   cluster_ee_config   regression   azure
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-${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
+# 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
 
-*** Test Cases ***
-Create Nopasswd Charm VNF Descriptor
-    [Tags]   nopasswd   charm   sanity   regression
-
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+# SSH username and passwod
+${USERNAME}   ubuntu
+${PASSWORD}   osm4u
 
+${ACTION_NAME}   touch
+${VNF_MEMBER_INDEX}   vnf1
+${DAY_1_FILE_NAME}   /home/ubuntu/first-touch
+${DAY_2_FILE_NAME}   /home/ubuntu/mytouch1
 
-Create Nopasswd Charm NS Descriptor
-    [Tags]   nopasswd   charm   sanity   regression
 
-    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
+*** Test Cases ***
+Create Nopasswd Charm VNF Descriptor
+    [Documentation]   Upload VNF package for the testsuite.
+    [Tags]   prepare
+    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG}'
 
+Create Nopasswd Charm NS Descriptor
+    [Documentation]   Upload NS package for the testsuite.
+    [Tags]   prepare
+    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}
+    [Documentation]   Instantiate NS for the testsuite.
+    [Tags]   prepare
+    ${id}=   Create Network Service   ${NSD_NAME}   %{VIM_TARGET}   ${NS_NAME}   ${NS_CONFIG}   ${EMPTY}   ${NS_TIMEOUT}
+    Log   ${id}
 
+Get Ns Id
+    [Documentation]   Get NS instance id.
+    [Tags]   verify
+    ${id}=   Get Ns Id   ${NS_NAME}
+    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}
-    Set Suite Variable  ${vnf_ip_addr}  ${ip_addr}
-
+    [Documentation]   Get the mgmt IP address of the VNF of the NS.
+    [Tags]   verify
+    ${ip_addr}=   Get Vnf Management Ip Address   ${NS_ID}   ${VNF_MEMBER_INDEX}
+    Log   ${ip_addr}
+    Set Suite Variable   ${VNF_IP_ADDR}   ${ip_addr}
 
 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
-    Test SSH Connection  ${vnf_ip_addr}  ${username}  ${password}  ${EMPTY}
-
+    [Documentation]   Check that the VNF is accessible via SSH in its mgmt IP address.
+    [Tags]   verify
+    Variable Should Exist   ${VNF_IP_ADDR}   msg=IP address of the management VNF is not available
+    Sleep   30s   Waiting ssh daemon to be up
+    Test SSH Connection   ${VNF_IP_ADDR}   ${USERNAME}   ${PASSWORD}   ${EMPTY}
 
 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}
-
+    [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]   verify
+    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}
-
+    [Documentation]   Performs one Day 2 operation that creates a new file, this action is executed without password too.
+    [Tags]   verify
+    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}
+    Log   ${ns_op_id}
 
 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}
-
+    [Documentation]   Check whether the file created in the previous test via Day 2 operation exists or not.
+    [Tags]   verify
+    Check If Remote File Exists   ${VNF_IP_ADDR}   ${USERNAME}   ${PASSWORD}   ${EMPTY}   ${DAY_2_FILE_NAME}
 
 Delete NS Instance
-    [Tags]   nopasswd   charm   sanity   regression  cleanup
-
-    Delete NS  ${ns_name}
-
+    [Documentation]   Delete NS instance.
+    [Tags]   cleanup
+    Delete NS   ${NS_NAME}
 
 Delete NS Descriptor
-    [Tags]   nopasswd   charm   sanity   regression  cleanup
-
-    Delete NSD  ${nsd_name}
-
+    [Documentation]   Delete NS package from OSM.
+    [Tags]   cleanup
+    Delete NSD   ${NSD_NAME}
 
 Delete VNF Descriptor
-    [Tags]   nopasswd   charm   sanity   regression  cleanup
-
-    Delete VNFD  ${vnfd_name}
+    [Documentation]   Delete VNF package from OSM.
+    [Tags]   cleanup
+    Delete VNFD   ${VNFD_NAME}
 
 
 *** 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_NAME}