fog 1.12.1 → 1.13.0

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

@@ -3,38 +3,11 @@ module Fog
     class Rackspace
       class Real
 
-        # Create a new manifest object
+        # Create a new dynamic large object manifest
         #
-        # Creates an object with a +X-Object-Manifest+ header that specifies the common prefix ("<container>/<prefix>")
-        # for all uploaded segments. Retrieving the manifest object streams all segments matching this prefix.
-        # Segments must sort in the order they should be concatenated. Note that any future objects stored in the container
-        # along with the segments that match the prefix will be included when retrieving the manifest object.
-        #
-        # All segments must be stored in the same container, but may be in a different container than the manifest object.
-        # The default +X-Object-Manifest+ header is set to "+container+/+object+", but may be overridden in +options+
-        # to specify the prefix and/or the container where segments were stored.
-        # If overridden, names should be CGI escaped (excluding spaces) if needed (see {Fog::Rackspace.escape}).
-        #
-        # @param container [String] Name for container where +object+ will be stored. Should be < 256 bytes and must not contain '/'
-        # @param object [String] Name for manifest object.
-        # @param options [Hash] Config headers for +object+.
-        # @option options [String] 'X-Object-Manifest' ("container/object") "<container>/<prefix>" for segment objects.
-        #
-        # @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]
-        #
-        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Large_Object_Creation-d1e2019.html
+        # This is an alias for {#put_dynamic_obj_manifest} for backward compatibility.
         def put_object_manifest(container, object, options = {})
-          path = "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
-          headers = {'X-Object-Manifest' => path}.merge(options)
-          request(
-            :expects  => 201,
-            :headers  => headers,
-            :method   => 'PUT',
-            :path     => path
-          )
+          put_dynamic_obj_manifest(container, object, options)
         end
 
       end

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

@@ -0,0 +1,60 @@
+module Fog
+  module Storage
+    class Rackspace
+      class Real
+
+        # Create a new static large object manifest.
+        #
+        # A static large object is similar to a dynamic large object. Whereas a GET for a dynamic large object manifest
+        # will stream segments based on the manifest's +X-Object-Manifest+ object name prefix, a static large object
+        # manifest streams segments which are defined by the user within the manifest. Information about each segment is
+        # provided in +segments+ as an Array of Hash objects, ordered in the sequence which the segments should be streamed.
+        #
+        # When the SLO manifest is received, each segment's +etag+ and +size_bytes+ will be verified.
+        # The +etag+ for each segment is returned in the response to {#put_object}, but may also be calculated.
+        # e.g. +Digest::MD5.hexdigest(segment_data)+
+        #
+        # The maximum number of segments for a static large object is 1000, and all segments (except the last) must be
+        # at least 1 MiB in size. Unlike a dynamic large object, segments are not required to be in the same container.
+        #
+        # @example
+        #   segments = [
+        #     { :path => 'segments_container/first_segment',
+        #       :etag => 'md5 for first_segment',
+        #       :size_bytes => 'byte size of first_segment' },
+        #     { :path => 'segments_container/second_segment',
+        #       :etag => 'md5 for second_segment',
+        #       :size_bytes => 'byte size of second_segment' }
+        #   ]
+        #   put_static_obj_manifest('my_container', 'my_large_object', segments)
+        #
+        # @param container [String] Name for container where +object+ will be stored.
+        #     Should be < 256 bytes and must not contain '/'
+        # @param object [String] Name for manifest object.
+        # @param segments [Array<Hash>] Segment data for the object.
+        # @param options [Hash] Config headers for +object+.
+        #
+        # @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]
+        # @raise [Excon::Errors::Unauthorized] HTTP 401
+        #
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Uploading_the_Manifext-d1e2227.html
+        def put_static_obj_manifest(container, object, segments, options = {})
+          request(
+            :expects  => 201,
+            :method   => 'PUT',
+            :headers  => options,
+            :body     => Fog::JSON.encode(segments),
+            :path     => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}",
+            :query    => { 'multipart-manifest' => 'put' }
+          )
+        end
+
+      end
+    end
+  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

@@ -25,6 +25,8 @@ module Fog
       request :copy_object
       request :delete_container
       request :delete_object
+      request :delete_static_large_object
+      request :delete_multiple_objects
       request :get_container
       request :get_containers
       request :get_object
@@ -35,6 +37,8 @@ module Fog
       request :put_container
       request :put_object
       request :put_object_manifest
+      request :put_dynamic_obj_manifest
+      request :put_static_obj_manifest
       request :post_set_meta_temp_url_key
 
       module Utils
@@ -54,7 +58,7 @@ module Fog
           end
         end
 
-      end      
+      end
 
       class Mock < Fog::Rackspace::Service
         include Utils
@@ -107,7 +111,7 @@ module Fog
           @rackspace_servicenet = options[:rackspace_servicenet]
           @rackspace_auth_token = options[:rackspace_auth_token]
           @rackspace_storage_url = options[:rackspace_storage_url]
