diff options
Diffstat (limited to 'robot/testsuites')
| -rw-r--r-- | robot/testsuites/update_onap_page.robot | 57 |
1 files changed, 41 insertions, 16 deletions
diff --git a/robot/testsuites/update_onap_page.robot b/robot/testsuites/update_onap_page.robot index 2f8ca167..b8b0782c 100644 --- a/robot/testsuites/update_onap_page.robot +++ b/robot/testsuites/update_onap_page.robot @@ -29,19 +29,20 @@ Update ONAP Page ${server_map}= Get Openstack Servers auth ${oam_ip_map}= Create Dictionary Set To Dictionary ${oam_ip_map} 10.0.0.1=onapdns - Set To Dictionary ${oam_ip_map} 10.0.1.1=aai - Set To Dictionary ${oam_ip_map} 10.0.2.1=appc - Set To Dictionary ${oam_ip_map} 10.0.3.1=sdc - Set To Dictionary ${oam_ip_map} 10.0.4.1=dcae_controller + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_AAI1_IP_ADDR}=aai1 + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_AAI2_IP_ADDR}=aai2 + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_APPC_IP_ADDR}=appc + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_DCAE_IP_ADDR}=dcae_controller + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SO_IP_ADDR}=mso + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_MR_IP_ADDR}=message_router + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_POLICY_IP_ADDR}=policy + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_PORTAL_IP_ADDR}=portal + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SDC_IP_ADDR}=sdc + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SDNC_IP_ADDR}=sdnc + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_VID_IP_ADDR}=vid Set To Dictionary ${oam_ip_map} 10.0.4.105=dcae_cdap Set To Dictionary ${oam_ip_map} 10.0.4.102=dcae_coll - Set To Dictionary ${oam_ip_map} 10.0.5.1=mso - Set To Dictionary ${oam_ip_map} 10.0.6.1=policy - Set To Dictionary ${oam_ip_map} 10.0.7.1=sdnc - Set To Dictionary ${oam_ip_map} 10.0.8.1=vid - Set To Dictionary ${oam_ip_map} 10.0.9.1=portal Set To Dictionary ${oam_ip_map} 10.0.10.1=robot - Set To Dictionary ${oam_ip_map} 10.0.11.1=message_router ${values}= Create Dictionary ${keys}= Get Dictionary Keys ${oam_ip_map} @@ -50,6 +51,13 @@ Update ONAP Page \ Set Public Ip ${server_map} ${oam_ip} ${value_name} ${values} Log ${values} Run Keyword If '${WEB_PASSWORD}' != '' Create File ${CREDENTIALS_FILE} ${WEB_USER}:${WEB_PASSWORD} + Set To Dictionary ${values} GLOBAL_INJECTED_ARTIFACTS_VERSION=${GLOBAL_INJECTED_ARTIFACTS_VERSION} + Set To Dictionary ${values} GLOBAL_INJECTED_NETWORK=${GLOBAL_INJECTED_NETWORK} + Set To Dictionary ${values} GLOBAL_INJECTED_NEXUS_DOCKER_REPO=${GLOBAL_INJECTED_NEXUS_DOCKER_REPO} + Set To Dictionary ${values} GLOBAL_INJECTED_NEXUS_REPO=${GLOBAL_INJECTED_NEXUS_REPO} + Set To Dictionary ${values} GLOBAL_INJECTED_OPENSTACK_TENANT_ID=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} + Set To Dictionary ${values} GLOBAL_INJECTED_REGION=${GLOBAL_INJECTED_REGION} + Set To Dictionary ${values} GLOBAL_INJECTED_KEYSTONE=${GLOBAL_INJECTED_KEYSTONE} Create File From Template ${URLS_HTML_TEMPLATE} ${URLS_HTML} ${values} *** Keywords *** @@ -80,6 +88,8 @@ Search Addresses 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} + ${status} ${public_ip}= Run Keyword And Ignore Error Find Openstack 2 ${addresses} ${oam_ip} + Return From Keyword If '${status}'=='PASS' ${public_ip} Fail ${oam_ip} Server Not Found Find Rackspace @@ -92,11 +102,17 @@ Find Rackspace 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 + [Arguments] ${addresses} ${oam_ip} + ${public_ip}= Get V4 IP Openstack ${addresses} external + ${this_oam_ip}= Get V4 IP Openstack ${addresses} ${GLOBAL_INJECTED_NETWORK} + Return From Keyword If '${this_oam_ip}'=='${oam_ip}' ${public_ip} + Fail ${oam_ip} Server Not Found + +Find Openstack 2 + [Arguments] ${addresses} ${oam_ip} + ${ipmaps}= Get From DIctionary ${addresses} ${GLOBAL_INJECTED_NETWORK} + ${public_ip}= Get V4 IP Openstack 2 ${ipmaps} floating + ${this_oam_ip}= Get V4 IP Openstack 2 ${ipmaps} fixed Return From Keyword If '${this_oam_ip}'=='${oam_ip}' ${public_ip} Fail ${oam_ip} Server Not Found @@ -109,10 +125,19 @@ Get V4 IP Fail No Version 4 IP Get V4 IP Openstack + [Arguments] ${addresses} ${testtype} + ${ipmaps}= Get From Dictionary ${addresses} ${testtype} + :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 + +Get V4 IP Openstack 2 [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 + Fail No Version 4 IP
\ No newline at end of file |