fog 1.10.1 → 1.11.0

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def list_images
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def list_images
+          api_method = @compute.images.list
+          parameters = {
+            'project' => @project
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def list_machine_types
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def list_machine_types
+          api_method = @compute.machine_types.list
+          parameters = {
+            'project' => 'google'
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def list_networks
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def list_networks
+          api_method = @compute.networks.list
+          parameters = {
+            'project' => @project
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def list_servers
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def list_servers(zone_name)
+          api_method = @compute.instances.list
+          parameters = {
+            'project' => @project,
+            'zone' => zone_name,
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def list_zone_operations
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def list_zone_operations(zone)
+          api_method = @compute.zone_operations.list
+          parameters = {
+            'zone' => zone,
+            'project' => @project,
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def list_zones
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def list_zones
+          api_method = @compute.zones.list
+          parameters = {
+            'project' => @project
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def set_metadata(instance, zone, metadata={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def set_metadata(instance, zone, metadata={})
+          api_method = @compute.instance.set_metadata
+          parameters = {
+            'project' => @project,
+            'instance' => instance,
+            'zone' => zone,
+          }
+          body_object = {
+            "items" => metadata.to_a.map {|pair| { :key => pair[0], :value => pair[1] } }
+          }
+          result = self.build_result(
+            api_method,
+            parameters,
+            body_object=body_object)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/hp.rb

@@ -25,7 +25,7 @@ module Fog
               if message.nil? and !data.values.first.nil?
                 message = data.values.first['message']
               end
-            rescue MultiJson::DecodeError
+            rescue Fog::JSON::LoadError
               message = error.response.body  #### body is not in JSON format, so just return as is
             end
           end

data/lib/fog/hp/storage.rb

@@ -177,7 +177,7 @@ module Fog
           signature = Fog::HP.escape(signature)
 
           # generate the temp url using the signature and expiry
-          temp_url = "#{scheme}://#{host}:#{port}#{encoded_path}?temp_url_sig=#{signature}&temp_url_expires=#{expires}"
+          "#{scheme}://#{host}:#{port}#{encoded_path}?temp_url_sig=#{signature}&temp_url_expires=#{expires}"
         end
 
       end

data/lib/fog/internet_archive/models/storage/ia_attributes.rb

@@ -3,7 +3,7 @@ module Fog
     module IAAttributes
 
 		  # you can add other x-archive-metadata-* values, but these are standard
-		  IA_STANDARD_METADATA_FIELDS = %q[hidden, title, collection, creator, mediatype, description, date, subject, licenseurl , pick, noindex, notes, rights, contributor, language, coverage, credits]
+		  IA_STANDARD_METADATA_FIELDS = %q[hidden, title, collection, creator, mediatype, description, date, subject, licenseurl, pick, noindex, notes, rights, contributor, language, coverage, credits]
 
 		  # for x-archive-metadata-mediatype, these are the valid values
 		  IA_VALID_MEDIA_TYPES = %q[audio, data, etree, image, movies, software, texts, web]

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

@@ -41,8 +41,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'HEAD',
-            :path       => CGI.escape(object_name),
-            :query      => query
+            :path       => CGI.escape(object_name)
           })
         end
 

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

@@ -7,12 +7,11 @@ module Fog
 
         # List multipart uploads for a bucket
         #
-        # @param bucket_name [String] Name of bucket to list multipart uploads for
-        # @param upload_id [String] upload id to list objects for
-        # @param options [Hash] config arguments for list.  Defaults to {}.
-        # @option options key-marker[String] limits parts to only those that appear lexicographically after this key.
-        # @option options max-uploads [Integer] limits number of uploads returned
-        # @option options upload-id-marker [String] limits uploads to only those that appear lexicographically after this upload id.
+        # @param [String] bucket_name Name of bucket to list multipart uploads for
+        # @param [Hash] options config arguments for list.  Defaults to {}.
+        # @option options [String] key-marker limits parts to only those that appear lexicographically after this key.
+        # @option options [Integer] max-uploads limits number of uploads returned
+        # @option options [String] upload-id-marker limits uploads to only those that appear lexicographically after this upload id.
         #
         # @return [Excon::Response] response:
         #   * body [Hash]:

data/lib/fog/openstack.rb

@@ -202,7 +202,35 @@ module Fog
 
       Fog::JSON.decode(response.body)
     end
-    
+
+    def self.get_supported_version(supported_versions, uri, auth_token, connection_options = {})
+      connection = Fog::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options)
+      response = connection.request({
+        :expects => [200, 204, 300],
+        :headers => {'Content-Type' => 'application/json',
+                     'Accept' => 'application/json',
+                     'X-Auth-Token' => auth_token},
+        :host    => uri.host,
+        :method  => 'GET'
+      })
+
+      body = Fog::JSON.decode(response.body)
+      version = nil
+      unless body['versions'].empty?
+        supported_version = body['versions'].detect do |x|
+          x["id"].match(supported_versions) &&
+          (x["status"] == "CURRENT" || x["status"] == "SUPPORTED")
+        end
+        version = supported_version["id"] if supported_version
+      end
+      if version.nil?
+        raise Fog::OpenStack::Errors::ServiceUnavailable.new(
+                  "OpenStack service only supports API versions #{supported_versions.inspect}")
+      end
+
+      version
+    end
+
     # CGI.escape, but without special treatment on spaces
     def self.escape(str,extra_exclude_chars = '')
       str.gsub(/([^a-zA-Z0-9_.-#{extra_exclude_chars}]+)/) do

data/lib/fog/openstack/CHANGELOG.md

@@ -1,4 +1,4 @@
-# 1.11.0 2013/04/04
+# 1.10.1 2013/04/04
 
 ## Storage
 

data/lib/fog/openstack/compute.rb

@@ -226,7 +226,8 @@ module Fog
                 'volumes'        => 10,
                 'cores'          => 20,
                 'ram'            => 51200
-              }
+              },
+              :volumes => {}
             }
           end
         end
@@ -338,7 +339,7 @@ module Fog
               }.merge!(params[:headers] || {}),
               :host     => @host,
               :path     => "#{@path}/#{@tenant_id}/#{params[:path]}",
-              :query    => params[:query] || ('ignore_awful_caching' << Time.now.to_i.to_s)
+              :query    => params[:query]
             }))
           rescue Excon::Errors::Unauthorized => error
             if error.response.body != 'Bad username or password' # token expiration

data/lib/fog/openstack/identity.rb

@@ -63,7 +63,6 @@ module Fog
 
       class Mock
         attr_reader :auth_token
-        attr_reader :unscoped_token
         attr_reader :auth_token_expiration
         attr_reader :current_user
         attr_reader :current_tenant
@@ -96,7 +95,6 @@ module Fog
         end
 
         def initialize(options={})
-          require 'multi_json'
           @openstack_username = options[:openstack_username] || 'admin'
           @openstack_tenant   = options[:openstack_tenant]   || 'admin'
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -230,8 +228,6 @@ module Fog
               }.merge!(params[:headers] || {}),
               :host     => @host,
               :path     => "#{@path}/#{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
             raise if retried
