fog 1.12.1 → 1.13.0

data/lib/fog/google/requests/compute/list_machine_types.rb

@@ -12,10 +12,11 @@ module Fog
 
       class Real
 
-        def list_machine_types
+        def list_machine_types(zone_name)
           api_method = @compute.machine_types.list
           parameters = {
-            'project' => 'google'
+            'project' => @project,
+            'zone' => zone_name,
           }
 
           result = self.build_result(api_method, parameters)

data/lib/fog/google/requests/storage/get_object.rb

@@ -73,7 +73,7 @@ module Fog
           if (bucket = self.data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
             if options['If-Match'] && options['If-Match'] != object['ETag']
               response.status = 412
-            elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['Last-Modified'])
+            elsif options['If-Modified-Since'] && options['If-Modified-Since'] >= Time.parse(object['Last-Modified'])
               response.status = 304
             elsif options['If-None-Match'] && options['If-None-Match'] == object['ETag']
               response.status = 304

data/lib/fog/hp/requests/storage/get_object.rb

@@ -43,7 +43,7 @@ module Fog
             if (object = container[:objects][object_name])
               if options['If-Match'] && options['If-Match'] != object['ETag']
                 response.status = 412
-              elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['Last-Modified'])
+              elsif options['If-Modified-Since'] && options['If-Modified-Since'] >= Time.parse(object['Last-Modified'])
                 response.status = 304
               elsif options['If-None-Match'] && options['If-None-Match'] == object['ETag']
                 response.status = 304

data/lib/fog/hp/storage.rb

@@ -10,8 +10,11 @@ module Fog
       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
+      
+      # :os_account_meta_temp_url_key is an OpenStack specific setting used to generate temporary urls.
+      recognizes  :os_account_meta_temp_url_key
 
-      secrets     :hp_secret_key
+      secrets     :hp_secret_key, :os_account_meta_temp_url_key
 
       model_path 'fog/hp/models/storage'
       model       :directory
@@ -167,14 +170,26 @@ module Fog
           encoded_path = "#{path}/#{Fog::HP.escape(container)}/#{Fog::HP.escape(object)}"
 
           string_to_sign = "#{method}\n#{expires}\n#{sig_path}"
-          # Only works with 1.9+ Not compatible with 1.8.7
-          #signed_string = Digest::HMAC.hexdigest(string_to_sign, @hp_secret_key, Digest::SHA1)
-          # Compatible with 1.8.7 onwards
-          hmac = OpenSSL::HMAC.new(@hp_secret_key, OpenSSL::Digest::SHA1.new)
-          signed_string = hmac.update(string_to_sign).hexdigest
-
-          signature = @hp_tenant_id.to_s + ":" + @hp_access_key.to_s + ":" + signed_string
-          signature = Fog::HP.escape(signature)
+                    
+          signature = nil          
+          
+          # HP uses a different strategy to create the signature that is passed to swift than OpenStack.
+          # As the HP provider is broadly used by OpenStack users the OpenStack strategy is applied when
+          # the @os_account_meta_temp_url_key is given.
+          if @os_account_meta_temp_url_key then
+            hmac      = OpenSSL::HMAC.new(@os_account_meta_temp_url_key, OpenSSL::Digest::SHA1.new)
+            signature= hmac.update(string_to_sign).hexdigest
+          else
+            # Only works with 1.9+ Not compatible with 1.8.7
+            #signed_string = Digest::HMAC.hexdigest(string_to_sign, @hp_secret_key, Digest::SHA1)
+          
+            # Compatible with 1.8.7 onwards          
+            hmac = OpenSSL::HMAC.new(@hp_secret_key, OpenSSL::Digest::SHA1.new)
+            signed_string = hmac.update(string_to_sign).hexdigest
+            
+            signature     = @hp_tenant_id.to_s + ":" + @hp_access_key.to_s + ":" + signed_string
+            signature     = Fog::HP.escape(signature)
+          end
 
           # generate the temp url using the signature and expiry
           "#{scheme}://#{host}:#{port}#{encoded_path}?temp_url_sig=#{signature}&temp_url_expires=#{expires}"
