fog 1.9.0 → 1.10.0

data/lib/fog/hp/requests/compute/update_metadata.rb

@@ -0,0 +1,60 @@
+module Fog
+  module Compute
+    class HP
+      class Real
+
+        # Update metadata for specific collections
+        #
+        # ==== Parameters
+        # * 'collection_name'<~String> - name of the collection i.e. images, servers for which the metadata is intented.
+        # * 'parent_id'<~Integer> - id of the collection i.e. image_id or the server_id
+        # * 'metadata'<~Hash> - A hash of key/value pairs containing the metadata
+
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * metadata<~Hash> - all key/value pairs of metadata items merged with existing metadata
+        #
+        def update_metadata(collection_name, parent_id, metadata = {})
+          request(
+            :body     => Fog::JSON.encode({ 'metadata' => metadata }),
+            :expects  => 200,
+            :method   => 'POST',
+            :path     => "#{collection_name}/#{parent_id}/metadata.json"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def update_metadata(collection_name, parent_id, metadata = {})
+
+          if collection_name == "images" then
+            if get_image_details(parent_id)
+              newmetadata = self.data[:images][parent_id]['metadata'].merge!(metadata)
+            else
+              raise Fog::Compute::HP::NotFound
+            end
+          end
+
+          if collection_name == "servers" then
+            if get_server_details(parent_id)
+              newmetadata = self.data[:servers][parent_id]['metadata'].merge!(metadata)
+            else
+              raise Fog::Compute::HP::NotFound
+            end
+          end
+
+          response = Excon::Response.new
+          response.body = { "metadata" => newmetadata }
+          response.status = 200
+          response
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/hp/requests/storage/delete_shared_object.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Storage
+    class HP
+      class Real
+
+        # Delete a shared object
+        #
+        # ==== Parameters
+        # * shared_object_url<~String> - Url of the shared object
+        #
+        def delete_shared_object(shared_object_url)
+          # split up the shared object url
+          uri = URI.parse(shared_object_url)
+          path   = uri.path
+
+          response = shared_request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => path
+          )
+          response
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def delete_shared_object(shared_object_url)
+          response = Excon::Response.new
+          response.status = 204
+          response
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -10,18 +10,20 @@ module Fog
         # * object<~String> - Name of object to look for
         #
         def get_object(container, object, &block)
-          params = {}
-
           if block_given?
-            params[:response_block] = Proc.new
+            response = request(
+              :response_block  => block,
+              :expects  => 200,
+              :method   => 'GET',
+              :path     => "#{Fog::HP.escape(container)}/#{Fog::HP.escape(object)}"
+            )
+          else
+            response = request({
+              :expects  => 200,
+              :method   => 'GET',
+              :path     => "#{Fog::HP.escape(container)}/#{Fog::HP.escape(object)}"
+            }, false, &block)
           end
-
-          response = request(params.merge!({
-            :block    => block,
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => "#{Fog::HP.escape(container)}/#{Fog::HP.escape(object)}"
-          }), false)
           response
         end
 

data/lib/fog/hp/requests/storage/get_object_temp_url.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Storage
+    class HP
+
+      class Real
+
+        # Generate a temporary url for an object
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container
+        # * object<~String> - Name of object
+        # * expires<~Integer> - Time the temporary url expire in secs.
+        # * method<~String> - Allowed HTTP method GET, PUT, HEAD only
+        def get_object_temp_url(container, object, expires, method)
+          generate_object_temp_url(container, object, expires, method)
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def get_object_temp_url(container, object, expires, method)
+          @hp_storage_uri = "https://swift-cluster.example.com:443/v1/account"
+
+          generate_object_temp_url(container, object, expires, method)
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/hp/requests/storage/get_shared_container.rb

@@ -0,0 +1,75 @@
+module Fog
+  module Storage
+    class HP
+      class Real
+
+        # Get details for a shared container
+        #
+        # ==== Parameters
+        # * shared_container_url<~String> - Url of the shared container
+        # * options<~String>:
+        #   * 'limit'<~String> - Maximum number of objects to return
+        #   * 'marker'<~String> - Only return objects whose name is greater than marker
+        #   * 'prefix'<~String> - Limits results to those starting with prefix
+        #   * 'path'<~String> - Return objects nested in the pseudo path
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * headers<~Hash>:
+        #     * 'X-Container-Object-Count'<~String> - Count of objects in container
+        #     * 'X-Container-Bytes-Used'<~String> - Bytes used
+        #     * 'X-Trans-Id'<~String> - Trans Id
+        #   * body<~Array>:
+        #     * item<~Hash>:
+        #       * 'bytes'<~String> - Size of object
+        #       * 'content_type'<~String> Content-Type of object
+        #       * 'hash'<~String> - Hash of object (etag?)
+        #       * 'last_modified'<~String> - Last modified timestamp
+        #       * 'name'<~String> - Name of object
+        def get_shared_container(shared_container_url, options = {})
+          options = options.reject {|key, value| value.nil?}
+          # split up the shared container url
+          uri = URI.parse(shared_container_url)
+          path   = uri.path
+
+          response = shared_request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => path,
+            :query    => {'format' => 'json'}.merge!(options)
+          )
+          response
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def get_shared_container(shared_container_url, options = {})
+          response = Excon::Response.new
+          data = {
+            'name'          => Fog::Mock.random_letters(10),
+            'hash'          => Fog::HP::Mock.etag,
+            'bytes'         => 11,
+            'content_type'  => "text/plain",
+            'last_modified' => Time.now
+          }
+          response.status = 200
+          response.body = [data]
+          response.headers = {
+            'X-Container-Object-Count' => 1,
+            'X-Container-Bytes-Used'   => 11,
+            'Accept-Ranges'            => 'bytes',
+            'Content-Type'             => "application/json",
+            'Content-Length'           => 11,
+            'X-Trans-Id'               => "tx#{Fog::Mock.random_hex(32)}"
+          }
+          response
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/hp/requests/storage/get_shared_object.rb

