fog-openstack 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3a52ccf8ef9aec1efe22b6cee7d6cfa6ca1a28
-  data.tar.gz: 29297c4505150b3a29f696dfd31620369b8d6544
+  metadata.gz: a5ef3d5e9db5c4a3630e0f142fb5969346b249a2
+  data.tar.gz: 86a67a59a76c82967d7f834c8d0c4fce73391ec1
 SHA512:
-  metadata.gz: ca9f9563a28b33ed86c16ff22c7c37be97a63c67898c408918b2f054478304252628d10260174e8a786d56d65773c2e2d2e622b49e4c93b1477e59eb4f4dff59
-  data.tar.gz: eedee34b9856b255b2996071a6f8d907221d135d44ecec5b46f5c18593dc4300f5bb02d5f805e7c1e8e9e3fcd90550efd2a5426ed22e87103d406770a061471c
+  metadata.gz: 064950f848ead6d4791df03194d7b991dd793c8717c42beb0e383f400339560f6633e379709c1dd6239876172f60ef4f8c18eae906e3446ea7c405933193cce8
+  data.tar.gz: 4ac6a0c3d149c410d9bbbda237fe14b4d6ab862b4a29a3dc92e4ce96860ce3fc9eb4b6e788d3c93a2be34bd2311ccd87d02ec4d28a0233594e1fdcefbc3d553a

data/fog-openstack.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fog-core',  '>= 1.37'
+  spec.add_dependency 'fog-core',  '>= 1.38'
   spec.add_dependency 'fog-json',  '>= 1.0'
   spec.add_dependency 'fog-xml',   '>= 0.1'
   spec.add_dependency 'ipaddress', '>= 0.8'

data/lib/fog/openstack.rb

@@ -365,6 +365,7 @@ module Fog
       auth_token        = options[:openstack_auth_token] || options[:unscoped_token]
       uri               = options[:openstack_auth_uri]
       omit_default_port = options[:openstack_auth_omit_default_port]
+      cache_ttl         = options[:openstack_cache_ttl] || 0
 
       connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
       request_body = {:auth => {}}
@@ -420,7 +421,7 @@ module Fog
 
       path     = (uri.path and not uri.path.empty?) ? uri.path : 'v3'
 
