gapinc-fog 1.12.1.1 → 1.12.1.2

data/lib/fog/rackspace/dns.rb

@@ -6,6 +6,12 @@ module Fog
     class Rackspace < Fog::Service
       include Fog::Rackspace::Errors
 
+      class ServiceError < Fog::Rackspace::Errors::ServiceError; end
+      class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
+      class BadRequest < Fog::Rackspace::Errors::BadRequest; end
+      class Conflict < Fog::Rackspace::Errors::Conflict; end
+      class ServiceUnavailable < Fog::Rackspace::Errors::ServiceUnavailable; end
+
       class CallbackError < Fog::Errors::Error
         attr_reader :response, :message, :details
         def initialize(response)
@@ -95,9 +101,6 @@ module Fog
 
           deprecation_warnings(options)
 
-          @connection_options[:headers] ||= {}
-          @connection_options[:headers].merge!({ 'Content-Type' => 'application/json', 'X-Auth-Token' => auth_token })
-
           @persistent = options[:persistent] || false
           @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
         end
@@ -108,25 +111,22 @@ module Fog
 
         private
 
-        def request(params)
-          #TODO - Unify code with other rackspace services
+        def request(params, parse_json = true, &block)
           begin
-            response = @connection.request(params.merge!({
-              :path     => "#{endpoint_uri.path}/#{params[:path]}"
-            }))
-          rescue Excon::Errors::BadRequest => error
-            raise Fog::Rackspace::Errors::BadRequest.slurp error
-          rescue Excon::Errors::Conflict => error
-            raise Fog::Rackspace::Errors::Conflict.slurp error
+            super(params, parse_json, &block)
           rescue Excon::Errors::NotFound => error
             raise NotFound.slurp(error, region)
+          rescue Excon::Errors::BadRequest => error
+            raise BadRequest.slurp error
+          rescue Excon::Errors::InternalServerError => error
+            raise InternalServerError.slurp error
           rescue Excon::Errors::ServiceUnavailable => error
-            raise Fog::Rackspace::Errors::ServiceUnavailable.slurp error
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
+            raise ServiceUnavailable.slurp error
+          rescue Excon::Errors::Conflict => error
+            raise Conflict.slurp error
+          rescue Excon::Errors::HTTPStatusError => error
+            raise ServiceError.slurp error
           end
-          response
         end
 
         def array_to_query_string(arr)
@@ -164,15 +164,13 @@ module Fog
           @auth_token = credentials['X-Auth-Token']
         end
 
-        def authenticate
-          options = {
+        def authenticate(options={})
+          super({
             :rackspace_api_key  => @rackspace_api_key,
             :rackspace_username => @rackspace_username,
             :rackspace_auth_url => @rackspace_auth_url,
             :connection_options => @connection_options
-          }
-
-          super(options)
+          })
         end
       end
     end

data/lib/fog/rackspace/identity.rb

@@ -3,6 +3,7 @@ require 'fog/rackspace'
 module Fog
   module Rackspace
     class Identity < Fog::Service
+
       US_ENDPOINT = 'https://identity.api.rackspacecloud.com/v2.0'
       UK_ENDPOINT = 'https://lon.identity.api.rackspacecloud.com/v2.0'
 
@@ -33,7 +34,7 @@ module Fog
       request :update_user
       request :delete_user
 
-      class Mock
+      class Mock < Fog::Rackspace::Service
         attr_reader :service_catalog
         
         def request
@@ -41,7 +42,7 @@ module Fog
         end
       end
 
-      class Real
+      class Real < Fog::Rackspace::Service
         attr_reader :service_catalog, :auth_token
         
         def initialize(options={})
@@ -50,36 +51,19 @@ module Fog
           @rackspace_region = options[:rackspace_region]
           @rackspace_auth_url = options[:rackspace_auth_url] || US_ENDPOINT
 
-          uri = URI.parse(@rackspace_auth_url)
-          @host = uri.host
-          @path = uri.path
-          @port = uri.port
-          @scheme = uri.scheme
+          @uri = URI.parse(@rackspace_auth_url)
+          @host = @uri.host
+          @path = @uri.path
+          @port = @uri.port
+          @scheme = @uri.scheme
           @persistent = options[:persistent] || false
           @connection_options = options[:connection_options] || {}