@@ -0,0 +1,66 @@
+module Fog
+  module Storage
+    class HP
+      class Real
+
+        # Get details for a shared object
+        #
+        # ==== Parameters
+        # * shared_object_url<~String> - Url of the shared object
+        #
+        def get_shared_object(shared_object_url, &block)
+          # split up the shared object url
+          uri = URI.parse(shared_object_url)
+          path   = uri.path
+
+          if block_given?
+            response = shared_request(
+              :response_block  => block,
+              :expects  => 200,
+              :method   => 'GET',
+              :path     => path
+            )
+          else
+            response = shared_request({
+              :expects  => 200,
+              :method   => 'GET',
+              :path     => path
+            }, false, &block)
+          end
+          response
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def get_shared_object(shared_object_url, &block)
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            'Last-Modified'            => Date.today.rfc822,
+            'Etag'                     => Fog::HP::Mock.etag,
+            'Accept-Ranges'            => 'bytes',
+            'Content-Type'             => "text/plain",
+            'Content-Length'           => 11,
+            'X-Trans-Id'               => "tx#{Fog::Mock.random_hex(32)}"
+          }
+          unless block_given?
+            response.body = "This is a sample text.\n"
+          else
+            data = StringIO.new("This is a sample text.\n")
+            remaining = data.length
+            while remaining > 0
+              chunk = data.read([remaining, Excon::CHUNK_SIZE].min)
+              block.call(chunk)
+              remaining -= Excon::CHUNK_SIZE
+            end
+          end
+          response
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/hp/requests/storage/head_container.rb

@@ -30,6 +30,7 @@ module Fog
         def head_container(container_name)
           response = get_container(container_name)
           response.body = nil
+          response.status = 204
           response
         end
 

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

@@ -25,6 +25,7 @@ module Fog
         def head_object(container_name, object_name, options = {})
           response = get_object(container_name, object_name, options)
           response.body = nil
+          response.status = 200
           response
         end
 

data/lib/fog/hp/requests/storage/head_shared_container.rb

@@ -0,0 +1,45 @@
+module Fog
+  module Storage
+    class HP
+      class Real
+
+        # List number of objects and total bytes stored for a shared container
+        #
+        # ==== Parameters
+        # * shared_container_url<~String> - Url of the shared container
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * headers<~Hash>:
+        #     * 'X-Container-Object-Count'<~String> - Count of containers
+        #     * 'X-Container-Bytes-Used'<~String>   - Bytes used
+        def head_shared_container(shared_container_url)
+          # split up the shared container url
+          uri = URI.parse(shared_container_url)
+          path   = uri.path
+
+          response = shared_request(
+            :expects  => 204,
+            :method   => 'HEAD',
+            :path     => path,
+            :query    => {'format' => 'json'}
+          )
+          response
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def head_shared_container(shared_container_url)
+          response = get_shared_container(shared_container_url)
+          response.body = nil
+          response.status = 204
+          response
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/hp/requests/storage/head_shared_object.rb

@@ -0,0 +1,39 @@
+module Fog
+  module Storage
+    class HP
+      class Real
+
+        # Get headers for shared object
+        #
+        # ==== Parameters
+        # * * shared_object_url<~String> - Url of the shared object
+        #
+        def head_shared_object(shared_object_url)
+          # split up the shared object url
+          uri = URI.parse(shared_object_url)
+          path   = uri.path
+
+          response = shared_request({
+            :expects  => 200,
+            :method   => 'HEAD',
+            :path     => path
+          }, false)
+          response
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def head_shared_object(shared_object_url)
+          response = get_shared_object(shared_object_url)
+          response.body = nil
+          response.status = 200
+          response
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/hp/requests/storage/put_container.rb

@@ -22,16 +22,16 @@ module Fog
 
       class Mock # :nodoc:all
         def put_container(container_name, options = {})
-          acl = options['X-Container-Read'] || 'private'
-          if !['private', 'public-read'].include?(acl)
-            #raise Excon::Errors::BadRequest.new('invalid X-Container-Read')
-          else
-            self.data[:acls][:container][container_name] = self.class.acls(acl)
+          read_h  = options['X-Container-Read']  || ''
+          write_h = options['X-Container-Write'] || ''
+          unless options
+            read_acl, write_acl = self.class.header_to_perm_acl(read_h, write_h)
+            self.data[:acls][:container][container_name] = {:read_acl => read_acl, :write_acl => write_acl}
           end
 
           response = Excon::Response.new
           container = {
-            :objects        => {},
+            :objects  => {}
           }
           if self.data[:containers][container_name]
             response.status = 202

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

@@ -8,9 +8,20 @@ module Fog
         # ==== Parameters
         # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
         #
-        def put_object(container, object, data, options = {})
+        def put_object(container, object, data, options = {}, &block)
           data = Fog::Storage.parse_data(data)
           headers = data[:headers].merge!(options)
+          if block_given?
+            headers['Transfer-Encoding'] = 'chunked'
+            headers.delete('Content-Length')
+            return request(
+              :request_block     => block,
+              :expects  => 201,
+              :headers  => headers,
+              :method   => 'PUT',
+              :path     => "#{Fog::HP.escape(container)}/#{Fog::HP.escape(object)}"
+            )
+          end
           if headers.has_key?('Transfer-Encoding')
             headers.delete('Content-Length')
           end