@@ -217,6 +232,7 @@ module Fog
           end
           @hp_secret_key = options[:hp_secret_key]
           @hp_tenant_id = options[:hp_tenant_id]
+          @os_account_meta_temp_url_key = options[:os_account_meta_temp_url_key]        
         end
 
         def data
@@ -254,6 +270,7 @@ module Fog
           options[:hp_service_type] = "Object Storage"
           @hp_tenant_id = options[:hp_tenant_id]
           @hp_avl_zone  = options[:hp_avl_zone]
+          @os_account_meta_temp_url_key = options[:os_account_meta_temp_url_key]
 
           ### Make the authentication call
           if (auth_version == :v2)

data/lib/fog/ibm/requests/compute/create_instance.rb

@@ -15,7 +15,7 @@ module Fog
         #   * :ip<~String> - The ID of a static IP address to associate with this instance
         #   * :volume_id<~String> - The ID of a storage volume to associate with this instance
         #   * :vlan_id<~String> - The ID of a Vlan offering to associate with this instance.
-        #   * :secondary_ip<~String> - The ID of a static IP address to associate with this instance as secondary IP
+        #   * :secondary_ip<~String> - Comma separated list of static IP IDs to associate with this instance.
         #   * :is_mini_ephermal<~Boolean> - Whether or not the instance should be provisioned with the root segment only
         #   * :configuration_data<~Hash> - Arbitrary name/value pairs defined by the image being created
         #   * :anti_collocation_instance<~String> - The ID of an existing anti-collocated instance.
@@ -32,24 +32,29 @@ module Fog
         #     * 'imageId'<~String>:
         #     * 'launchTime'<~Integer>: epoch time in ms representing when the instance was launched
         def create_instance(name, image_id, instance_type, location, options={})
+          body_data     = {
+            'name'                    => name,
+            'imageID'                 => image_id,
+            'instanceType'            => instance_type,
+            'location'                => location,
+            'publicKey'               => options[:key_name],
+            'ip'                      => options[:ip],
+            'volumeID'                => options[:volume_id],
+            'vlanID'                  => options[:vlan_id],
+            'isMiniEphemeral'        => options[:is_mini_ephemeral],
+            'Configuration Data'      => options[:configuration_data],
+            'antiCollocationInstance' => options[:anti_collocation_instance]
+          }
+          if options[:secondary_ip]
+            options[:secondary_ip].split(',').map(&:strip).each_with_index do |n, idx|
+              body_data.merge!({"secondary.ip.#{idx}" => n})
+            end 
+          end
           request(
             :method   => 'POST',
             :expects  => 200,
             :path     => '/instances',
-            :body     => {
-              'name'                    => name,
-              'imageID'                 => image_id,
-              'instanceType'            => instance_type,
-              'location'                => location,
-              'publicKey'               => options[:key_name],
-              'ip'                      => options[:ip],
-              'volumeID'                => options[:volume_id],
-              'vlanID'                  => options[:vlan_id],
-              'SecondaryIP'             => options[:secondary_ip],
-              'isMiniEphemeral'        => options[:is_mini_ephemeral],
-              'Configuration Data'      => options[:configuration_data],
-              'antiCollocationInstance' => options[:anti_collocation_instance],
-            }
+            :body     => body_data
           )
         end
 

data/lib/fog/internet_archive/requests/storage/get_object.rb

@@ -78,7 +78,7 @@ module Fog
             if (object && !object[:delete_marker])
               if options['If-Match'] && options['If-Match'] != object['ETag']
                 response.status = 412
-              elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['Last-Modified'])
+              elsif options['If-Modified-Since'] && options['If-Modified-Since'] >= Time.parse(object['Last-Modified'])
                 response.status = 304
               elsif options['If-None-Match'] && options['If-None-Match'] == object['ETag']
                 response.status = 304

