fog-openstack 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ea80cf3dba819dede79cf55ec6ac57a55f3d7c
-  data.tar.gz: 8e28c773ea76b1685b870ebb0b0eb2d501bc896f
+  metadata.gz: e709d55ce5fa6e2513278e19a6f949053ac3d9ab
+  data.tar.gz: '0948ccd18c50d50da4fb742dbf4837cd70afb351'
 SHA512:
-  metadata.gz: 6d5af4a6ba1a1fc57e49e2db611de5b93a150a101973f8cde96e8af3ff7ff98b1519e029d8dc3cc26629fcdcad23220f4cb7c0698fe9476881d60f1bb04eb362
-  data.tar.gz: 8c8c32dc3222008cb8121593d463c427908d195418e2bac083a27a7c90837a12a9796d0c17523a40321c9d1c4d34607af319792886629c8e86bcfc8ca8b66ff8
+  metadata.gz: c84b8d3f4a0f8ca80601595a606148e28c38729c4180b9969c23b17514699596a278dab94b5ce321586ef9a0af5cf1de963aa070fd0c2a6f27e8cfe51e5f7a98
+  data.tar.gz: cf712ed9aae98300e32b68a0c99a264d3c1dc79fb8975ef8da1c85e5228e4b629c0a14136fe08287654a7ed68c2d839131a48348ef0570bcdd3d36f0e9b69d37

data/lib/fog/image/openstack/v1.rb

@@ -111,7 +111,7 @@ module Fog
           end
 
           def default_service_type
-            %w[image]
+            %w[imagev1]
           end
         end
       end

data/lib/fog/image/openstack/v2.rb

@@ -119,7 +119,7 @@ module Fog
           end
 
           def default_service_type
-            %w[image]
+            %w[image imagev2]
           end
         end
       end

data/lib/fog/openstack/auth/token.rb

@@ -13,35 +13,34 @@ module Fog
         class StandardError < RuntimeError; end
         class URLError < RuntimeError; end
 
-        def self.build(auth)
+        def self.build(auth, options)
           if auth[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i ||
              auth[:openstack_tenant_id] || auth[:openstack_tenant]
-            Fog::OpenStack::Auth::Token::V2.new(auth)
+            Fog::OpenStack::Auth::Token::V2.new(auth, options)
           else
-            Fog::OpenStack::Auth::Token::V3.new(auth)
+            Fog::OpenStack::Auth::Token::V3.new(auth, options)
           end
         end
 
-        def initialize(auth)
+        def initialize(auth, options)
           raise URLError, 'No URL provided' if auth[:openstack_auth_url].nil? || auth[:openstack_auth_url].empty?
           @creds = {
             :data => build_credentials(auth),
             :uri  => URI.parse(auth[:openstack_auth_url])
           }
-          response = authenticate(@creds)
+          response = authenticate(@creds, options)
           set(response)
         end
 
         def get
-          set(authenticate(@creds)) if expired?
+          set(authenticate(@creds, {})) if expired?
           @token
         end
 
         private
 
-        def authenticate(creds)
-          connection_options = {}
-          connection = Fog::Core::Connection.new(creds[:uri].to_s, false, connection_options)
+        def authenticate(creds, options)
+          connection = Fog::Core::Connection.new(creds[:uri].to_s, false, options)
 
           request = {
             :expects => [200, 201],

data/lib/fog/openstack/core.rb

@@ -206,7 +206,7 @@ module Fog
         if !@openstack_management_url || @openstack_must_reauthenticate
           @openstack_auth_token = nil if @openstack_must_reauthenticate
 
-          token = Fog::OpenStack::Auth::Token.build(openstack_options)
+          token = Fog::OpenStack::Auth::Token.build(openstack_options, @connection_options)
 
           @openstack_management_url = if token.catalog
                                         token.catalog.get_endpoint_url(

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '0.3.3'.freeze
+    VERSION = '0.3.4'.freeze
   end
 end

data/unit/auth/token_test.rb

@@ -13,7 +13,7 @@ describe Fog::OpenStack::Auth::Token do
           )
 
         proc do
-          Fog::OpenStack::Auth::Token.build({})
+          Fog::OpenStack::Auth::Token.build({}, {})
         end.must_raise Fog::OpenStack::Auth::Token::URLError
       end
 
@@ -36,7 +36,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data_v3'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data_v3'
           end
 
@@ -59,7 +59,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
 
@@ -83,7 +83,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
         end
@@ -106,7 +106,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
 
@@ -127,7 +127,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
         end
@@ -149,7 +149,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
         end
@@ -171,7 +171,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
         end
@@ -193,7 +193,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
 
@@ -214,7 +214,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
         end
@@ -236,7 +236,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
 
@@ -256,7 +256,7 @@ describe Fog::OpenStack::Auth::Token do
                 :headers => {'x-subject-token'=>'token_data'}
               )
 
-            token = Fog::OpenStack::Auth::Token.build(auth)
+            token = Fog::OpenStack::Auth::Token.build(auth, {})
             token.get.must_equal 'token_data'
           end
         end
@@ -283,7 +283,7 @@ describe Fog::OpenStack::Auth::Token do
               :headers => {'x-subject-token'=>'token_data'}
             )
 
