diff options
| author |   DR695H <dr695h@att.com> | 2019-06-25 11:38:48 -0400 |
|---|---|---|
| committer | DR695H <dr695h@att.com> | 2019-06-25 11:38:48 -0400 |
| commit | 97cb0371f819f9dafbbf41301e2f844beea0351f (patch) | |
| tree | 8daa1657404d383c43075a999215a9c0d8f04924 /robot/resources | |
| parent | f4b64d4f774b780740bac5d9dd1542a208aff53f (diff) | |
dont hardcode public ip
Issue-ID: TEST-166
Change-Id: I824cd4527fabce93a60734f563c024de05d1f1da
Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources')
5 files changed, 9 insertions, 9 deletions
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index 0c5229a9..49c03892 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -168,7 +168,7 @@ APPC Mount Point ${server_list}= Get Openstack Servers auth ${vpg_name_0}= Get From Dictionary ${stack_info} vpg_name_0 ${vnf_id}= Get From Dictionary ${stack_info} vnf_id - ${vpg_public_ip}= Get Server Ip ${server_list} ${stack_info} vpg_name_0 network_name=public + ${vpg_public_ip}= Get Server Ip ${server_list} ${stack_info} vpg_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} # vpg_oam_ip is no longer needed - use vpg_public_ip #${vpg_oam_ip}= Get From Dictionary ${stack_info} vpg_private_ip_1 diff --git a/robot/resources/stack_validation/policy_check_vfw.robot b/robot/resources/stack_validation/policy_check_vfw.robot index 2be3995d..170d6388 100644 --- a/robot/resources/stack_validation/policy_check_vfw.robot +++ b/robot/resources/stack_validation/policy_check_vfw.robot @@ -41,8 +41,8 @@ Policy Check FirewallCL Stack ${vpg_unprotected_ip}= Get From Dictionary ${vpkg_stack_info} vpg_int_unprotected_private_ip_0 ${vsn_protected_ip}= Get From Dictionary ${vsnk_stack_info} vsn_int_protected_private_ip_0 - ${vpg_public_ip}= Get Server Ip ${server_list} ${vpkg_stack_info} vpg_name_0 network_name=public - ${vsn_public_ip}= Get Server Ip ${server_list} ${vsnk_stack_info} vsn_name_0 network_name=public + ${vpg_public_ip}= Get Server Ip ${server_list} ${vpkg_stack_info} vpg_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} + ${vsn_public_ip}= Get Server Ip ${server_list} ${vsnk_stack_info} vsn_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} ${upper_bound}= Evaluate ${policy_rate}*2 Wait Until Keyword Succeeds 30m 2s Run VFW Policy Check ${vpg_public_ip} ${policy_rate} ${upper_bound} 1 @@ -78,7 +78,7 @@ Policy Check vLB Stack ${stack_info}= Wait for Stack to Be Deployed auth ${stack_name} ${stack_id}= Get From Dictionary ${stack_info} id ${server_list}= Get Openstack Servers auth - ${vlb_public_ip}= Get Server Ip ${server_list} ${stack_info} vlb_name_0 network_name=public + ${vlb_public_ip}= Get Server Ip ${server_list} ${stack_info} vlb_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} ${upper_bound}= Evaluate ${policy_rate}*2 Start DNS Traffic ${vlb_public_ip} ${upper_bound} diff --git a/robot/resources/stack_validation/validate_dns_scaling.robot b/robot/resources/stack_validation/validate_dns_scaling.robot index 25ecc1ed..0778a2b2 100644 --- a/robot/resources/stack_validation/validate_dns_scaling.robot +++ b/robot/resources/stack_validation/validate_dns_scaling.robot @@ -26,7 +26,7 @@ Validate Dns Scaling Stack ${stack_id}= Get From Dictionary ${stack_info} id ${server_list}= Get Openstack Servers auth Log ${server_list} - ${vdns_public_ip}= Get Server Ip ${server_list} ${stack_info} vdns_name_0 network_name=public + ${vdns_public_ip}= Get Server Ip ${server_list} ${stack_info} vdns_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} Wait For Server ${vdns_public_ip} Log Accessed all servers #Wait for vDNS ${vdns_public_ip} diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot index a5a6acbc..4ef7f0c7 100644 --- a/robot/resources/stack_validation/validate_vfw.robot +++ b/robot/resources/stack_validation/validate_vfw.robot @@ -30,9 +30,9 @@ Validate Firewall Stack ${vpg_unprotected_ip}= Get From Dictionary ${stack_info} vpg_int_unprotected_private_ip_0 ${vsn_protected_ip}= Get From Dictionary ${stack_info} vsn_int_protected_private_ip_0 ${vpg_name_0}= Get From Dictionary ${stack_info} vpg_name_0 - ${vfw_public_ip}= Get Server Ip ${server_list} ${stack_info} vfw_name_0 network_name=public - ${vpg_public_ip}= Get Server Ip ${server_list} ${stack_info} vpg_name_0 network_name=public - ${vsn_public_ip}= Get Server Ip ${server_list} ${stack_info} vsn_name_0 network_name=public + ${vfw_public_ip}= Get Server Ip ${server_list} ${stack_info} vfw_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} + ${vpg_public_ip}= Get Server Ip ${server_list} ${stack_info} vpg_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} + ${vsn_public_ip}= Get Server Ip ${server_list} ${stack_info} vsn_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} Wait For Server ${vfw_public_ip} Wait For Server ${vpg_public_ip} diff --git a/robot/resources/stack_validation/validate_vlb.robot b/robot/resources/stack_validation/validate_vlb.robot index 6e5c58ba..8905ad2f 100644 --- a/robot/resources/stack_validation/validate_vlb.robot +++ b/robot/resources/stack_validation/validate_vlb.robot @@ -17,7 +17,7 @@ Validate vLB Stack ${stack_id}= Get From Dictionary ${stack_info} id ${server_list}= Get Openstack Servers auth Log Returned from Get Openstack Servers - ${vlb_public_ip}= Get Server Ip ${server_list} ${stack_info} vlb_name_0 network_name=public + ${vlb_public_ip}= Get Server Ip ${server_list} ${stack_info} vlb_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} Log Waiting for ${vlb_public_ip} to reconfigure # Server validations diabled due to issues with load balancer network reconfiguration # at startup hanging the robot scripts so just sleep |