fog-openstack 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ad255185b61e76ee76ad8d89711b167918a27f7
-  data.tar.gz: b02a996a6244f9d382d619086358f15209d5ce27
+  metadata.gz: dc6df6714fdc0919e30d872748400f21dd6a1b76
+  data.tar.gz: 3d057c3aad27a48d1ee8901f71b4b85fe7e03de2
 SHA512:
-  metadata.gz: 0a4dace55598a9e1da519522da4d133d53b617e64f7b4f9492fdb0e559074b21abc0f00d64163a40544b0c75160ea231af452664ecda648cc104c612f727d92c
-  data.tar.gz: 1bed7b31da6d4529b432d4e55254dc56259e7810a60e9731895cb2d839b34380379c4c5aa86d3bec8cd5cda77f813e72073e5071ffba81201735169439987fc8
+  metadata.gz: 36bfe27a022057590ce817e20089d3bfe7ff00e42be16173d9077cb3b1dd314047486d359ad5f65dd0d3d489804315506031d014ba8b2cfe02f88f195d10ead1
+  data.tar.gz: bc82e6dee769885e863f2f0e9dd822d4210e1fb2628fa8daec888c08f29dca37c6c1be55e7b626b601a0f8e7e24df6b0ef6c9a4f897668d84f1158afdd18379d

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

@@ -15,6 +15,7 @@ module Fog
         attribute :minDisk
         attribute :minRam
         attribute :server,   :aliases => 'server'
+        attribute :size,     :aliases => 'OS-EXT-IMG-SIZE:size'
         attribute :metadata
         attribute :links
 

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

@@ -3,7 +3,6 @@ module Fog
     class OpenStack
       class Real
         def update_quota(tenant_id, options = {})
-          options['tenant_id'] = tenant_id
           request(
             :body    => Fog::JSON.encode('quota_set' => options),
             :expects => 200,

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

@@ -23,7 +23,12 @@ module Fog
           end
 
           def find_by_id(id)
-            all.find { |image| image.id == id }
+            marker = 'X-Image-Meta-'
+            params = service.get_image_by_id(id).headers.select{|h,_| h.include?(marker) }
+            params = params.map{|k,v| [k.gsub(marker,'').downcase, convert_to_type(v)]}
+            new(Hash[params])
+          rescue Fog::Image::OpenStack::NotFound
+            nil
           end
           alias get find_by_id
 
@@ -62,6 +67,23 @@ module Fog
             attribute = attribute.to_s.gsub("find_by_", "")
             load(service.list_public_images_detailed(attribute, value).body['images'])
           end
+
+          private
+
+          def convert_to_type(v)
+            case v
+            when /^\d+$/
+              v.to_i
+            when 'True'
+              true
+            when 'False'
+              false
+            when /^\d\d\d\d\-\d\d\-\d\dT/
+              ::Time.parse(v)
+            else
+              v
+            end
+          end
         end
       end
     end

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

@@ -5,27 +5,35 @@ module Fog
         class Real
           def get_image_by_id(image_id)
             request(
-              :expects => [200, 204],
-              :method  => 'GET',
+              :expects => [200],
+              :method  => 'HEAD',
               :path    => "images/#{image_id}"
             )
           end
         end # class Real
 
         class Mock
-          def get_image_by_id(_image_id)
+          def get_image_by_id(image_id)
             response = Excon::Response.new
             response.status = [200, 204][rand(2)]
-            response.body = {
-              "images" => [{
-                "name"             => "mock-image-name",
-                "size"             => 25165824,
-                "disk_format"      => "ami",
-                "container_format" => "ami",
-                "id"               => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e",
-                "checksum"         => "2f81976cae15c16ef0010c51e3a6c163"
-              }]
+            response.headers = {
+              'X-Image-Meta-Checksum'         => '8a40c862b5735975d82605c1dd395796',
+              'X-Image-Meta-Container_format' => 'aki',
+              'X-Image-Meta-Created_at'       => '2016-01-06T03:22:20.000000',
+              'X-Image-Meta-Deleted'          => 'False',
+              'X-Image-Meta-Disk_format'      => 'aki',
+              'X-Image-Meta-Id'               => image_id,
+              'X-Image-Meta-Is_public'        => 'True',
+              'X-Image-Meta-Min_disk'         => 0,
+              'X-Image-Meta-Min_ram'          => 0,
+              'X-Image-Meta-Name'             => 'cirros-0.3.4-x86_64-uec-kernel',
+              'X-Image-Meta-Owner'            => '13cc6052265b41529e2fd0fc461fa8ef',
+              'X-Image-Meta-Protected'        => 'False',
+              'X-Image-Meta-Size'             => 4979632,
+              'X-Image-Meta-Status'           => 'deactivated',
+              'X-Image-Meta-Updated_at'       => '2016-02-25T03:02:05.000000'
             }
+            response.body = {}
             response
           end # def list_tenants
         end # class Mock

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

@@ -18,6 +18,8 @@ module Fog
 
           def find_by_id(id)
             new(service.get_image_by_id(id).body)
+          rescue Fog::Image::OpenStack::NotFound
+            nil
           end
 
           alias get find_by_id

data/lib/fog/network/openstack/requests/create_floating_ip.rb

@@ -9,7 +9,7 @@ module Fog
             }
           }
 
-          vanilla_options = [:port_id, :tenant_id, :fixed_ip_address, :floating_ip_address]
+          vanilla_options = [:port_id, :tenant_id, :fixed_ip_address, :floating_ip_address, :subnet_id]
           vanilla_options.reject { |o| options[o].nil? }.each do |key|
             data['floatingip'][key] = options[key]
           end

data/lib/fog/openstack/version.rb

@@ -1,6 +1,6 @@
 module Fog
   module Openstack
-    VERSION = "0.1.18"
+    VERSION = "0.1.19"
 
     def self.included(base)
       if RUBY_VERSION < "2"

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

@@ -3,7 +3,6 @@ module Fog
     class OpenStack
       module Real
         def update_quota(tenant_id, options = {})
-          options['tenant_id'] = tenant_id
           request(
             :body    => Fog::JSON.encode('quota_set' => options),
             :expects => 200,

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

@@ -12,6 +12,7 @@ module Fog
           attribute :display_description
           attribute :metadata
           attribute :force
+          attribute :size
 
           def save
             requires :display_name

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

@@ -12,6 +12,7 @@ module Fog
           attribute :description
           attribute :metadata
           attribute :force
+          attribute :size
 
           def save
             requires :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core