fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/openstack/requests/storage/put_object.rb

@@ -5,17 +5,26 @@ module Fog
 
         # Create a new object
         #
+        # When passed a block, it will make a chunked request, calling
+        # the block for chunks until it returns an empty string.
+        # In this case the data parameter is ignored.
+        #
         # ==== Parameters
         # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
         # * object<~String> - Name for object
         # * data<~String|File> - data to upload
         # * options<~Hash> - config headers for object. Defaults to {}.
+        # * block<~Proc> - chunker
         #
         def put_object(container, object, data, options = {}, &block)
-          data = Fog::Storage.parse_data(data)
-          headers = data[:headers].merge!(options)
-
-          params = block_given? ? { :request_block => block } : { :body => data[:body] }
+          if block_given?
+            params = { :request_block => block }
+            headers = options
+          else
+            data = Fog::Storage.parse_data(data)
+            headers = data[:headers].merge!(options)
+            params = { :body => data[:body] }
+          end
 
           params.merge!(
             :expects    => 201,

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

@@ -3,33 +3,11 @@ module Fog
     class OpenStack
       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.
-        #
-        # @see http://docs.openstack.org/api/openstack-object-storage/1.0/content/large-object-creation.html
+        # This is an alias for {#put_dynamic_obj_manifest} for backward compatibility.
         def put_object_manifest(container, object, options = {})
-          path = "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.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/openstack/requests/storage/put_static_obj_manifest.rb

@@ -0,0 +1,57 @@
+module Fog
+  module Storage
+    class OpenStack
+      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::OpenStack::NotFound] HTTP 404
+        # @raise [Excon::Errors::BadRequest] HTTP 400
+        # @raise [Excon::Errors::Unauthorized] HTTP 401
+        # @raise [Excon::Errors::HTTPStatusError]
+        #
+        # @see http://docs.openstack.org/api/openstack-object-storage/1.0/content/static-large-objects.html
+        def put_static_obj_manifest(container, object, segments, options = {})
+          request(
+            :expects  => 201,
+            :method   => 'PUT',
+            :headers  => options,
+            :body     => Fog::JSON.encode(segments),
+            :path     => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}",
+            :query    => { 'multipart-manifest' => 'put' }
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+        def get_volume_type_details(volume_type_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "types/#{volume_type_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_volume_details(volume_type_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "volume_type" => {
+              "id" => "1",
+              "name" => "type 1",
+              "extra_specs" => {
+                "volume_backend_name" => "type 1 backend name"
+              }
+            }
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+        def list_volume_types(options={})
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'types',
+            :query    => options
+          )
+        end
+      end
+
+      class Mock
+        def list_volume_types(options={})
+          response = Excon::Response.new
+          response.status = 200
+          self.data[:volume_types] ||= [
+            {
+              "id" => "1",
+              "name" => "type 1",
+              "extra_specs" => {
+                "volume_backend_name" => "type 1 backend name"
+              }
+            },
+            {
+              "id" => "2",
+              "name" => "type 2",
+              "extra_specs" => {
+                "volume_backend_name" => "type 2 backend name"
+              }
+            }
+          ]
+          response.body = { 'volume_types' => self.data[:volume_types] }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -3,13 +3,13 @@ module Fog
     class OpenStack
       class Real
 
-        def list_volumes(detailed=true)
-
+        def list_volumes(detailed=true, options={})
           path = detailed ? 'volumes/detail' : 'volumes'
           request(
             :expects  => 200,
             :method   => 'GET',
-            :path     => path
+            :path     => path,
+            :query    => options
           )
         end
 
@@ -17,7 +17,7 @@ module Fog
 
       class Mock
 
-        def list_volumes(detailed=true)
+        def list_volumes(detailed=true, options={})
           response = Excon::Response.new
           response.status = 200
           self.data[:volumes] ||= [

data/lib/fog/openstack/storage.rb

@@ -21,6 +21,8 @@ module Fog
       request :copy_object
       request :delete_container
       request :delete_object
+      request :delete_multiple_objects
+      request :delete_static_large_object
       request :get_container
       request :get_containers
       request :get_object
@@ -31,6 +33,8 @@ module Fog
       request :put_container
       request :put_object
       request :put_object_manifest
+      request :put_dynamic_obj_manifest
+      request :put_static_obj_manifest
 
       class Mock
 
@@ -145,9 +149,9 @@ module Fog
             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}/#{params[:path]}",
             }))
           rescue Excon::Errors::Unauthorized => error

data/lib/fog/openstack/volume.rb

@@ -16,6 +16,8 @@ module Fog
       model       :volume
       collection  :volumes
 
+      model       :volume_type
+      collection  :volume_types
 
       request_path 'fog/openstack/requests/volume'
 
@@ -25,11 +27,14 @@ module Fog
       request :get_volume_details
       request :delete_volume
 
+      request :list_volume_types
+      request :get_volume_type_details
+
       request :create_volume_snapshot
       request :list_snapshots
       request :get_snapshot_details
       request :delete_snapshot
- 
+
       request :update_quota
       request :get_quota
       request :get_quota_defaults
@@ -157,7 +162,6 @@ module Fog
                 'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{@path}/#{params[:path]}"#,
             }))
           rescue Excon::Errors::Unauthorized => error

data/lib/fog/openstack.rb

@@ -72,7 +72,6 @@ module Fog
           'X-Auth-Key'  => @openstack_api_key,
           'X-Auth-User' => @openstack_username
         },
-        :host     => uri.host,
         :method   => 'GET',
         :path     =>  (uri.path and not uri.path.empty?) ? uri.path : 'v1.0'
       })
@@ -108,7 +107,6 @@ module Fog
             :headers => {'Content-Type' => 'application/json',
                          'Accept' => 'application/json',
                          'X-Auth-Token' => body['access']['token']['id']},
-            :host    => uri.host,
             :method  => 'GET'
           })
 
@@ -206,7 +204,6 @@ module Fog
         :expects  => [200, 204],
         :headers  => {'Content-Type' => 'application/json'},
         :body     => Fog::JSON.encode(request_body),
-        :host     => uri.host,
         :method   => 'POST',
         :path     => (uri.path and not uri.path.empty?) ? uri.path : 'v2.0'
       })
@@ -221,7 +218,6 @@ module Fog
         :headers => {'Content-Type' => 'application/json',
                      'Accept' => 'application/json',
                      'X-Auth-Token' => auth_token},
-        :host    => uri.host,
         :method  => 'GET'
       })
 

data/lib/fog/rackspace/auto_scale.rb

@@ -123,6 +123,10 @@ module Fog
             :autoscale
           end
 
+          def request_id_header
+            "x-response-id"
+          end
+
           def region
             @options[:rackspace_region]
           end

data/lib/fog/rackspace/block_storage.rb

@@ -26,8 +26,6 @@ module Fog
 
       model :volume_type
       collection :volume_types
-      model :snapshot
-      collection :snapshots
 
       model :snapshot
       collection :snapshots

data/lib/fog/rackspace/compute.rb

@@ -240,10 +240,7 @@ module Fog
 
          def endpoint_uri(service_endpoint_url=nil)
            return @uri if @uri
-
-           @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_compute_v1_url)
-           @uri.host = "snet-#{@uri.host}" if service_net?
-           @uri
+           super(@rackspace_endpoint || service_endpoint_url, :rackspace_compute_v1_url)
          end
 
          private