fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/google/storage.rb

@@ -61,6 +61,39 @@ module Fog
           "#{params[:host]}/#{params[:path]}?#{query.join('&')}"
         end
 
+        def request_params(params)
+          subdomain = params[:host].split(".#{@host}").first
+          unless subdomain =~ /^(?!goog)(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+            if subdomain =~ /_/
+              # https://github.com/fog/fog/pull/1258#issuecomment-10248620.
+              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not DNS compliant (only characters a through z, digits 0 through 9, and the hyphen).")
+            else
+              # - Bucket names must contain only lowercase letters, numbers, dashes (-), underscores (_), and dots (.). Names containing dots require verification.
+              # - Bucket names must start and end with a number or letter.
+              # - Bucket names must contain 3 to 63 characters. Names containing dots can contain up to 222 characters, but each dot-separated component can be no longer than 63 characters.
+              # - Bucket names cannot be represented as an IP address in dotted-decimal notation (for example, 192.168.5.4).
+              # - Bucket names cannot begin with the "goog" prefix.
+              # - Also, for DNS compliance, you should not have a period adjacent to another period or dash. For example, ".." or "-." or ".-" are not acceptable.
+              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not a valid dns name.  See: https://developers.google.com/storage/docs/bucketnaming")
+            end
+            params[:host] = params[:host].split("#{subdomain}.")[-1]
+            if params[:path]
+              params[:path] = "#{subdomain}/#{params[:path]}"
+            else
+              params[:path] = "#{subdomain}"
+            end
+            subdomain = nil
+          end
+
+          if subdomain && subdomain != @host
+            params[:subdomain] = subdomain
+          end
+
+          params[:scheme] ||= @scheme
+          params[:port]   ||= @port
+          params
+        end
+
       end
 
       class Mock
@@ -193,11 +226,10 @@ module Fog
           @persistent = options.fetch(:persistent, true)
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload
-          @connection.reset
+          @connection.reset if @connection
         end
 
         def signature(params)
@@ -222,31 +254,8 @@ DATA
           end
           string_to_sign << "#{canonical_google_headers}"
 
-          subdomain = params[:host].split(".#{@host}").first
-          unless subdomain =~ /^(?!goog)(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-            if subdomain =~ /_/
-              # https://github.com/fog/fog/pull/1258#issuecomment-10248620.
-              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not DNS compliant (only characters a through z, digits 0 through 9, and the hyphen).")
-            else
-              # - Bucket names must contain only lowercase letters, numbers, dashes (-), underscores (_), and dots (.). Names containing dots require verification.
-              # - Bucket names must start and end with a number or letter.
-              # - Bucket names must contain 3 to 63 characters. Names containing dots can contain up to 222 characters, but each dot-separated component can be no longer than 63 characters.
-              # - Bucket names cannot be represented as an IP address in dotted-decimal notation (for example, 192.168.5.4).
-              # - Bucket names cannot begin with the "goog" prefix.
-              # - Also, for DNS compliance, you should not have a period adjacent to another period or dash. For example, ".." or "-." or ".-" are not acceptable.
-              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not a valid dns name.  See: https://developers.google.com/storage/docs/bucketnaming")
-            end
-            params[:host] = params[:host].split("#{subdomain}.")[-1]
-            if params[:path]
-              params[:path] = "#{subdomain}/#{params[:path]}"
-            else
-              params[:path] = "#{subdomain}"
-            end
-            subdomain = nil
-          end
-
           canonical_resource  = "/"
-          unless subdomain.nil? || subdomain == @host
+          if subdomain = params.delete(:subdomain)
             canonical_resource << "#{CGI.escape(subdomain).downcase}/"
           end
           canonical_resource << "#{params[:path]}"
@@ -263,16 +272,32 @@ DATA
           Base64.encode64(signed_string).chomp!
         end
 
+        def connection(scheme, host, port)
+          uri = "#{scheme}://#{host}:#{port}"
+          if @persistent
+            unless uri == @connection_uri
+              @connection_uri = uri
+              reload
+              @connection = nil
+            end
+          else
+            @connection = nil
+          end
+          @connection ||= Fog::Connection.new(uri, @persistent, @connection_options)
+        end
 
         private
 
         def request(params, &block)
+          params = request_params(params)
+          scheme = params.delete(:scheme)
+          host   = params.delete(:host)
+          port   = params.delete(:port)
+
           params[:headers]['Date'] = Fog::Time.now.to_date_header
           params[:headers]['Authorization'] = "GOOG1 #{@google_storage_access_key_id}:#{signature(params)}"
 
-          response = @connection.request(params, &block)
-
-          response
+          connection(scheme, host, port).request(params, &block)
         end
       end
     end

data/lib/fog/hp/CHANGELOG.hp

@@ -1,3 +1,36 @@
+0.0.22 10/16/2013
+=================
+- add support for new LoadBalancer provider
+  - add load balancer model and request layer with mocking support
+  - add node model and request layer with mocking support
+  - add virtual_ip, protocol and algorithm models and request layer with mocking support
+- add support for new DNS provider
+  - add domain model and request layer with mocking support
+  - add record model and request layer with mocking support
+
+0.0.21 06/11/2013
+=================
+- add support for new Networking (Neutron) provider (Grizzly release)
+  - add network model and request layer with mocking support
+  - add router model and request layer with mocking support
+  - add subnet model and request layer with mocking support
+  - add port model and request layer with mocking support
+  - add floating ip model and request layer with mocking support
+  - add security group/rule model and request layer with mocking support
+- add support for new Compute V2 provider (Grizzly release)
+  - remove support for security group/rule model and request layer
+  - revise support for server, flavor, image, keypair, floating ip, metadata models and request layers
+  - add support for availability zone model and request layer
+  - add support for volume attachment model and request layer
+- add support for new BlockStorage V2 (Cinder) provider (Grizzly release)
+  - add volume model and request layer with mocking support
+  - add snapshot model and request layer with mocking support
+  - add volume backups model and request layer with mocking support
+  - remove bootable volume model as it now accessible via volume model
+- add support for caching auth credentials
+- add filter query support to all new V2 collections
+- add side by side support for both Compute and BlockStorage, V1/V2 providers
+
 0.0.20 03/13/2013
 =================
 - add Accept header with application/json for all requests

data/lib/fog/hp/block_storage.rb

@@ -5,7 +5,7 @@ module Fog
     class BlockStorage < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri
+      recognizes  :hp_auth_uri, :credentials, :hp_service_type
       recognizes  :persistent, :connection_options
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -43,6 +43,7 @@ module Fog
             :hp_auth_uri    => @hp_auth_uri,
             :hp_tenant_id   => @hp_tenant_id,
             :hp_avl_zone    => @hp_avl_zone,
+            :credentials    => @credentials,
             :connection_options => @connection_options
           )
         end
@@ -89,6 +90,7 @@ module Fog
 
       class Real
         include Utils
+        attr_reader :credentials
 
         def initialize(options={})
           # deprecate hp_account_id
@@ -104,9 +106,12 @@ module Fog
           @hp_auth_uri   = options[:hp_auth_uri]
           @connection_options = options[:connection_options] || {}
           ### Set an option to use the style of authentication desired; :v1 or :v2 (default)
+          ### A symbol is required, we should ensure that the value is loaded as a symbol
           auth_version = options[:hp_auth_version] || :v2
+          auth_version = auth_version.to_s.downcase.to_sym
+
           ### Pass the service name for object storage to the authentication call
-          options[:hp_service_type] = "Block Storage"
+          options[:hp_service_type] ||= "Block Storage"
           @hp_tenant_id = options[:hp_tenant_id]
           @hp_avl_zone  = options[:hp_avl_zone]
 
@@ -116,6 +121,7 @@ module Fog
             credentials = Fog::HP.authenticate_v2(options, @connection_options)
             # the CS service catalog returns the block storage endpoint
             @hp_block_uri = credentials[:endpoint_url]
+            @credentials = credentials
           else
             # Call the legacy v1.0/v1.1 authentication
             credentials = Fog::HP.authenticate_v1(options, @connection_options)
@@ -147,8 +153,7 @@ module Fog
                 'Accept'       => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}",
