fog 1.10.1 → 1.11.0

data/lib/fog/openstack/requests/volume/create_volume_snapshot.rb

@@ -14,7 +14,7 @@ module Fog
           }
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "snapshots"

data/lib/fog/openstack/requests/volume/get_quota.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+
+        def get_quota(tenant_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/os-quota-sets/#{tenant_id}"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_quota(tenant_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'quota_set' => (self.data[:quota_updated] or self.data[:quota]).merge({'id' => tenant_id})
+          }
+          response
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/volume/get_quota_defaults.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+
+        def get_quota_defaults(tenant_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/os-quota-sets/#{tenant_id}/defaults"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_quota_defaults(tenant_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'quota_set' => self.data[:quota].merge({'id' => tenant_id})
+          }
+          response
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/volume/update_quota.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+
+        def update_quota(tenant_id, options = {})
+          options['tenant_id'] = tenant_id
+          request(
+            :body => Fog::JSON.encode({ 'quota_set' => options }),
+            :expects => 200,
+            :method => 'PUT',
+            :path => "/os-quota-sets/#{tenant_id}"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def update_quota(tenant_id, options = {})
+          self.data[:quota_updated] = self.data[:quota].merge options
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = { 'quota_set' => self.data[:quota_updated] }
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume.rb

@@ -29,6 +29,10 @@ module Fog
       request :list_snapshots
       request :get_snapshot_details
       request :delete_snapshot
+ 
+      request :update_quota
+      request :get_quota
+      request :get_quota_defaults
 
       request :set_tenant
 
@@ -37,7 +41,12 @@ module Fog
           @data ||= Hash.new do |hash, key|
             hash[key] = {
               :users => {},
-              :tenants => {}
+              :tenants => {},
+              :quota => {
+                'gigabytes' => 1000,
+                'volumes'   => 10,
+                'snapshots' => 10
+              }
             }
           end
         end
@@ -47,7 +56,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])
@@ -94,8 +102,6 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
-          require 'multi_json'
-
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -150,8 +156,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
@@ -170,7 +174,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/rackspace.rb

@@ -1,6 +1,7 @@
-require 'fog/core'
+require File.join(File.dirname(__FILE__), 'core')
 require 'fog/rackspace/mock_data'
 require 'fog/rackspace/service'
+require 'fog/rackspace/errors'
 
 module Fog
   module Rackspace
@@ -25,21 +26,26 @@ module Fog
           if error.response
             status_code = error.response.status
             unless error.response.body.empty?
-              data = Fog::JSON.decode(error.response.body)
-              message = data.values.first ? data.values.first['message'] : data['message']
+              begin
+                data = Fog::JSON.decode(error.response.body)
+                message = data.values.first ? data.values.first['message'] : data['message']
+              rescue  => e
+                Fog::Logger.warning("Received exception '#{e}' while decoding>> #{error.response.body}")
+                message = error.response.body
+                data = error.response.body
+              end
             end
           end
 
           new_error = super(error, message)
           new_error.instance_variable_set(:@response_data, data)
-          new_error.instance_variable_set(:@status_code, status_code)          
+          new_error.instance_variable_set(:@status_code, status_code)
           new_error
         end
       end
 
       class InternalServerError < ServiceError; end
       class Conflict < ServiceError; end
-      class NotFound < ServiceError; end
       class ServiceUnavailable < ServiceError; end
 
       class BadRequest < ServiceError

data/lib/fog/rackspace/block_storage.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rackspace'))
 module Fog
   module Rackspace
     class BlockStorage < Fog::Service
+      include Fog::Rackspace::Errors
 
       class IdentifierTaken < Fog::Errors::Error; end
       class ServiceError < Fog::Rackspace::Errors::ServiceError; end
@@ -98,7 +99,7 @@ module Fog
               :path     => "#{endpoint_uri.path}/#{params[:path]}"
             }))
           rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp error
+            raise NotFound.slurp(error, region)
           rescue Excon::Errors::BadRequest => error
             raise BadRequest.slurp error
           rescue Excon::Errors::InternalServerError => error

data/lib/fog/rackspace/cdn.rb

