fog-openstack 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 312e6d4047265d21afbec1d567737d1df00bdba0
-  data.tar.gz: ecc4a345b353514f3b90e06517306470d687862b
+SHA256:
+  metadata.gz: ffc2802770e40d637228d8256fcc4920f2be1d9082c4afcf8a2496df977c2da6
+  data.tar.gz: 46ecf9ab40374c917f2f91de332b009fc115ee2a894ff7655c68f35f3b19ac02
 SHA512:
-  metadata.gz: 2c79549368ed986a4a82076a8a47c28132673e4e1a40ca5a650bc5c2f440f48058822442f7b4178f18e78d60b1caf123bfb4d90d90f61915901782866ebcd8dd
-  data.tar.gz: 5e76051a410e35fc90a7cd2f8c43df468b9c5ad08c7d2e03d197607a2e8de1662f3bc08760ca43c4d93fbf225d8bda3b298e03fc32678680815ec028f0bb5efd
+  metadata.gz: b7ddae4e8cec62c0b40689c777e906289f71431b72a802b3e9976d2487bcf55ab76709b2dbbd232626680ae7ed3c30a8dffecf06c22bf4d4bdff762330f0860f
+  data.tar.gz: d4fb6894587e32a9bceaa17056bcd865b84da9dcc49d325e610c857277801f56cc7fee8221908021fdd128317555ecdf6ff34c9f4bd8d24dc1ef04d24b3d8b94

data/lib/fog/openstack/core.rb

@@ -208,7 +208,7 @@ module Fog
 
           token = Fog::OpenStack::Auth::Token.build(openstack_options, @connection_options)
 
-          @openstack_management_url = if token.catalog
+          @openstack_management_url = if token.catalog && !token.catalog.payload.empty?
                                         token.catalog.get_endpoint_url(
                                           @openstack_service_type,
                                           @openstack_endpoint_type,

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '1.0.3'.freeze
+    VERSION = '1.0.4'.freeze
   end
 end

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

@@ -1,17 +1,6 @@
 module Fog
   module OpenStack
     class Volume
-      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
         def update_volume(volume_id, data = {})
           response        = Excon::Response.new

data/lib/fog/openstack/volume/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/openstack/volume/v1/requests/update_volume.rb

@@ -1,2 +1,19 @@
 require 'fog/openstack/volume/requests/update_volume'
 require 'fog/openstack/volume/v1/requests/real'
+
+module Fog
+  module OpenStack
+    class Volume
+      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/openstack/volume/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/openstack/volume/v2/requests/update_volume.rb

@@ -1,2 +1,20 @@
 require 'fog/openstack/volume/requests/update_volume'
 require 'fog/openstack/volume/v2/requests/real'
+
+module Fog
+  module OpenStack
+    class Volume
+      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: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -1399,7 +1399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: OpenStack fog provider gem