+              :path     => "#{@path}/#{params[:path]}"
             }), &block)
           rescue Excon::Errors::HTTPStatusError => error
             raise case error

data/lib/fog/hp/block_storage_v2.rb

@@ -0,0 +1,164 @@
+require 'fog/hp'
+
+module Fog
+  module HP
+    class BlockStorageV2 < Fog::Service
+
+      requires    :hp_access_key, :hp_secret_key, :hp_tenant_id, :hp_avl_zone
+      recognizes  :hp_auth_uri, :credentials, :hp_service_type
+      recognizes  :persistent, :connection_options
+      recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
+
+      secrets     :hp_secret_key
+
+      model_path  'fog/hp/models/block_storage_v2'
+      model       :volume
+      collection  :volumes
+      model       :volume_backup
+      collection  :volume_backups
+      model       :snapshot
+      collection  :snapshots
+
+      request_path 'fog/hp/requests/block_storage_v2'
+      request :create_volume
+      request :delete_volume
+      request :get_volume_details
+      request :list_volumes
+      request :list_volumes_detail
+      request :update_volume
+      request :create_snapshot
+      request :delete_snapshot
+      request :get_snapshot_details
+      request :list_snapshots
+      request :list_snapshots_detail
+      request :update_snapshot
+      request :create_volume_backup
+      request :delete_volume_backup
+      request :get_volume_backup_details
+      request :list_volume_backups
+      request :list_volume_backups_detail
+      request :restore_volume_backup
+
+      module Utils
+
+        def compute
+          @compute ||= Fog::Compute.new(
+            :provider       => 'HP',
+            :version        => :v2,
+            :hp_access_key  => @hp_access_key,
+            :hp_secret_key  => @hp_secret_key,
+            :hp_auth_uri    => @hp_auth_uri,
+            :hp_tenant_id   => @hp_tenant_id,
+            :hp_avl_zone    => @hp_avl_zone,
+            :credentials    => @credentials,
+            :connection_options => @connection_options
+          )
+        end
+
+      end
+
+      class Mock
+        include Utils
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :volumes => {},
+              :snapshots => {},
+              :volume_backups => {}
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @hp_access_key = options[:hp_access_key]
+        end
+
+        def data
+          self.class.data[@hp_access_key]
+        end
+
+        def reset_data
+          self.class.data.delete(@hp_access_key)
+        end
+
+      end
+
+      class Real
+        include Utils
+        attr_reader :credentials
+
+        def initialize(options={})
+          @hp_access_key = options[:hp_access_key]
+          @hp_secret_key = options[:hp_secret_key]
+          @hp_auth_uri   = options[:hp_auth_uri]
+          @connection_options = options[:connection_options] || {}
+          ### Set an option to use the style of authentication desired; :v1 or :v2 (default)
+          auth_version = options[:hp_auth_version] || :v2
+          ### Pass the service name for block storage to the authentication call
+          options[:hp_service_type] ||= "Block Storage"
+          @hp_tenant_id = options[:hp_tenant_id]
+          @hp_avl_zone  = options[:hp_avl_zone]
+
+          ### Make the authentication call
+          if (auth_version == :v2)
+            # Call the control services authentication
+            credentials = Fog::HP.authenticate_v2(options, @connection_options)
+            # the CS service catalog returns the block storage endpoint
+            @hp_block_uri = credentials[:endpoint_url]
+            @credentials = credentials
+          else
+            # Call the legacy v1.0/v1.1 authentication
+            credentials = Fog::HP.authenticate_v1(options, @connection_options)
+            # the user sends in the block storage endpoint
+            @hp_block_uri = options[:hp_auth_uri]
+          end
+
+          @auth_token = credentials[:auth_token]
+          @persistent = options[:persistent] || false
+
+          uri = URI.parse(@hp_block_uri)
+          @host   = uri.host
+          @path   = uri.path
+          @port   = uri.port
+          @scheme = uri.scheme
+
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params, parse_json = true, &block)
+          begin
+            response = @connection.request(params.merge!({
+              :headers  => {
+                'Content-Type' => 'application/json',
+                'Accept'       => 'application/json',
+                'X-Auth-Token' => @auth_token
+              }.merge!(params[:headers] || {}),
+              :path     => "#{@path}/#{params[:path]}"
+            }), &block)
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+            when Excon::Errors::NotFound
+              Fog::HP::BlockStorageV2::NotFound.slurp(error)
+            else
+              error
+            end
+          end
+          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
+            response.body = Fog::JSON.decode(response.body)
+          end
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/hp/cdn.rb

