gapinc-fog 1.12.1.2.1 → 1.14.0

data/lib/fog/google/models/compute/server.rb

@@ -70,8 +70,8 @@ module Fog
           end
 
           self.metadata.merge!({
-            "sshKeys" => "#{username}:#{File.read(public_key_path).strip}"
-          }) if public_key_path
+            "sshKeys" => "#{username}:#{public_key.strip}"
+          }) if public_key
 
           options = {
               'image' => image_name,

data/lib/fog/google/models/compute/servers.rb

@@ -9,14 +9,14 @@ module Fog
 
         model Fog::Compute::Google::Server
 
-        def all(zone=nil)
-          if zone.nil?
+        def all(filters={})
+          if filters['zone'].nil?
             data = []
             service.list_zones.body['items'].each do |zone|
               data += service.list_servers(zone['name']).body["items"] || []
             end
           else
-            data = service.list_servers(zone).body["items"] || []
+            data = service.list_servers(filters['zone']).body["items"] || []
           end
           load(data)
         end
@@ -25,8 +25,11 @@ module Fog
           response = nil
           if zone.nil?
             service.list_zones.body['items'].each do |zone|
-              response = service.get_server(identity, zone['name'])
-              break if response.status == 200
+              begin
+                response = service.get_server(identity, zone['name'])
+                break if response.status == 200
+              rescue Fog::Errors::Error
+              end
             end
           else
             response = service.get_server(identity, zone)

data/lib/fog/google/models/storage/file.rb

@@ -92,7 +92,13 @@ module Fog
 
         def public_url
           requires :directory, :key
-          if service.get_object_acl(directory.key, key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
+
+          acl = service.get_object_acl(directory.key, key).body['AccessControlList']
+          access_granted = acl.detect do |entry|
+            entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'
+          end
+
+          if access_granted
             if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
               "https://#{directory.key}.storage.googleapis.com/#{key}"
             else

data/lib/fog/google/parsers/storage/access_control_list.rb

@@ -17,8 +17,8 @@ module Fog
             when 'Entries'
               @in_entries = true
             when 'Scope'
-              key, value = attrs.first
-              @entry['Scope'][key] = value
+              struct = attrs.first
+              @entry['Scope'][struct.localname] = struct.value
             end
           end
 

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

@@ -30,8 +30,7 @@ module Fog
 
           if options.has_key? 'image'
             image_name = options.delete 'image'
-            # We don't know the owner of the image.
-            image = images.create({:name => image_name})
+            image = images.get(image_name)
             @image_url = @api_url + image.resource_url
             body_object['image'] = @image_url
           end

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

@@ -12,10 +12,11 @@ module Fog
 
       class Real
 
-        def list_images
+        def list_images(project=nil)
           api_method = @compute.images.list
+          project=@project if project.nil?
           parameters = {
-            'project' => @project
+            'project' => project
           }
 
           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/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/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 = {})
@@ -119,7 +120,7 @@ module Fog
       end if openstack_region
 
       if service['endpoints'].empty?
-        raise Errors::NotFound.new("No endpoints available for region '#{openstack_region}'")
+        raise Fog::Errors::NotFound.new("No endpoints available for region '#{openstack_region}'")
       end if openstack_region
 
       unless service

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/server.rb

@@ -41,6 +41,7 @@ module Fog
 
         attr_reader :password
         attr_writer :image_ref, :flavor_ref, :nics, :os_scheduler_hints
+        attr_accessor :block_device_mapping
 
 
         def initialize(attributes={})
@@ -52,6 +53,7 @@ module Fog
           self.max_count = attributes.delete(:max_count)
           self.nics = attributes.delete(:nics)
           self.os_scheduler_hints = attributes.delete(:os_scheduler_hints)
+          self.block_device_mapping = attributes.delete(:block_device_mapping)
 
           super
         end
@@ -267,10 +269,10 @@ module Fog
           true
         end
 
-        # TODO: Implement /os-volumes-boot support with 'block_device_mapping'
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-          requires :flavor_ref, :image_ref, :name
+          requires :flavor_ref, :name
+          requires_one :image_ref, :block_device_mapping
           options = {
             'personality' => personality,
             'accessIPv4' => accessIPv4,
@@ -283,6 +285,7 @@ module Fog
             'max_count'   => @max_count,
             'nics' => @nics,
             'os:scheduler_hints' => @os_scheduler_hints,
+            'block_device_mapping' => @block_device_mapping
           }
           options['metadata'] = metadata.to_hash unless @metadata.nil?
           options = options.reject {|key, value| value.nil?}