data/lib/fog/{core/json.rb → json.rb}

@@ -1,6 +1,18 @@
-require 'multi_json'
+require "multi_json"
 
 module Fog
+
+  # @note Extracting JSON components out of core is a work in progress.
+  #
+  # The {JSON} module includes functionality that is common between APIs using
+  # JSON to send and receive data.
+  #
+  # The intent is to provide common code for provider APIs using JSON but not
+  # require it for those using XML.
+  #
+  # @todo Add +require "fog/json" and/or +include Fog::JSON+ to providers using
+  #   its services
+  #
   module JSON
 
     def self.sanitize(data)
@@ -28,6 +40,5 @@ module Fog
     def self.decode(obj)
       MultiJson.decode(obj)
     end
-
   end
 end

data/lib/fog/metering.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Metering
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup # Prevent delete from having side effects
+      provider = attributes.delete(:provider).to_s.downcase.to_sym
+      if self.providers.include?(provider)
+        require "fog/#{provider}/metering"
+        return Fog::Metering.const_get(Fog.providers[provider]).new(attributes)
+      end
+
+      raise ArgumentError.new("#{provider} has no identity service")
+    end
+
+    def self.providers
+      Fog.services[:metering]
+    end
+
+  end
+end
+

data/lib/fog/openstack.rb

@@ -47,6 +47,7 @@ module Fog
     service(:network, 'openstack/network', 'Network')
     service(:storage, 'openstack/storage', 'Storage')
     service(:volume,  'openstack/volume',  'Volume')
+    service(:metering,  'openstack/metering',  'Metering')
 
     # legacy v1.0 style auth
     def self.authenticate_v1(options, connection_options = {})

data/lib/fog/openstack/metering.rb