-          @rackspace_cdn_url = options[:rackspace_cdn_url]          
+          @rackspace_cdn_url = options[:rackspace_cdn_url]
           @rackspace_region = options[:rackspace_region] || :dfw
           @rackspace_temp_url_key = options[:rackspace_temp_url_key]
           @rackspace_must_reauthenticate = false
@@ -117,8 +121,8 @@ module Fog
           @persistent = options[:persistent] || false
           Excon.defaults[:ssl_verify_peer] = false if service_net?
           @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
-        end        
-        
+        end
+
         # Return Account Details
         # @return [Fog::Storage::Rackspace::Account] account details object
         def account
@@ -139,43 +143,21 @@ 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?
           @rackspace_servicenet == true
-        end        
-        
+        end
+
         def authenticate
           if @rackspace_must_reauthenticate || @rackspace_auth_token.nil?
             options = {
@@ -183,14 +165,14 @@ module Fog
               :rackspace_username => @rackspace_username,
               :rackspace_auth_url => @rackspace_auth_url,
               :connection_options => @connection_options
-            }            
+            }
             super(options)
           else
             @auth_token = @rackspace_auth_token
             @uri = URI.parse(@rackspace_storage_url)
           end
         end
-        
+
         def service_name
           :cloudFiles
         end
@@ -206,15 +188,15 @@ module Fog
           @uri.host = "snet-#{@uri.host}" if service_net?
           @uri
         end
-    
-        private 
-        
+
+        private
+
         def authenticate_v1(options)
           credentials = Fog::Rackspace.authenticate(options, @connection_options)
           endpoint_uri credentials['X-Storage-Url']
           @auth_token = credentials['X-Auth-Token']
         end
-    
+
       end
     end
   end

data/lib/fog/riakcs/provisioning.rb

@@ -64,7 +64,8 @@ module Fog
             :aws_secret_access_key => @riakcs_secret_access_key,
             :host                  => @host,
             :port                  => @port,
-            :scheme                => @scheme
+            :scheme                => @scheme,
+            :connection_options    => @connection_options
           )
         end
 

data/lib/fog/riakcs/usage.rb

@@ -56,7 +56,8 @@ module Fog
             :aws_secret_access_key => @riakcs_secret_access_key,
             :host                  => @host,
             :port                  => @port,
-            :scheme                => @scheme
+            :scheme                => @scheme,
+            :connection_options    => @connection_options
           )
         end
       end

data/lib/fog/vcloud/requests/compute/configure_vm_cpus.rb

@@ -24,7 +24,7 @@ EOF
           request(
             :body     => body,
             :expects  => 202,
-            :headers  => {'Content-Type' => vm_data[:"vcloud_type"] },
+            :headers  => { 'Content-Type' => vm_data[:"vcloud_type"] || 'application/vnd.vmware.vcloud.rasdItem+xml' },
             :method   => 'PUT',
             :uri      => "#{edit_uri}",
             :parse    => true

data/lib/fog/vcloud/requests/compute/configure_vm_memory.rb

@@ -25,7 +25,7 @@ EOF
           request(
             :body     => body,
             :expects  => 202,
-            :headers  => {'Content-Type' => vm_data[:"vcloud_type"] },
+            :headers  => { 'Content-Type' => vm_data[:"vcloud_type"] || 'application/vnd.vmware.vcloud.rasdItem+xml' },
             :method   => 'PUT',
             :uri      => edit_uri,
             :parse    => true

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.12.1'
+  VERSION = '1.13.0'
 end

data/lib/fog/vsphere/requests/compute/get_folder.rb

@@ -31,7 +31,7 @@ module Fog
           dc_root_folder = dc.vmFolder
           # Filter the root path for this datacenter not to be used."
           dc_root_folder_path=dc_root_folder.path.map { | id, name | name }.join("/")
-          paths          = path.sub(/^\/?#{Regex.quote(dc_root_folder_path)}\/?/, '').split('/')
+          paths          = path.sub(/^\/?#{Regexp.quote(dc_root_folder_path)}\/?/, '').split('/')
 
           return dc_root_folder if paths.empty?
           # Walk the tree resetting the folder pointer as we go

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

data/lib/fog/xml.rb

@@ -0,0 +1,21 @@
+require "nokogiri"
+require "fog/core/parser"
+
+module Fog
+
+  # @note Extracting XML components out of core is a work in progress.
+  #
+  # The {XML} module includes functionality that is common between APIs using
+  # XML to send and receive data.
+  #
+  # The intent is to provide common code for provider APIs using XML but not
+  # require it for those using JSON.
+  #
+  # @todo Add +require "fog/xml"+ and/or +include Fog::XML+ to providers using
+  #   its services
+  #
+  module XML
+  end
+end
+
+require "fog/xml/sax_parser_connection"