fog 0.4.0 → 0.4.1

data/lib/fog/{slicehost/requests/compute → compute/requests/slicehost}/create_slice.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/slicehost/parsers/compute/create_slice'
+        require 'fog/compute/parsers/slicehost/create_slice'
 
         # Create a new slice
         # ==== Parameters

data/lib/fog/{slicehost/requests/compute → compute/requests/slicehost}/get_backups.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/slicehost/parsers/compute/get_backups'
+        require 'fog/compute/parsers/slicehost/get_backups'
 
         # Get list of backups
         #

data/lib/fog/{slicehost/requests/compute → compute/requests/slicehost}/get_flavor.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/slicehost/parsers/compute/get_flavor'
+        require 'fog/compute/parsers/slicehost/get_flavor'
 
         # Get details of a flavor
         #

data/lib/fog/{slicehost/requests/compute → compute/requests/slicehost}/get_flavors.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/slicehost/parsers/compute/get_flavors'
+        require 'fog/compute/parsers/slicehost/get_flavors'
 
         # Get list of flavors
         #

data/lib/fog/{slicehost/requests/compute → compute/requests/slicehost}/get_image.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/slicehost/parsers/compute/get_image'
+        require 'fog/compute/parsers/slicehost/get_image'
 
         # Get details of an image
         #

data/lib/fog/{slicehost/requests/compute → compute/requests/slicehost}/get_images.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/slicehost/parsers/compute/get_images'
+        require 'fog/compute/parsers/slicehost/get_images'
 
         # Get list of images
         #

data/lib/fog/{slicehost/requests/compute → compute/requests/slicehost}/get_slice.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/slicehost/parsers/compute/get_slice'
+        require 'fog/compute/parsers/slicehost/get_slice'
 
         # Get details of a slice
         #

data/lib/fog/{slicehost/requests/compute → compute/requests/slicehost}/get_slices.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/slicehost/parsers/compute/get_slices'
+        require 'fog/compute/parsers/slicehost/get_slices'
 
         # Get list of slices
         #

data/lib/fog/compute/requests/terremark_ecloud/get_catalog.rb

@@ -0,0 +1,27 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_catalog'
+
+        def get_catalog(href)
+          request({
+            :href       => href,
+            :idempotent => true,
+            :parser     => Fog::Parsers::TerremarkEcloud::Compute::GetCatalog.new
+          })
+        end
+
+      end
+
+      class Mock
+
+        def get_catalog(href)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_catalog_item.rb

@@ -0,0 +1,27 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_catalog_item'
+
+        def get_catalog_item(href)
+          request({
+            :href       => href,
+            :idempotent => true,
+            :parser     => Fog::Parsers::TerremarkEcloud::Compute::GetCatalogItem.new
+          })
+        end
+
+      end
+
+      class Mock
+
+        def get_catalog_item(href)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_ip_addresses.rb

@@ -0,0 +1,27 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_ip_addresses'
+
+        def get_ip_addresses(href)
+          request({
+            :href       => href,
+            :idempotent => true,
+            :parser     => Fog::Parsers::TerremarkEcloud::Compute::GetIpAddresses.new
+          })
+        end
+
+      end
+
+      class Mock
+
+        def get_ip_addresses(href)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_network.rb

@@ -0,0 +1,27 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_network'
+
+        def get_network(href)
+          request({
+            :href       => href,
+            :idempotent => true,
+            :parser     => Fog::Parsers::TerremarkEcloud::Compute::GetNetwork.new
+          })
+        end
+
+      end
+
+      class Mock
+
+        def get_network(href)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_organization.rb

@@ -0,0 +1,27 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_organization'
+
+        def get_organization(href = organization_href)
+          request({
+            :href       => href,
+            :idempotent => true,
+            :parser     => Fog::Parsers::TerremarkEcloud::Compute::GetOrganization.new
+          })
+        end
+
+      end
+
+      class Mock
+
+        def get_organization(href = organization_href)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_vdc.rb

@@ -0,0 +1,27 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_vdc'
+
+        def get_vdc(href)
+          request({
+            :href       => href,
+            :idempotent => true,
+            :parser     => Fog::Parsers::TerremarkEcloud::Compute::GetVdc.new
+          })
+        end
+
+      end
+
+      class Mock
+
+        def get_vdc
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_versions.rb