@@ -4,7 +4,6 @@ require 'fog/cdn'
 module Fog
   module CDN
     class Rackspace < Fog::Service
-
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :persistent, :rackspace_cdn_ssl, :rackspace_region, :rackspace_cdn_url
 
@@ -37,13 +36,13 @@ module Fog
         end
 
         # Publish container to CDN
-        # @param [Fog::Storage::Rackspace::Directory] directory to publish
+        # @param [Fog::Storage::Rackspace::Directory] container directory to publish
         # @param [Boolean] publish If true directory is published. If false directory is unpublished.
         # @return [Hash] hash containing urls for published container
-        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def publish_container(container, publish = true)
           enabled = publish ? 'True' : 'False'
           response = put_container(container.key, 'X-Cdn-Enabled' => enabled)
@@ -54,9 +53,9 @@ module Fog
         # Returns hash of urls for container
         # @param [Fog::Storage::Rackspace::Directory] container to retrieve urls for
         # @return [Hash] hash containing urls for published container
-        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
-        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
-        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         # @note If unable to find container or container is not published this method will return an empty hash.
         def urls(container)
           begin 
@@ -164,13 +163,14 @@ module Fog
               :host     => endpoint_uri.host,
               :path     => "#{endpoint_uri.path}/#{params[:path]}",
             }))
+          rescue Excon::Errors::NotFound => error
+            raise Fog::Storage::Rackspace::NotFound.slurp(error, region)
+          rescue Excon::Errors::BadRequest => error
+            raise Fog::Storage::Rackspace::BadRequest.slurp error
+          rescue Excon::Errors::InternalServerError => error
+            raise Fog::Storage::Rackspace::InternalServerError.slurp error
           rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Storage::Rackspace::NotFound.slurp(error)
-            else
-              error
-            end
+            raise Fog::Storage::Rackspace::ServiceError.slurp error
           end
           if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
             response.body = Fog::JSON.decode(response.body)

data/lib/fog/rackspace/compute.rb

@@ -4,6 +4,7 @@ require 'fog/compute'
 module Fog
   module Compute
     class Rackspace < Fog::Service
+      include Fog::Rackspace::Errors
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
@@ -210,7 +211,6 @@ module Fog
               }.merge!(params[:headers] || {}),
               :host     => endpoint_uri.host,
               :path     => "#{endpoint_uri.path}/#{params[:path]}",
-              :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
@@ -223,7 +223,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::Compute::Rackspace::NotFound.slurp(error)
+              NotFound.slurp(error, region)
             else
               error
             end

data/lib/fog/rackspace/compute_v2.rb

@@ -3,6 +3,7 @@ require 'fog/compute'
 module Fog
   module Compute
     class RackspaceV2 < Fog::Service
+      include Fog::Rackspace::Errors
 
       class ServiceError < Fog::Rackspace::Errors::ServiceError; end
       class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
@@ -21,15 +22,15 @@ module Fog
 
       class InvalidServerStateException < InvalidStateException
         def to_s
-          "Server should have transitioned to '#{desired_state}' not '#{state}'"
+          "Server should have transitioned to '#{desired_state}' not '#{current_state}'"
         end
       end
 
       class InvalidImageStateException < InvalidStateException
          def to_s
-           "Image should have transitioned to '#{desired_state}' not '#{state}'"
+           "Image should have transitioned to '#{desired_state}' not '#{current_state}'"
          end
-       end
+      end
 
       DFW_ENDPOINT = 'https://dfw.servers.api.rackspacecloud.com/v2'
       ORD_ENDPOINT = 'https://ord.servers.api.rackspacecloud.com/v2'
@@ -66,6 +67,8 @@ module Fog
       request :resize_server
       request :confirm_resize_server
       request :revert_resize_server
+      request :rescue_server
+      request :unrescue_server
       request :list_addresses
       request :list_addresses_by_network
 
@@ -148,7 +151,7 @@ module Fog
               :path     => "#{endpoint_uri.path}/#{params[:path]}"
             }))
           rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp error
