diff options
| author |   Jerry Flood <jf9860@att.com> | 2017-10-11 11:09:19 -0400 |
|---|---|---|
| committer | Jerry Flood <jf9860@att.com> | 2017-10-11 11:16:23 -0400 |
| commit | 3fc36a390f863a47a03a994acb0d76ee220292b0 (patch) | |
| tree | fa77ccab365c04f5cc98f264d0353261e7ec120f /robot/testsuites | |
| parent | 26c6fc25f20d90e87f08f443058fc2356fe8bea7 (diff) | |
Update HEAT and support in demo.sh
Issue: TEST-65
Change-Id: If9cea0cecfd5ac8fa40499995fba72bfa66f61a2
Signed-off-by: Jerry Flood <jf9860@att.com>
Diffstat (limited to 'robot/testsuites')
| -rw-r--r-- | robot/testsuites/update_onap_page.robot | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/robot/testsuites/update_onap_page.robot b/robot/testsuites/update_onap_page.robot index d4eb6162..2f8ca167 100644 --- a/robot/testsuites/update_onap_page.robot +++ b/robot/testsuites/update_onap_page.robot @@ -8,7 +8,7 @@ Resource ../resources/openstack/keystone_interface.robot Resource ../resources/openstack/nova_interface.robot -Test Timeout 1 minutes +Test Timeout 5 minutes *** Variables *** ${URLS_HTML_TEMPLATE} robot/assets/templates/web/index.html.template @@ -70,12 +70,20 @@ Get Public Ip ${servers} Get Dictionary Values ${server_map} :for ${server} in @{servers} \ ${status} ${public_ip} Run Keyword And Ignore Error Search Addresses ${server} ${oam_ip} - \ Return From Keyword If '${status}' == 'PASS' ${public_ip} + \ Return From Keyword If '${status}'=='PASS' ${public_ip} Fail ${oam_ip} Server Not Found Search Addresses [Arguments] ${server} ${oam_ip} ${addresses} Get From Dictionary ${server} addresses + ${status} ${public_ip}= Run Keyword And Ignore Error Find Rackspace ${addresses} ${oam_ip} + Return From Keyword If '${status}'=='PASS' ${public_ip} + ${status} ${public_ip}= Run Keyword And Ignore Error Find Openstack ${addresses} ${oam_ip} + Return From Keyword If '${status}'=='PASS' ${public_ip} + Fail ${oam_ip} Server Not Found + +Find Rackspace + [Arguments] ${addresses} ${oam_ip} ${public_ips} Get From Dictionary ${addresses} public ${public_ip}= Get V4 IP ${public_ips} ${oam_ips} Get From Dictionary ${addresses} ${GLOBAL_INJECTED_NETWORK} @@ -83,10 +91,28 @@ Search Addresses Return From Keyword If '${this_oam_ip}' == '${oam_ip}' ${public_ip} Fail ${oam_ip} Server Not Found +Find Openstack + [Arguments] ${addresses} ${oam_ip} + ${ips} Get From Dictionary ${addresses} ${GLOBAL_INJECTED_NETWORK} + ${public_ip}= Get V4 IP Openstack ${ips} floating + ##${oam_ips} Get From Dictionary ${addresses} ${GLOBAL_INJECTED_NETWORK} + ${this_oam_ip}= Get V4 IP Openstack ${ips} fixed + Return From Keyword If '${this_oam_ip}'=='${oam_ip}' ${public_ip} + Fail ${oam_ip} Server Not Found + Get V4 IP [Arguments] ${ipmaps} :for ${ipmap} in @{ipmaps} \ ${ip} Get From Dictionary ${ipmap} addr \ ${version} Get From Dictionary ${ipmap} version \ Return from Keyword if '${version}' == '4' ${ip} - Fail No Version 4 IP
\ No newline at end of file + Fail No Version 4 IP + +Get V4 IP Openstack + [Arguments] ${ipmaps} ${testtype} + :for ${ipmap} in @{ipmaps} + \ ${type} Get From Dictionary ${ipmap} OS-EXT-IPS:type + \ ${ip} Get From Dictionary ${ipmap} addr + \ ${version} Get From Dictionary ${ipmap} version + \ Return from Keyword if '${version}'=='4' and '${type}'=='${testtype}' ${ip} + Fail No Version 4 IP
\ No newline at end of file |