-          token = Fog::OpenStack::Auth::Token.build(authv3_creds)
+          token = Fog::OpenStack::Auth::Token.build(authv3_creds, {})
           token.stub :expired?, false do
             token.get.must_equal 'token_data'
           end
@@ -297,7 +297,7 @@ describe Fog::OpenStack::Auth::Token do
               :headers => {'x-subject-token'=>'token_data'}
             )
 
-          token = Fog::OpenStack::Auth::Token.build(authv3_creds)
+          token = Fog::OpenStack::Auth::Token.build(authv3_creds, {})
           token.stub :expired?, true do
             token.get.must_equal 'token_data'
           end
@@ -312,7 +312,7 @@ describe Fog::OpenStack::Auth::Token do
             :headers => {'x-subject-token'=>'token_data'}
           )
 
-        token = Fog::OpenStack::Auth::Token.build(authv3_creds)
+        token = Fog::OpenStack::Auth::Token.build(authv3_creds, {})
         token.catalog.payload.must_equal ['catalog_data']
       end
 
@@ -324,7 +324,7 @@ describe Fog::OpenStack::Auth::Token do
             :headers => {'x-subject-token'=>'token_data'}
           )
 
-        token = Fog::OpenStack::Auth::Token.build(authv3_creds)
+        token = Fog::OpenStack::Auth::Token.build(authv3_creds, {})
         token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost'
       end
     end
@@ -337,7 +337,7 @@ describe Fog::OpenStack::Auth::Token do
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {})
 
         proc do
-          Fog::OpenStack::Auth::Token.build({})
+          Fog::OpenStack::Auth::Token.build({}, {})
         end.must_raise Fog::OpenStack::Auth::Token::URLError
       end
 
@@ -355,7 +355,7 @@ describe Fog::OpenStack::Auth::Token do
 \"tenantName\":\"tenant\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
-          token = Fog::OpenStack::Auth::Token.build(auth)
+          token = Fog::OpenStack::Auth::Token.build(auth, {})
           token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
         end
 
@@ -372,7 +372,7 @@ describe Fog::OpenStack::Auth::Token do
 \"tenantId\":\"tenant_id\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
-          token = Fog::OpenStack::Auth::Token.build(auth)
+          token = Fog::OpenStack::Auth::Token.build(auth, {})
           token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
         end
       end
@@ -389,7 +389,7 @@ describe Fog::OpenStack::Auth::Token do
             with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
-          token = Fog::OpenStack::Auth::Token.build(auth)
+          token = Fog::OpenStack::Auth::Token.build(auth, {})
           token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
         end
 
@@ -404,7 +404,7 @@ describe Fog::OpenStack::Auth::Token do
             with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
-          Fog::OpenStack::Auth::Token.build(auth)
+          Fog::OpenStack::Auth::Token.build(auth, {})
         end
       end
     end
@@ -429,7 +429,7 @@ describe Fog::OpenStack::Auth::Token do
               :headers => {}
             )
 
-          token = Fog::OpenStack::Auth::Token.build(authv2_creds)
+          token = Fog::OpenStack::Auth::Token.build(authv2_creds, {})
           token.stub :expired?, false do
             token.get.must_equal 'token_not_expired'
           end
@@ -443,7 +443,7 @@ describe Fog::OpenStack::Auth::Token do
               :headers => {}
             )
 
-          token = Fog::OpenStack::Auth::Token.build(authv2_creds)
+          token = Fog::OpenStack::Auth::Token.build(authv2_creds, {})
           token.stub :expired?, true do
             token.get.must_equal 'token_expired'
           end
@@ -458,7 +458,7 @@ describe Fog::OpenStack::Auth::Token do
             :headers => {}
           )
 
-        token = Fog::OpenStack::Auth::Token.build(authv2_creds)
+        token = Fog::OpenStack::Auth::Token.build(authv2_creds, {})
         token.catalog.payload.must_equal ['catalog_data']
       end
 
@@ -470,7 +470,7 @@ describe Fog::OpenStack::Auth::Token do
             :headers => {'x-subject-token'=>'token_data'}
           )
 
-        token = Fog::OpenStack::Auth::Token.build(authv2_creds)
+        token = Fog::OpenStack::Auth::Token.build(authv2_creds, {})
         token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost'
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core