+            raise NotFound.slurp(error, region)
           rescue Excon::Errors::BadRequest => error
             raise BadRequest.slurp error
           rescue Excon::Errors::InternalServerError => error
@@ -160,7 +163,7 @@ module Fog
           unless response.body.empty?
             begin
               response.body = Fog::JSON.decode(response.body)
-            rescue MultiJson::DecodeError => e
+            rescue Fog::JSON::LoadError
               response.body = {}
             end
           end

data/lib/fog/rackspace/databases.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rackspace'))
 module Fog
   module Rackspace
     class Databases < Fog::Service
+      include Fog::Rackspace::Errors
 
       class ServiceError < Fog::Rackspace::Errors::ServiceError; end
       class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
@@ -96,7 +97,7 @@ module Fog
               :path     => "#{endpoint_uri.path}/#{params[:path]}"
             }))
           rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp error
+            raise NotFound.slurp(error, region)
           rescue Excon::Errors::BadRequest => error
             raise BadRequest.slurp error
           rescue Excon::Errors::InternalServerError => error

data/lib/fog/rackspace/dns.rb

@@ -4,6 +4,7 @@ require 'fog/dns'
 module Fog
   module DNS
     class Rackspace < Fog::Service
+      include Fog::Rackspace::Errors
 
       class CallbackError < Fog::Errors::Error
         attr_reader :response, :message, :details
@@ -118,7 +119,7 @@ module Fog
           rescue Excon::Errors::Conflict => error
             raise Fog::Rackspace::Errors::Conflict.slurp error
           rescue Excon::Errors::NotFound => error
-            raise Fog::Rackspace::Errors::NotFound.slurp error
+            raise NotFound.slurp(error, region)
           rescue Excon::Errors::ServiceUnavailable => error
             raise Fog::Rackspace::Errors::ServiceUnavailable.slurp error
           end

data/lib/fog/rackspace/errors.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Rackspace
+    module Errors
+
+      def self.included(mod)
+        mod.class_eval <<-'EOS', __FILE__, __LINE__
+          class NotFound < Fog::Service::NotFound
+            attr_reader :region, :status_code
+
+            def to_s
+              status = status_code ? "[HTTP #{status_code}] " : ""
+              message = region ? "resource not found in #{region} region" : super
+              "#{status}#{message}"
+            end
+
+            def self.slurp(error, region=nil)
+              exception = NotFound.new
+              exception.instance_variable_set(:@region, region)
+              exception.instance_variable_set(:@status_code, error.response.status) rescue nil
+              exception
+            end
+          end
+        EOS
+      end
+    end
+  end
+end

data/lib/fog/rackspace/load_balancers.rb

@@ -3,6 +3,7 @@ require 'fog/rackspace'
 module Fog
   module Rackspace
     class LoadBalancers < Fog::Service
+      include Fog::Rackspace::Errors
 
       #These references exist for backwards compatibility
       class ServiceError < Fog::Rackspace::Errors::ServiceError; end
@@ -131,7 +132,7 @@ module Fog
               :path     => "#{endpoint_uri.path}/#{params[:path]}"
             }))
           rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp error
+            raise NotFound.slurp(error, region)
           rescue Excon::Errors::BadRequest => error
             raise BadRequest.slurp error
           rescue Excon::Errors::InternalServerError => error

data/lib/fog/rackspace/mock_data.rb

@@ -104,8 +104,7 @@ module Fog
               "extra_specs" => {},
             }
 
-            #Mock Data Hash
-            h = {
+            mock_data = {
               #Compute V2
               :flavors => Hash.new { |h,k| h[k] = flavor unless k == NOT_FOUND_ID},
               :images => Hash.new { |h,k| h[k] = image unless k == NOT_FOUND_ID },        
@@ -121,11 +120,11 @@ module Fog
             }
             
             # seed with initial data
-            h[:flavors][flavor_id] = flavor
-            h[:images][image_id] = image
-            h[:networks][network_id] = network
+            mock_data[:flavors][flavor_id] = flavor
+            mock_data[:images][image_id] = image
+            mock_data[:networks][network_id] = network
             
-            h            
+            mock_data
           end
         end[@rackspace_api_key]
       end