@@ -0,0 +1,215 @@
+require 'fog/metering'
+require 'fog/openstack'
+
+module Fog
+  module Metering
+    class OpenStack < Fog::Service
+
+      requires :openstack_auth_url
+      recognizes :openstack_auth_token, :openstack_management_url, :persistent,
+                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
+                 :openstack_api_key, :openstack_username,
+                 :current_user, :current_tenant,
+                 :openstack_endpoint_type
+
+      model_path 'fog/openstack/models/metering'
+
+      model       :resource
+      collection  :resources
+
+
+      request_path 'fog/openstack/requests/metering'
+
+      # Metering
+      request :get_resource
+      request :get_samples
+      request :get_statistics
+      request :list_meters
+      request :list_resources
+
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :users => {},
+              :tenants => {}
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          require 'multi_json'
+          @openstack_username = options[:openstack_username]
+          @openstack_tenant   = options[:openstack_tenant]
+          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+          @auth_token = Fog::Mock.random_base64(64)
+          @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+          management_url = URI.parse(options[:openstack_auth_url])
+          management_url.port = 8776
+          management_url.path = '/v1'
+          @openstack_management_url = management_url.to_s
+
+          @data ||= { :users => {} }
+          unless @data[:users].find {|u| u['name'] == options[:openstack_username]}
+            id = Fog::Mock.random_numbers(6).to_s
+            @data[:users][id] = {
+              'id'       => id,
+              'name'     => options[:openstack_username],
+              'email'    => "#{options[:openstack_username]}@mock.com",
+              'tenantId' => Fog::Mock.random_numbers(6).to_s,
+              'enabled'  => true
+            }
+          end
+        end
+
+        def data
+          self.class.data[@openstack_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@openstack_username)
+        end
+
+        def credentials
+          { :provider                 => 'openstack',
+            :openstack_auth_url       => @openstack_auth_uri.to_s,
+            :openstack_auth_token     => @auth_token,
+            :openstack_management_url => @openstack_management_url }
+        end
+      end
+
+      class Real
+        attr_reader :current_user
+        attr_reader :current_tenant
+
+        def initialize(options={})
+          require 'multi_json'
+
+          @openstack_auth_token = options[:openstack_auth_token]
+
+          unless @openstack_auth_token
+            missing_credentials = Array.new
+            @openstack_api_key  = options[:openstack_api_key]
+            @openstack_username = options[:openstack_username]
+
+            missing_credentials << :openstack_api_key  unless @openstack_api_key
+            missing_credentials << :openstack_username unless @openstack_username
+            raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
+          end
+
+          @openstack_tenant               = options[:openstack_tenant]
+          @openstack_auth_uri             = URI.parse(options[:openstack_auth_url])
+          @openstack_management_url       = options[:openstack_management_url]
+          @openstack_must_reauthenticate  = false
+          @openstack_service_type         = options[:openstack_service_type] || ['metering']
+          @openstack_service_name         = options[:openstack_service_name]
+
+          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'adminURL'
+          @connection_options = options[:connection_options] || {}
+
+          @current_user = options[:current_user]
+          @current_tenant = options[:current_tenant]
+
+          authenticate
+
+          @persistent = options[:persistent] || false
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        end
+
+        def credentials
+          { :provider                 => 'openstack',
+            :openstack_auth_url       => @openstack_auth_uri.to_s,
+            :openstack_auth_token     => @auth_token,
+            :openstack_management_url => @openstack_management_url,
+            :current_user             => @current_user,
+            :current_tenant           => @current_tenant }
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params)
+          begin
+            response = @connection.request(params.merge({
+              :headers  => {
+                'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
+                'X-Auth-Token' => @auth_token
+              }.merge!(params[:headers] || {}),
+              :host     => @host,
+              :path     => "#{@path}/v2/#{params[:path]}"#,
+              # Causes errors for some requests like tenants?limit=1
+              # :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)
+            }))
+          rescue Excon::Errors::Unauthorized => error
+            if error.response.body != 'Bad username or password' # token expiration
+              @openstack_must_reauthenticate = true
+              authenticate
+              retry
+            else # bad credentials
+              raise error
+            end
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+            when Excon::Errors::NotFound
+              Fog::Compute::OpenStack::NotFound.slurp(error)
+            else
+              error
+            end
+          end
+          unless response.body.empty?
+            response.body = MultiJson.decode(response.body)
+          end
+          response
+        end
+
+        private
+
+        def authenticate
+          if !@openstack_management_url || @openstack_must_reauthenticate
+            options = {
+              :openstack_tenant   => @openstack_tenant,
+              :openstack_api_key  => @openstack_api_key,
+              :openstack_username => @openstack_username,
+              :openstack_auth_uri => @openstack_auth_uri,
+              :openstack_auth_token => @openstack_auth_token,
+              :openstack_service_type => @openstack_service_type,
+              :openstack_service_name => @openstack_service_name,
+              :openstack_endpoint_type => @openstack_endpoint_type
+            }
+
+            credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+
+            @current_user = credentials[:user]
+            @current_tenant = credentials[:tenant]
+
+            @openstack_must_reauthenticate = false
+            @auth_token = credentials[:token]
+            @openstack_management_url = credentials[:server_management_url]
+            uri = URI.parse(@openstack_management_url)
+          else
+            @auth_token = @openstack_auth_token
+            uri = URI.parse(@openstack_management_url)
+          end
+
+          @host   = uri.host
+          @path   = uri.path
+          @path.sub!(/\/$/, '')
+          @port   = uri.port
+          @scheme = uri.scheme
+          true
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/openstack/models/compute/flavors.rb

@@ -9,8 +9,8 @@ module Fog
 
         model Fog::Compute::OpenStack::Flavor
 
-        def all
-          data = service.list_flavors_detail.body['flavors']
+        def all(options = {})
+          data = service.list_flavors_detail(options).body['flavors']
           load(data)
         end