fog-openstack 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77699371cb9d1cea2f5ced1bc246594c70b412da
-  data.tar.gz: 875158fd7550f7714b0f4082ec8e7a9a0b4684ef
+  metadata.gz: e7747fff8d19d57ebe37075c44556ec030fed69b
+  data.tar.gz: a5f2d60b3888fa2053a26ed6d9e16707ef20136e
 SHA512:
-  metadata.gz: 46745f15db6c180aa55ead7a7ae8246b73bfcd489c54feb8f929b5678b9dfb9b74a0a9ecbec18697c9e70d72fce98519e8df4a017cd7638f132e0a74dda3cfba
-  data.tar.gz: 2a683b1003fbfd0dc25f22e59be0c7c02acdc615bb1fbffc8cccf66991162d6ff849d776aa75d6955d6ed823ecc72869212fd33dffe2637096012f11bdd570a3
+  metadata.gz: 853b8e7811143a70ba0fdf6806c8ef9c1646b1f83b391196ce2373189f3a054a55c44ba4e7d2cafa96a4115fcbafce50aa860b441e7770d782973151087eff4f
+  data.tar.gz: 488bd961ef8ef1df45f744dc96451dba5b63af7800e45e9faeb2be9a68c64604b9216bc2f48646a0ff8ff44d815d2ba06104dee8776871d50e7c12ea05264bbe

data/lib/fog/compute/openstack/models/server.rb

@@ -227,12 +227,16 @@ module Fog
         end
 
         def security_groups
-          requires :id
+          if id
+            requires :id
 
-          groups = service.list_security_groups(:server_id => id).body['security_groups']
+            groups = service.list_security_groups(:server_id => id).body['security_groups']
 
-          groups.map do |group|
-            Fog::Compute::OpenStack::SecurityGroup.new group.merge(:service => service)
+            groups.map do |group|
+              Fog::Compute::OpenStack::SecurityGroup.new group.merge(:service => service)
+            end
+          else
+            service.security_groups.all
           end
         end
 

data/lib/fog/compute/openstack/requests/create_key_pair.rb

@@ -13,7 +13,7 @@ module Fog
 
           request(
             :body    => Fog::JSON.encode(data),
-            :expects => 200,
+            :expects => [200, 201],
             :method  => 'POST',
             :path    => 'os-keypairs'
           )

data/lib/fog/compute/openstack/requests/delete_key_pair.rb

@@ -4,7 +4,7 @@ module Fog
       class Real
         def delete_key_pair(key_name)
           request(
-            :expects => 202,
+            :expects => [202, 204],
             :method  => 'DELETE',
             :path    => "os-keypairs/#{Fog::OpenStack.escape(key_name)}"
           )

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.24"
+    VERSION = "0.1.25"
   end
 end

data/lib/fog/storage/openstack.rb

@@ -74,7 +74,15 @@ module Fog
           require_mime_types
           @openstack_api_key = options[:openstack_api_key]
           @openstack_username = options[:openstack_username]
-          @path = '/v1/AUTH_1234'
+          @openstack_management_url = options[:openstack_management_url] || 'http://example:8774/v2/AUTH_1234'
+
+          @openstack_management_uri = URI.parse(@openstack_management_url)
+
+          @host   = @openstack_management_uri.host
+          @path   = @openstack_management_uri.path
+          @path.sub!(%r{/$}, '')
+          @port   = @openstack_management_uri.port
+          @scheme = @openstack_management_uri.scheme
         end
 
         def data

data/lib/fog/storage/openstack/models/file.rb

@@ -40,7 +40,7 @@ module Fog
 
         def body
           attributes[:body] ||= if last_modified
-                                  collection.get(identity).body
+                                  collection.get(identity).try(:body) || ''
                                 else
                                   ''
                                 end

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

@@ -1,7 +1,7 @@
 module Fog
   module Storage
     class OpenStack
-      class Real
+      module PublicUrl
         # Get public_url for an object
         #
         # ==== Parameters
@@ -21,6 +21,14 @@ module Fog
           "#{@scheme}://#{@host}:#{@port}#{@path}"
         end
       end
+
+      class Real
+        include PublicUrl
+      end
+
+      class Mock
+        include PublicUrl
+      end
     end
   end
 end

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

@@ -36,6 +36,30 @@ module Fog
           request(params)
         end
       end
+
+      class Mock
+        require 'digest'
+
+        def put_object(container, object, data, options = {}, &block)
+          dgst = Digest::MD5.new
+          if block_given?
+            Kernel.loop do
+              chunk = yield
+              break if chunk.empty?
+              dgst.update chunk
+            end
+          elsif data.kind_of?(String)
+            dgst.update data
+          else
+            dgst.file data
+          end
+          response = Excon::Response.new
+          response.status = 201
+          response.body = ''
+          response.headers = {'ETag' => dgst.hexdigest}
+          response
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -1361,7 +1361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: OpenStack fog provider gem