Change the order of endpoint_url alias global variable handling and fix bug in incorrect variable used to retrieve value

- ENDPOINT_URL needs to be handled before BASE_URL because BASE_URL is always defined with a default value and will cause ENDPOINT_URL alias to be ignored
- global variable was referencing config file variable name by accident

Author: ju2wheels

lib/softlayer/Config.rb

@@ -156,13 +156,13 @@ def Config.globals_settings
       result[:user_agent]   = $SL_API_USER_AGENT || "softlayer-ruby #{VERSION}"
       result[:username]     = $SL_API_USERNAME if $SL_API_USERNAME
 
-      if $SL_API_BASE_URL && ENDPOINT_URL_ALIAS.include?($SL_API_BASE_URL)
-        result[:endpoint_url] = ($SL_API_BASE_URL == "API_PUBLIC_ENDPOINT" ? API_PUBLIC_ENDPOINT : API_PRIVATE_ENDPOINT)
-      elsif $SL_API_ENDPOINT_URL && ENDPOINT_URL_ALIAS.include?($SL_API_ENDPOINT_URL)
+      if $SL_API_ENDPOINT_URL && ENDPOINT_URL_ALIAS.include?($SL_API_ENDPOINT_URL)
         result[:endpoint_url] = ($SL_API_ENDPOINT_URL == "API_PUBLIC_ENDPOINT" ? API_PUBLIC_ENDPOINT : API_PRIVATE_ENDPOINT)
+      elsif $SL_API_BASE_URL && ENDPOINT_URL_ALIAS.include?($SL_API_BASE_URL)
+        result[:endpoint_url] = ($SL_API_BASE_URL == "API_PUBLIC_ENDPOINT" ? API_PUBLIC_ENDPOINT : API_PRIVATE_ENDPOINT)
       elsif ($SL_API_BASE_URL     && ! ENDPOINT_URL_ALIAS.include?($SL_API_BASE_URL)) ||
             ($SL_API_ENDPOINT_URL && ! ENDPOINT_URL_ALIAS.include?($SL_API_ENDPOINT_URL))
-        result[:endpoint_url] = softlayer_section['base_url'] || softlayer_section['endpoint_url']
+        result[:endpoint_url] = $SL_API_ENDPOINT_URL || $SL_API_BASE_URL
       end
 
       begin