@@ -249,7 +245,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/openstack/image.rb

@@ -3,6 +3,8 @@ require 'fog/openstack'
 module Fog
   module Image
     class OpenStack < Fog::Service
+      SUPPORTED_VERSIONS = /v1(\.(0|1))*/
+
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url, :persistent,
                  :openstack_service_type, :openstack_service_name, :openstack_tenant,
@@ -44,7 +46,6 @@ module Fog
         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])
@@ -92,8 +93,6 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
-          require 'multi_json'
-
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -148,8 +147,6 @@ module Fog
               }.merge!(params[:headers] || {}),
               :host     => @host,
               :path     => "#{@path}/#{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
@@ -168,7 +165,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end
@@ -206,9 +203,11 @@ module Fog
           @host   = uri.host
           @path   = uri.path
           @path.sub!(/\/$/, '')
-          unless @path.match(/v1(\.1)*/)
-            raise Fog::OpenStack::Errors::ServiceUnavailable.new(
-                  "OpenStack binding only supports version 1.1 (a.k.a. 1)")
+          unless @path.match(SUPPORTED_VERSIONS)
+            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
+                                                               uri,
+                                                               @auth_token,
+                                                               @connection_options)
           end
           @port   = uri.port
           @scheme = uri.scheme

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

@@ -243,6 +243,30 @@ module Fog
           service.networks(:server => self)
         end
 
+        def volumes
+          requires :id
+          service.volumes.find_all do |vol|
+            vol.attachments.find { |attachment| attachment["serverId"] == id }
+          end
+        end
+
+        def volume_attachments
+          requires :id
+          service.get_server_volumes(id).body['volumeAttachments']
+        end
+
+        def attach_volume(volume_id, device_name)
+          requires :id
+          service.attach_volume(volume_id, id, device_name)
+          true
+        end
+
+        def detach_volume(volume_id)
+          requires :id
+          service.detach_volume(id, volume_id)
+          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?