@@ -6,7 +6,7 @@ module Fog
     class HP < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri, :hp_cdn_uri
+      recognizes  :hp_auth_uri, :hp_cdn_uri, :credentials, :hp_service_type
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :persistent, :connection_options
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -65,6 +65,7 @@ module Fog
 
       class Real
         include Utils
+        attr_reader :credentials
 
         def initialize(options={})
           # deprecate hp_account_id
@@ -79,9 +80,12 @@ module Fog
           @hp_secret_key = options[:hp_secret_key]
           @connection_options = options[:connection_options] || {}
           ### Set an option to use the style of authentication desired; :v1 or :v2 (default)
+          ### A symbol is required, we should ensure that the value is loaded as a symbol
           auth_version = options[:hp_auth_version] || :v2
+          auth_version = auth_version.to_s.downcase.to_sym
+
           ### Pass the service name for object storage to the authentication call
-          options[:hp_service_type] = "CDN"
+          options[:hp_service_type] ||= "CDN"
           @hp_tenant_id = options[:hp_tenant_id]
 
           ### Make the authentication call
@@ -91,6 +95,7 @@ module Fog
             ### When using the v2 CS authentication, the CDN Mgmt comes from the service catalog
             @hp_cdn_uri = credentials[:endpoint_url]
             cdn_mgmt_url = @hp_cdn_uri