@@ -0,0 +1,32 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_versions'
+
+        def get_versions
+          connection = Fog::Connection.new(@versions_endpoint)
+          response = connection.request({
+            :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']
+            raise "TerremarkEcloud does not support version #{@version}"
+          end
+        end
+
+      end
+
+      class Mock
+
+        def get_versions
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/{slicehost/compute.rb → compute/slicehost.rb}

@@ -4,8 +4,9 @@ module Fog
 
       requires :slicehost_password
       recognizes :host, :port, :scheme, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/slicehost/models/compute'
+      model_path 'fog/compute/models/slicehost'
       model       :flavor
       collection  :flavors
       model       :image
@@ -13,7 +14,7 @@ module Fog
       model       :server
       collection  :servers
 
-      request_path 'fog/slicehost/requests/compute'
+      request_path 'fog/compute/requests/slicehost'
       request :create_slice
       request :delete_slice
       request :get_backups
@@ -40,6 +41,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Slicehost::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Slicehost') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @slicehost_password = options[:slicehost_password]
           @data = self.class.data[@slicehost_password]
         end
@@ -49,6 +57,13 @@ module Fog
       class Real
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Slicehost::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Slicehost') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @slicehost_password = options[:slicehost_password]
           @host   = options[:host]    || "api.slicehost.com"
           @port   = options[:port]    || 443

data/lib/fog/compute/terremark_ecloud.rb

@@ -0,0 +1,109 @@
+require 'builder'
+
+module Fog
+  module TerremarkEcloud
+    class Compute < Fog::Service
+
+      requires :terremark_ecloud_username, :terremark_ecloud_password
+      recognizes :versions_endpoint
+
+      request_path 'fog/compute/requests/terremark_ecloud'
+      request :get_catalog
+      request :get_catalog_item
+      request :get_ip_addresses
+      request :get_network
+      request :get_organization
+      request :get_vdc
+
+      class Mock
+
+        def initialize(options={})
+        end
+
+        def organization_href
+          Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def initialize(options = {})
+          require 'fog/compute/parsers/terremark_ecloud/get_versions'
+          require 'fog/compute/parsers/terremark_ecloud/login'
+
+          @username = options[:terremark_ecloud_username]
+          @password = options[:terremark_ecloud_password]
+          @version  = '0.8b-ext2.6'
+          @versions_endpoint = options[:versions_endpoint] || 'https://services.enterprisecloud.terremark.com/api/versions'
+        end
+
+        def organization_href
+          unless @organization_href
+            get_token_and_organization
+          end
+          @organization_href
+        end
+
+        def request(params)
+          raise ArgumentError.new('Need :href in params') unless params[:href]
+
+          # set auth token
+          if @token.nil?
+            get_token_and_organization
+          end
+
+          begin
+            Fog::Connection.new(params[:href]).request({
+              :parser  => params[:parser],
+              :expects => params[:expects] || 200,
+              :method  => params[:method]  || 'GET',
+              :body    => params[:body],
+              :headers => {
+                'Cookie' => @token
+              }.merge(params[:headers] || {})
+            })
+          rescue Excon::Errors::Unauthorized # expired token
+            get_token_and_organization
+            retry
+          end
+        end
+
+        private
+
+        def get_token_and_organization
+          # lookup LoginUrl for specified version
+          connection = Fog::Connection.new(@versions_endpoint)
+          response = connection.request({
+            :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
+
+          connection = Fog::Connection.new(login_url)
+          response   = connection.request({
+            :expects => 200,
+            :method  => 'POST',
+            :headers => {
+              'Authorization' => ('Basic ' << Base64.encode64("#{@username}:#{@password}").chomp!),
+              'Content-Type'  => 'application/vnd.vmware.vcloud.orgList+xml'
+            },
+            :parser   => Fog::Parsers::TerremarkEcloud::Compute::Login.new
+          })
+
+          @token = response.headers['Set-Cookie']
+
+          if organization = response.body['OrgList'].first
+            @organization_href = organization['href']
+          end
+        end
+
+      end
+    end
+  end
+end