diff options
| author |   Daniel Rose <DR695H@list.att.com> | 2017-03-31 14:35:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-03-31 14:35:09 +0000 |
| commit | 308ba6b851750b2fccca7c94a5396f62e302ed84 (patch) | |
| tree | e3e1be8842161917e170518c9f9f1e4b9e85cf50 /robot/resources/stack_validation | |
| parent | ebf5a03019f7952d1753bef9cb7a3a15a8abebcb (diff) | |
| parent | 9b5e79fe062a3feef87ac76145ddb93470cba607 (diff) | |
Merge "TEST-16 Create global variable for default key"
Diffstat (limited to 'robot/resources/stack_validation')
6 files changed, 11 insertions, 20 deletions
diff --git a/robot/resources/stack_validation/policy_check_vfw.robot b/robot/resources/stack_validation/policy_check_vfw.robot index 126f437e..22340729 100644 --- a/robot/resources/stack_validation/policy_check_vfw.robot +++ b/robot/resources/stack_validation/policy_check_vfw.robot @@ -21,7 +21,6 @@ Resource ../../resources/test_templates/vnf_orchestration_test_template *** Variables *** -${ASSETS} ${EXECDIR}/robot/assets/ *** Keywords *** Policy Check Firewall Stack diff --git a/robot/resources/stack_validation/validate_common.robot b/robot/resources/stack_validation/validate_common.robot index eb7f9f5a..24f9fe33 100644 --- a/robot/resources/stack_validation/validate_common.robot +++ b/robot/resources/stack_validation/validate_common.robot @@ -16,36 +16,32 @@ Resource packet_generator_interface.robot *** Variables *** -${ASSETS} ${EXECDIR}/robot/assets/ -${VFW_STACK_NAME} EcompETE_VFWStack -${VLB_STACK_NAME} EcompETE_VLBStack -${DNS_STACK_NAME} EcompETE_DNSStack *** Keywords *** Wait For Server - [Documentation] Attempts to login to the passed server info and verify (??). Uses server info to get public ip and locate corresponding provate key file + [Documentation] Attempts to login to the passed server info and verify (??). Uses server info to get public ip and locate corresponding provate key file [Arguments] ${server_ip} ${timeout}=300s - ${file}= Catenate ${ASSETS}keys/robot_ssh_private_key.pvt + ${file}= Catenate ${GLOBAL_VM_PRIVATE_KEY} Wait Until Keyword Succeeds ${timeout} 5 sec Open Connection And Log In ${server_ip} root ${file} - ${lines}= Grep Local File "Accepted publickey" /var/log/auth.log - Log ${lines} + ${lines}= Grep Local File "Accepted publickey" /var/log/auth.log + Log ${lines} Should Not Be Empty ${lines} - -Get Server Ip + +Get Server Ip [Arguments] ${server_list} ${stack_info} ${key_name} ${network_name}=public ${server_name}= Get From Dictionary ${stack_info} ${key_name} ${server}= Get From Dictionary ${server_list} ${server_name} Log Entering Get Openstack Server Ip - ${ip}= Get Openstack Server Ip ${server} network_name=${network_name} + ${ip}= Get Openstack Server Ip ${server} network_name=${network_name} Log Returned Get Openstack Server Ip - [Return] ${ip} + [Return] ${ip} Find And Reboot The Server - [Documentation] Code to reboot the server by teh heat server name parameter value + [Documentation] Code to reboot the server by teh heat server name parameter value [Arguments] ${stack_info} ${server_list} ${server_name_parameter} ${server_name}= Get From Dictionary ${stack_info} ${server_name_parameter} ${vfw_server}= Get From Dictionary ${server_list} ${server_name} ${vfw_server_id}= Get From Dictionary ${vfw_server} id Reboot Server auth ${vfw_server_id} - - + + diff --git a/robot/resources/stack_validation/validate_dns_scaling.robot b/robot/resources/stack_validation/validate_dns_scaling.robot index 41c04633..b4556591 100644 --- a/robot/resources/stack_validation/validate_dns_scaling.robot +++ b/robot/resources/stack_validation/validate_dns_scaling.robot @@ -17,7 +17,6 @@ Resource validate_common.robot *** Variables *** -${ASSETS} ${EXECDIR}/robot/assets/ *** Keywords *** Validate Dns Scaling Stack diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot index a5322efb..b0d591fb 100644 --- a/robot/resources/stack_validation/validate_vfw.robot +++ b/robot/resources/stack_validation/validate_vfw.robot @@ -18,7 +18,6 @@ Resource validate_common.robot *** Variables *** -${ASSETS} ${EXECDIR}/robot/assets/ *** Keywords *** Validate Firewall Stack diff --git a/robot/resources/stack_validation/validate_vlb.robot b/robot/resources/stack_validation/validate_vlb.robot index eef578ab..bab15648 100644 --- a/robot/resources/stack_validation/validate_vlb.robot +++ b/robot/resources/stack_validation/validate_vlb.robot @@ -8,7 +8,6 @@ Resource validate_common.robot *** Variables *** -${ASSETS} ${EXECDIR}/robot/assets/ *** Keywords *** Validate vLB Stack diff --git a/robot/resources/stack_validation/validate_vvg.robot b/robot/resources/stack_validation/validate_vvg.robot index 47d9600a..05b1e8a5 100644 --- a/robot/resources/stack_validation/validate_vvg.robot +++ b/robot/resources/stack_validation/validate_vvg.robot @@ -7,7 +7,6 @@ Resource validate_common.robot *** Variables *** -${ASSETS} ${EXECDIR}/robot/assets/ *** Keywords *** Validate vVG Stack |