Merge pull request fog#1894 from cloudbau/flavor_id_fix

Fix autoincrement when creating a flavor if private flavors exist.
thommahoney · Jun 19, 2013 · ac2d666 · ac2d666
2 parents 06deb85 + b007617
commit ac2d666
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/lib/fog/openstack/models/compute/flavors.rb b/lib/fog/openstack/models/compute/flavors.rb
@@ -9,8 +9,8 @@ class Flavors < Fog::Collection
 
         model Fog::Compute::OpenStack::Flavor
 
-        def all
-          data = service.list_flavors_detail.body['flavors']
+        def all(options = {})
+          data = service.list_flavors_detail(options).body['flavors']
           load(data)
         end
 

diff --git a/lib/fog/openstack/requests/compute/create_flavor.rb b/lib/fog/openstack/requests/compute/create_flavor.rb
@@ -12,7 +12,7 @@ class Real
         def create_flavor(attributes)
           # Get last flavor id
           flavor_ids = Array.new
-          flavors = list_flavors_detail.body['flavors']
+          flavors = list_flavors_detail.body['flavors'] + list_flavors_detail(:is_public => false).body['flavors']
           flavors.each do |flavor|
             flavor_ids << flavor['id'].to_i
           end

diff --git a/lib/fog/openstack/requests/compute/list_flavors_detail.rb b/lib/fog/openstack/requests/compute/list_flavors_detail.rb
@@ -3,19 +3,20 @@ module Compute
     class OpenStack
       class Real
 
-        def list_flavors_detail
+        def list_flavors_detail(options = {})
           request(
             :expects  => [200, 203],
             :method   => 'GET',
-            :path     => 'flavors/detail.json'
+            :path     => 'flavors/detail.json',
+            :query    => options
           )
         end
 
       end
 
       class Mock
 
-        def list_flavors_detail
+        def list_flavors_detail(options = {})
           response = Excon::Response.new
           response.status = 200
           response.body = {