[terremark_ecloud] setup login to also work like get_organizations would

fog · Feb 14, 2011 · a406dc6 · a406dc6
1 parent 54f4e8f
commit a406dc6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/lib/fog/compute/requests/terremark_ecloud/get_versions.rb b/lib/fog/compute/requests/terremark_ecloud/get_versions.rb
@@ -11,7 +11,13 @@ def get_versions
             :expects  => 200,
             :method   => 'GET',
             :parser   => Fog::Parsers::TerremarkEcloud::Compute::GetVersions.new
-          });
+          })
+          version_info = response.body['SupportedVersions'].detect {|version_info| version_info['Version'] == @version}
+          unless @login_url = version_info && version_info['LoginUrl']
+            # no LoginUrl matches specified version
+            raise "TerremarkEcloud does not support version #{@version}"
+          end
+          response
         end
 
       end

diff --git a/lib/fog/compute/requests/terremark_ecloud/login.rb b/lib/fog/compute/requests/terremark_ecloud/login.rb
@@ -6,6 +6,9 @@ class Real
         require 'fog/compute/parsers/terremark_ecloud/login'
 
         def login
+          unless @login_url
+            get_versions
+          end
           connection = Fog::Connection.new(@login_url)
           response   = connection.request({
             :expects => 200,

diff --git a/lib/fog/compute/terremark_ecloud.rb b/lib/fog/compute/terremark_ecloud.rb
@@ -80,14 +80,6 @@ def request(params)
         private
 
         def get_token_and_organization
-          # lookup LoginUrl for specified version
-          response = self.get_versions
-          version_info = response.body['SupportedVersions'].detect {|version_info| version_info['Version'] == @version}
-          unless @login_url = version_info && version_info['LoginUrl']
-            # no LoginUrl matches specified version
-            raise "TerremarkEcloud does not support version #{@version}"
-          end
-
           response = self.login
           # if there is only one organization we will note it as a starting point
           if (response.body['OrgList'].length == 1) && (organization = response.body['OrgList'].first)

diff --git a/tests/compute/requests/terremark_ecloud/organization_tests.rb b/tests/compute/requests/terremark_ecloud/organization_tests.rb
@@ -13,6 +13,11 @@
 
   tests('success') do
 
+    tests("#login (get_organizations)").formats({'OrgList' => [{'href' => String, 'name' => String, 'type' => String}]}) do
+      pending if Fog.mocking?
+      TerremarkEcloud[:compute].login.body
+    end
+
     tests("#get_organization").formats(@organization_format) do
       pending if Fog.mocking?
       TerremarkEcloud[:compute].get_organization.body