-          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+          @connection = Fog::Connection.new(@uri.to_s, @persistent, @connection_options)
 
           authenticate
         end
         
-        def request(params)
-          begin
-            parameters = params.merge!({
-              :headers => {
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              },
-              :host => @host,
-              :path => "#{@path}/#{params[:path]}"
-            })
-            response = @connection.request(parameters)
-            response.body = Fog::JSON.decode(response.body) unless response.body.empty?
-            response
-          end
-        end
-        
-        def authenticate
+        def authenticate(options={})
           data = self.create_token(@rackspace_username, @rackspace_api_key).body
           @service_catalog = ServiceCatalog.from_response(self, data)
           @auth_token = data['access']['token']['id']

data/lib/fog/rackspace/load_balancers.rb

@@ -119,41 +119,25 @@ module Fog
           @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
         end
 
-        def request(params)
-          #TODO - Unify code with other rackspace services
-          begin
-            response = @connection.request(params.merge!({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-                'X-Auth-Token' => auth_token
-              }.merge!(params[:headers] || {}),
-              :host     => endpoint_uri.host,
-              :path     => "#{endpoint_uri.path}/#{params[:path]}"
-            }))
-          rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp(error, region)
-          rescue Excon::Errors::BadRequest => error
-            raise BadRequest.slurp error
-          rescue Excon::Errors::InternalServerError => error
-            raise InternalServerError.slurp error
-          rescue Excon::Errors::HTTPStatusError => error
-            raise ServiceError.slurp error
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
+        def request(params, parse_json = true, &block)
+          super(params, parse_json, &block)
+        rescue Excon::Errors::NotFound => error
+          raise NotFound.slurp(error, region)
+        rescue Excon::Errors::BadRequest => error
+          raise BadRequest.slurp error
+        rescue Excon::Errors::InternalServerError => error
+          raise InternalServerError.slurp error
+        rescue Excon::Errors::HTTPStatusError => error
+          raise ServiceError.slurp error
         end
 
-        def authenticate
-          options = {
+        def authenticate(options={})
+          super({
             :rackspace_api_key => @rackspace_api_key,
             :rackspace_username => @rackspace_username,
             :rackspace_auth_url => @rackspace_auth_url,
             :connection_options => @connection_options
-          }
-          super(options)
+          })
         end
 
         def service_name

data/lib/fog/rackspace/mock_data.rb

@@ -14,7 +14,7 @@ module Fog
             network_id = Fog::Rackspace::MockData.uuid
 
             flavor = {
-              "OS-FLV-DISABLED:disabled" => false,
+              "OS-FLV-EXT-DATA:ephemeral" => 4,
               "disk"  => 20,
               "id"    => flavor_id,
               "links" => [
@@ -89,8 +89,8 @@ module Fog
             }
 
             #Block Storage
-            volume_type1_id = Fog::Mock.random_numbers(3).to_i
-            volume_type2_id = Fog::Mock.random_numbers(3).to_i
+            volume_type1_id = Fog::Mock.random_numbers(3).to_s
+            volume_type2_id = Fog::Mock.random_numbers(3).to_s
 
             volume_type1 = {
               "id" => volume_type1_id,

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

@@ -65,7 +65,7 @@ module Fog
           true
         end
 
-        def save
+        def save(options = {})
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :flavor_id, :image_id
           options = {

data/lib/fog/rackspace/models/identity/users.rb

@@ -18,7 +18,7 @@ module Fog
           new(data)
         rescue Excon::Errors::NotFound
           nil
-        rescue Excon::Errors::NotAuthorized
+        rescue Excon::Errors::Unauthorized
           nil
         end
 
@@ -27,7 +27,7 @@ module Fog
           new(data)
         rescue Excon::Errors::NotFound
           nil
-        rescue Excon::Errors::NotAuthorized
+        rescue Excon::Errors::Unauthorized
           nil
         end
       end

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

@@ -227,6 +227,7 @@ module Fog
           options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin
           options['Origin'] = origin if origin
           options['Content-Disposition'] = content_disposition if content_disposition
+          options['Etag'] = etag if etag
           options.merge!(metadata.to_headers)
 
           data = service.put_object(directory.key, key, body, options)

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

@@ -23,7 +23,9 @@ module Fog
             :expects  => 200,
             :method   => 'GET',
             :path     => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
-          }), false)
+          }),
+          false,
+          &block)
         end
 
       end

