TEST-4 Re-factor openstack region variable

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

1 files changed, 27 insertions, 27 deletions

diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot
index efee279a..b36d09f1 100644
--- a/robot/resources/openstack/nova_interface.robot
+++ b/robot/resources/openstack/nova_interface.robot
@@ -3,7 +3,7 @@ Documentation     The main interface for interacting with Openstack. It handles
 Library           OpenstackLibrary
 Library 	      RequestsLibrary
 Library 	      JSONUtils
-Library	          UUID      
+Library	          UUID
 Library    OperatingSystem
 Library    Collections
 Resource    ../global_properties.robot
@@ -26,7 +26,7 @@ ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE}    robot/assets/templates/nova_add_server
 Get Openstack Keypair
     [Documentation]    Runs an Openstack Request and returns the keypair info
     [Arguments]    ${alias}    ${keypair_name}
-    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_KEYPAIR_PATH}    /${keypair_name}
+    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_KEYPAIR_PATH}    /${keypair_name}
     [Return]    ${resp.json()}
 
 Add Openstack Keypair
@@ -36,58 +36,58 @@ Add Openstack Keypair
     ${ssh_key}=    OperatingSystem.Get File     ${OPENSTACK_NOVA_KEYPAIR_SSH_KEY}
     ${arguments}=    Create Dictionary    name=${name}	    publickey=${ssh_key}
     ${data}=	Fill JSON Template    ${data_template}    ${arguments}
-    ${resp}=    Internal Post Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_KEYPAIR_PATH}    data_path=    data=${data}
+    ${resp}=    Internal Post Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_KEYPAIR_PATH}    data_path=    data=${data}
     Should Be Equal As Strings    200  ${resp.status_code}
     [Return]    ${resp.json()['keypair']['name']}
 
 Delete Openstack Keypair
     [Documentation]    Runs an Openstack Request to delete a keypair
     [Arguments]    ${alias}    ${keypair_name}
-    ${resp}=    Internal Delete Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_KEYPAIR_PATH}	  /${keypair_name}  
+    ${resp}=    Internal Delete Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_KEYPAIR_PATH}	  /${keypair_name}
     ${status_string}=    Convert To String    ${resp.status_code}
-    Should Match Regexp    ${status_string}    ^(204|202|200)$    
+    Should Match Regexp    ${status_string}    ^(204|202|200)$
     [Return]    ${resp.text}
 
 
 Get Openstack Servers
     [Documentation]    Returns the list of servers as a dictionary by name
     [Arguments]    ${alias}
-    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_SERVERS_PATH}    /detail
+    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_SERVERS_PATH}    /detail
     Log    Returned from Internal Get Openstack
     ${by_name}=    Make List Into Dict    ${resp.json()['servers']}    name
     Log    got it
     [Return]    ${by_name}
-    
+
 Get Openstack Server By Id
     [Documentation]    Returns the openstack stacks info for the given stack name
-    [Arguments]    ${alias}    ${server_id}        
-    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_SERVERS_PATH}    /${server_id}
+    [Arguments]    ${alias}    ${server_id}
+    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_SERVERS_PATH}    /${server_id}
     [Return]    ${resp}
-    
+
 Get Openstack Flavors
     [Documentation]    Runs an Openstack Request and returns the flavor list
     [Arguments]    ${alias}
-    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_FLAVORS_PATH}
+    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_FLAVORS_PATH}
     [Return]    ${resp.json()}
 
 Get Openstack Images
     [Documentation]    Runs an Openstack Request and returns the flavor list
     [Arguments]    ${alias}
-    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_IMAGES_PATH}
+    ${resp}=    Internal Get Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_IMAGES_PATH}
     [Return]    ${resp.json()}
 
 Reboot Server
     [Documentation]    Requests a reboot of the passed server id
-    [Arguments]    ${alias}    ${server_id}        
-    ${resp}=    Internal Post Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_SERVERS_PATH}    /${server_id}/action    ${OPENSTACK_NOVA_SERVERS_REBOOT_BODY}
+    [Arguments]    ${alias}    ${server_id}
+    ${resp}=    Internal Post Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_SERVERS_PATH}    /${server_id}/action    ${OPENSTACK_NOVA_SERVERS_REBOOT_BODY}
     [Return]    ${resp}
 
 Add Server
     [Documentation]    Adds a server for the passed if
     [Arguments]    ${alias}    ${name}    ${imageRef}    ${flavorRef}
     ${dict}=    Create Dictionary   name=${name}   imageRef=${imageRef}   flavorRef=${flavorRef}
