fog-openstack 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4f6f296042ce4fbe8bcc9a34f41230d22120eace896faf0890bed959a01795
-  data.tar.gz: b8b6344dcd92e3c7799934a03732390046135199991cd9666ea636eae65a5829
+  metadata.gz: 051a0ad3e3a78f20fd942c90011fd5bce4798ccfbfe36a7b7f0e063e033d473c
+  data.tar.gz: 258c191d94c95a896d9d0d2a8bac64f9c8583e83e9d8913fe10a4dbf936db9e8
 SHA512:
-  metadata.gz: d2d8f82d2cd1c4590bdfe034dffb8ea523d599c628f98cca3373a5b51b46145e8f936b644011518d14042c7801fd00f0b9c802288e43e178b92514d9a8db906d
-  data.tar.gz: 749138df313ee2cc5f8cac6255573ddc21e6fb4d47ac7ebdaa19856cae0b3b5ee0e0981d7b704ea44b8e9baa5f6d0d147eaed910aa2ddd9b37d5ba9b9f72caf8
+  metadata.gz: 2c32d11143fa95c41d7502067fbc3f3acf818a836b115fbf942f80ac5107c832cf18a2f11afbe669a20973921b177e18cb39749d7984452f7f9f1db7f2c23bd5
+  data.tar.gz: b9a9b2a0509d98e6e6cfd1f1e6c0ab2e429a3f477f52081249c8a1ba5eeb745a84495e1784e66d86009e07aa42a12430d62f094432f23b09c6f7709247613717

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '0.3.7'.freeze
+    VERSION = '0.3.8'.freeze
   end
 end

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

@@ -12,7 +12,7 @@ module Fog
         # * options<~Hash> - Additional headers
         def copy_object(source_container_name, source_object_name, target_container_name, target_object_name, options = {})
           headers = {'X-Copy-From' => "/#{source_container_name}/#{source_object_name}"}.merge(options)
-          request(:expects => 201,
+          request(:expects => [201, 202],
                   :headers => headers,
                   :method  => 'PUT',
                   :path    => "#{Fog::OpenStack.escape(target_container_name)}/#{Fog::OpenStack.escape(target_object_name)}")

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

@@ -26,7 +26,7 @@ module Fog
           end
 
           params.merge!(
-            :expects    => 201,
+            :expects => [201, 202],
             :idempotent => !params[:request_block],
             :headers    => headers,
             :method     => 'PUT',

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

@@ -1,18 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      module Real
-        def update_volume(volume_id, data = {})
-          request(
-            :body    => Fog::JSON.encode('volume' => data),
-            :expects => 200,
-            :method  => 'PUT',
-            :path    => "volumes/#{volume_id}"
-          )
-        end
-      end
-
-      module Mock
+       module Mock
         def update_volume(volume_id, data = {})
           response        = Excon::Response.new
           response.status = 200

data/lib/fog/volume/openstack/v1/models/volume.rb

@@ -17,7 +17,8 @@ module Fog
             data = if id.nil?
                      service.create_volume(display_name, display_description, size, attributes)
                    else
-                     service.update_volume(id, attributes.reject { |k, _v| k == :id })
+                     attrib = attributes.select { |key| %i(display_name display_description metadata).include?(key) }
+                     service.update_volume(id, attrib)
                    end
             merge_attributes(data.body['volume'])
             true

data/lib/fog/volume/openstack/v1/requests/update_volume.rb

@@ -1,2 +1,19 @@
 require 'fog/volume/openstack/requests/update_volume'
 require 'fog/volume/openstack/v1/requests/real'
+
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def update_volume(volume_id, data = {})
+          request(
+            :body    => Fog::JSON.encode('volume' => data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "volumes/#{volume_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/volume/openstack/v2/models/volume.rb

@@ -17,7 +17,7 @@ module Fog
             data = if id.nil?
                      service.create_volume(name, description, size, attributes)
                    else
-                     service.update_volume(id, attributes.reject { |k, _v| k == :id })
+                     service.update_volume(id, attributes.select { |key| %i(name description metadata).include?(key) })
                    end
             merge_attributes(data.body['volume'])
             true

data/lib/fog/volume/openstack/v2/requests/update_volume.rb

@@ -1,2 +1,20 @@
 require 'fog/volume/openstack/requests/update_volume'
 require 'fog/volume/openstack/v2/requests/real'
+
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def update_volume(volume_id, data = {})
+          data = data.select { |key| key == :name || key == :description || key == :metadata }
+          request(
+            :body    => Fog::JSON.encode('volume' => data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "volumes/#{volume_id}"
+          )
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core