data/lib/fog/rackspace/service.rb

@@ -26,12 +26,54 @@ module Fog
         @uri = URI.parse url
       end
 
-      def authenticate(options)
+      def authenticate(options={})
          self.send authentication_method, options
       end
 
+      def request(params, parse_json = true, &block)
+        first_attempt = true
+        begin
+          response = @connection.request(request_params(params), &block)
+        rescue Excon::Errors::Unauthorized => error
+          raise error unless first_attempt
+          first_attempt = false
+          authenticate
+          retry
+        end
+
+        process_response(response) if parse_json
+        response
+      end
+
       private
 
+      def process_response(response)
+        if response && response.body && response.body.is_a?(String) && Fog::Rackspace.json_response?(response)
+          begin
+            response.body = Fog::JSON.decode(response.body)
+          rescue MultiJson::DecodeError => e
+            Fog::Logger.warning("Error Parsing response json - #{e}")
+            response.body = {}
+          end
+        end
+      end
+
+      def headers(options={})
+        h = {
+          'Content-Type' => 'application/json',
+          'Accept' => 'application/json',
+          'X-Auth-Token' => auth_token
+        }.merge(options[:headers] || {})
+      end
+
+      def request_params(params)
+        params.merge({
+          :headers  => headers(params),
+          :host     => endpoint_uri.host,
+          :path     => "#{endpoint_uri.path}/#{params[:path]}"
+        })
+      end
+
       def authentication_method
         if v2_authentication?
           :authenticate_v2

data/lib/fog/rackspace/storage.rb

@@ -139,37 +139,15 @@ module Fog
         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] || {}),
-              :host     => endpoint_uri.host,
-              :path     => "#{endpoint_uri.path}/#{params[:path]}",
-            }), &block)
-          rescue Excon::Errors::Unauthorized => error
-            if error.response.body != 'Bad username or password' # token expiration
-              @rackspace_must_reauthenticate = true
-              authenticate
-              retry
-            else # bad credentials
-              raise error
-            end
-          rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp(error, region)
-          rescue Excon::Errors::BadRequest => error
-            raise BadRequest.slurp error
-          rescue Excon::Errors::InternalServerError => error
-            raise InternalServerError.slurp error
-          rescue Excon::Errors::HTTPStatusError => error
-            raise ServiceError.slurp error
-          end
-          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
+          super(params, parse_json, &block)
+        rescue Excon::Errors::NotFound => error
+          raise NotFound.slurp(error, region)
+        rescue Excon::Errors::BadRequest => error
+          raise BadRequest.slurp error
+        rescue Excon::Errors::InternalServerError => error
+          raise InternalServerError.slurp error
+        rescue Excon::Errors::HTTPStatusError => error
+          raise ServiceError.slurp error
         end
 
         def service_net?

data/lib/fog/xenserver/compute.rb

@@ -74,6 +74,8 @@ module Fog
       request :destroy_network
       request :create_vlan
       request :destroy_vlan
+      request :snapshot_server
+      request :snapshot_revert
     
       class Real
         

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

@@ -50,6 +50,7 @@ module Fog
         attribute :hvm_boot_policy,      :aliases => :HVM_boot_policy
         attribute :hvm_boot_params,      :aliases => :HVM_boot_params
         attribute :pci_bus,              :aliases => :PCI_bus
+        attribute :snapshots
 
         def initialize(attributes={})
           super
@@ -198,14 +199,15 @@ module Fog
           service.provision_server reference
         end
 
-        # def snapshot
-        #   requires :reference, :name_label
-        #   data = service.snapshot_server(@reference, @name_label)
-        #   merge_attributes(data.body)
-        #   true
-        # end
+        def snapshot(name)
+          service.snapshot_server(reference, name)
+        end
+
+        def revert(snapshot_ref)
+          service.snapshot_revert(snapshot_ref)
+        end
       end
 
     end
   end
-end
+end

data/lib/fog/xenserver/requests/compute/snapshot_revert.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        def snapshot_revert( snapshot_ref, extra_args = {})
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.revert'}, snapshot_ref)
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_revert()
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/snapshot_server.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        def snapshot_server( vm_ref , name, extra_args = {})
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.snapshot'}, vm_ref, name)
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_server()
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end