-      response, expires = @@token_cache[{body: request_body, path: path}]
+      response, expires = @@token_cache[{:body => request_body, :path => path}] if cache_ttl > 0
 
       unless response && expires > Time.now
         request = {
@@ -433,7 +434,7 @@ module Fog
         request[:omit_default_port] = omit_default_port unless omit_default_port.nil?
 
         response = connection.request(request)
-        @@token_cache[{body: request_body, path: path}] = response, Time.now + 30 # 30-second TTL, enough for most requests
+        @@token_cache[{:body => request_body, :path => path}] = response, Time.now + cache_ttl if cache_ttl > 0
       end
 
       [response.headers["X-Subject-Token"], Fog::JSON.decode(response.body)]

data/lib/fog/openstack/core.rb

@@ -2,6 +2,7 @@ module Fog
   module OpenStack
     module Core
       attr_accessor :auth_token
+      attr_reader   :openstack_cache_ttl
       attr_reader :auth_token_expiration
       attr_reader :current_user
       attr_reader :current_user_id
@@ -27,6 +28,8 @@ module Fog
         @openstack_must_reauthenticate  = false
         @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL'
 
+        @openstack_cache_ttl = options[:openstack_cache_ttl] || 0
+
         unless @auth_token
           missing_credentials = Array.new
 

data/lib/fog/openstack/identity_v3.rb

@@ -15,7 +15,7 @@ module Fog
                    :openstack_user_domain_id, :openstack_project_domain_id,
                    :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username,
                    :current_user, :current_user_id, :current_tenant,
-                   :provider, :openstack_identity_prefix, :openstack_endpoint_path_matches
+                   :provider, :openstack_identity_prefix, :openstack_endpoint_path_matches, :openstack_cache_ttl
 
         model_path 'fog/openstack/models/identity_v3'
         model :domain

data/lib/fog/openstack/models/identity_v3/projects.rb

@@ -12,10 +12,16 @@ module Fog
           Fog::Identity::OpenStack::V3::Project.use_cache(@@cache)
 
           def all(options = {})
-            cached_project, expires = @@cache[{token: service.auth_token, options: options}]
-            return cached_project if cached_project && expires > Time.now
+            if service.openstack_cache_ttl > 0
+              cached_project, expires = @@cache[{:token => service.auth_token, :options => options}]
+              return cached_project if cached_project && expires > Time.now
+            end
+
             project_to_cache = load_response(service.list_projects(options), 'projects')
-            @@cache[{token: service.auth_token, options: options}] = project_to_cache, Time.now + 30 # 30-second TTL
+            if service.openstack_cache_ttl > 0
+              @@cache[{:token => service.auth_token, :options => options}] = [project_to_cache,
+                                                                              Time.now + service.openstack_cache_ttl]
+            end
             return project_to_cache
           end
 
@@ -32,8 +38,11 @@ module Fog
             if options.is_a? Symbol # Deal with a single option being passed on its own
               options = [options]
             end
-            cached_project, expires = @@cache[{token: service.auth_token, id: id, options: options}]
-            return cached_project if cached_project && expires > Time.now
+
+            if service.openstack_cache_ttl > 0
+              cached_project, expires = @@cache[{:token => service.auth_token, :id => id, :options => options}]
+              return cached_project if cached_project && expires > Time.now
+            end
             project_hash = service.get_project(id, options).body['project']
             top_project = project_from_hash(project_hash, service)
             if options.include? :subtree_as_list
@@ -42,7 +51,11 @@ module Fog
             if options.include? :parents_as_list
               top_project.parents.map! {|proj_hash| project_from_hash(proj_hash['project'], service)}
             end
-            @@cache[{token: service.auth_token, id: id, options: options}] = top_project, Time.now + 30 # 30-second TTL
+
+            if service.openstack_cache_ttl > 0
+              @@cache[{:token => service.auth_token, :id => id, :options => options}] = [
+                top_project, Time.now + service.openstack_cache_tt]
+            end
             return top_project
           end
 

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

@@ -6,10 +6,10 @@ module Fog
           data = {
             'server' => {
               'flavorRef'  => flavor_ref,
-              'imageRef'   => image_ref,
               'name'       => name
             }
           }
+          data['server']['imageRef'] = image_ref if image_ref
 
           vanilla_options = ['metadata', 'accessIPv4', 'accessIPv6',
                              'availability_zone', 'user_data', 'key_name',
@@ -59,15 +59,12 @@ module Fog
 
           if (block_device_mapping = options['block_device_mapping_v2'])
             data['server']['block_device_mapping_v2'] = [block_device_mapping].flatten.collect do |mapping|
-              {
-                'boot_index'            => mapping[:boot_index],
-                'delete_on_termination' => mapping[:delete_on_termination],
-                'destination_type'      => mapping[:destination_type],
-                'device_name'           => mapping[:device_name],
-                'source_type'           => mapping[:source_type],
-                'uuid'                  => mapping[:uuid],
-                'volume_size'           => mapping[:volume_size],
-              }
+              entered_block_device_mapping = {}
+              [:boot_index, :delete_on_termination, :destination_type, :device_name, :source_type, :uuid,
+               :volume_size].each do |index|
+                entered_block_device_mapping[index.to_s] = mapping[index] if mapping.key?(index)
+              end
+              entered_block_device_mapping
             end
           elsif (block_device_mapping = options['block_device_mapping'])
             data['server']['block_device_mapping'] = [block_device_mapping].flatten.collect do |mapping|

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.37'
+        version: '1.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.37'
+        version: '1.38'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement