TEST-4 Re-factor openstack region variable

Change-Id: Iad9ef0555dbbd921e261bfa2a63806100bcf7c83
Signed-off-by: jf9860 <jf9860@att.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/robot/resources/stack_validation/validate_dns_scaling.robot b/robot/resources/stack_validation/validate_dns_scaling.robot
index f63479ea..41c04633 100644
--- a/robot/resources/stack_validation/validate_dns_scaling.robot
+++ b/robot/resources/stack_validation/validate_dns_scaling.robot
@@ -21,23 +21,22 @@ ${ASSETS}              ${EXECDIR}/robot/assets/
 
 *** Keywords ***
 Validate Dns Scaling Stack
-    [Documentation]    Identifies the servers in the STACK_NAME in the GLOBAL_OPENSTACK_SERVICE_REGION
-    [Arguments]    ${STACK_NAME}    
+    [Documentation]    Wait for the DNS scaling stack to be instantiated
+    [Arguments]    ${STACK_NAME}
     Run Openstack Auth Request    auth
     ${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 
+    ${server_list}=    Get Openstack Servers    auth
     Log     ${server_list}
-    #${vpg_unprotected_ip}=    Get From Dictionary    ${stack_info}    vpg_private_ip_0
-    #${vsn_protected_ip}=    Get From Dictionary    ${stack_info}    vsn_private_ip_0
-    ${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=public
     Wait For Server    ${vdns_public_ip}
     Log    Accessed all servers
     #Wait for vDNS    ${vdns_public_ip}
     Log    All server processes up
 
 Wait For vDNS
-    [Documentation]     Wait for the defined firewall processes to come up
-    [Arguments]    ${ip}    
-    Wait for Process on Host    java DNSServer     ${ip}    
+    [Documentation]     Wait for the DNSServer to be running on the scaling DNS.
+    ...  Disabled. Potential for robot to hang due to network reconfigurations at startup.
+    [Arguments]    ${ip}
+    Wait for Process on Host    java DNSServer     ${ip}