-    ${data}=    Fill JSON Template File    ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE}    ${dict}        
-    ${resp}=    Internal Post Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_SERVERS_PATH}   data_path=    data=${data}     
+    ${data}=    Fill JSON Template File    ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE}    ${dict}
+    ${resp}=    Internal Post Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_SERVERS_PATH}   data_path=    data=${data}
     [Return]    ${resp}
 
 Add Server For Image Name
@@ -100,28 +100,28 @@ Add Server For Image Name
     ${imageRef}=    Get Id For Name   ${images}    ${imageName}
     ${flavorRef}=   Get Id For Name   ${flavors}    ${flavorName}
     ${dict}=    Create Dictionary   name=${name}   imageRef=${imageRef}   flavorRef=${flavorRef}
-    ${data}=    Fill JSON Template File    ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE}    ${dict}        
-    ${resp}=    Internal Post Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_SERVERS_PATH}   data_path=    data=${data}     
+    ${data}=    Fill JSON Template File    ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE}    ${dict}
+    ${resp}=    Internal Post Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_SERVERS_PATH}   data_path=    data=${data}
     ${status_string}=    Convert To String    ${resp.status_code}
     Should Match Regexp    ${status_string}    ^(202)$
     [Return]    ${resp.json()}
 
 Wait for Server to Be Active
     [Arguments]    ${alias}   ${server_id}    ${timeout}=300s
-    ${server_info}=    Wait Until Keyword Succeeds    ${timeout}    10 sec    Get Active Server    ${alias}    ${server_id}    
+    ${server_info}=    Wait Until Keyword Succeeds    ${timeout}    10 sec    Get Active Server    ${alias}    ${server_id}
     ${status}=   Get From Dictionary    ${server_info}    status
     Should Be Equal    ${status}    ACTIVE
     [Return]    ${server_info}
 
  Get Active Server
-    [Arguments]    ${alias}    ${server_id}    
+    [Arguments]    ${alias}    ${server_id}
     ${resp}=    Get Openstack Server By Id    ${alias}    ${server_id}
     Should Be Equal As Strings   ${resp.status_code}    200
-    ${server_info}=    Set Variable    ${resp.json()}   
+    ${server_info}=    Set Variable    ${resp.json()}
     ${server_info}=    Get From Dictionary   ${server_info}    server
     ${status}=   Get From Dictionary    ${server_info}    status
     Should Not Be Equal    ${status}    BUILD
-    [Return]    ${server_info}     
+    [Return]    ${server_info}
 
 Wait for Server to Be Deleted
     [Arguments]    ${alias}    ${server_id}
@@ -135,15 +135,15 @@ Get Deleted Server
 Delete Server
     [Documentation]    Runs an Openstack Request to delete a keypair
     [Arguments]    ${alias}    ${server_id}
-    ${resp}=    Internal Delete Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${GLOBAL_OPENSTACK_SERVICE_REGION}    ${OPENSTACK_NOVA_SERVERS_PATH}	  /${server_id}  
+    ${resp}=    Internal Delete Openstack    ${alias}    ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    ${OPENSTACK_NOVA_SERVERS_PATH}	  /${server_id}
     ${status_string}=    Convert To String    ${resp.status_code}
-    Should Match Regexp    ${status_string}    ^(204)$    
+    Should Match Regexp    ${status_string}    ^(204)$
     [Return]    ${resp.text}
 
 Get Id For Name
     [Arguments]    ${list}    ${name}
     :for   ${item}   in   @{list}
-    \    ${id}=    Get From Dictionary    ${item}    id 
+    \    ${id}=    Get From Dictionary    ${item}    id
     \    ${n}=    Get From Dictionary    ${item}    name
-    \    Return from Keyword If   '${n}' == '${name}'   ${id} 
-    [Return]   None    
+    \    Return from Keyword If   '${n}' == '${name}'   ${id}
+    [Return]   None