+            @credentials = credentials
           else
             # Call the legacy v1.0/v1.1 authentication
             credentials = Fog::HP.authenticate_v1(options, @connection_options)
@@ -131,7 +136,6 @@ module Fog
                 'Accept'       => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{@path}/#{params[:path]}",
             }), &block)
           rescue Excon::Errors::HTTPStatusError => error

data/lib/fog/hp/compute.rb

@@ -6,7 +6,7 @@ module Fog
     class HP < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri
+      recognizes  :hp_auth_uri, :credentials, :hp_service_type
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :persistent, :connection_options
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -57,6 +57,7 @@ module Fog
       request :get_windows_password
       request :get_security_group
       request :get_server_details
+      request :get_vnc_console
       request :list_addresses
       request :list_flavors
       request :list_flavors_detail
@@ -174,6 +175,7 @@ module Fog
 
       class Real
         include Utils
+        attr_reader :credentials
 
         def initialize(options={})
           # deprecate hp_account_id
@@ -188,9 +190,12 @@ module Fog
           @hp_secret_key = options[:hp_secret_key]
           @connection_options = options[:connection_options] || {}
           ### Set an option to use the style of authentication desired; :v1 or :v2 (default)
+          ### A symbol is required, we should ensure that the value is loaded as a symbol
           auth_version = options[:hp_auth_version] || :v2
+          auth_version = auth_version.to_s.downcase.to_sym
+          
           ### Pass the service name for compute via the options hash
-          options[:hp_service_type] = "Compute"
+          options[:hp_service_type] ||= "Compute"
           @hp_tenant_id = options[:hp_tenant_id]
 
           ### Make the authentication call
@@ -199,6 +204,7 @@ module Fog
             credentials = Fog::HP.authenticate_v2(options, @connection_options)
             # the CS service catalog returns the cdn endpoint
             @hp_compute_uri = credentials[:endpoint_url]
+            @credentials = credentials
           else
             # Call the legacy v1.0/v1.1 authentication
             credentials = Fog::HP.authenticate_v1(options, @connection_options)
@@ -230,9 +236,7 @@ module Fog
                 'Accept'       => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}",
-              :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)
+              :path     => "#{@path}/#{params[:path]}"
             }), &block)
           rescue Excon::Errors::HTTPStatusError => error
             raise case error