openstack_activeresource 0.6.3 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.7.0

data/lib/open_stack/nova/compute/flavor.rb

@@ -125,14 +125,24 @@ module OpenStack
         # Returns a list of Flavor that can be used with the given constraints
         #
         # ==== Attributes
-        # * +constraints+ - Hash of constraints. Valid keys are: :ram, :vcpus, :disk
+        # * +constraints+ - Hash of constraints. Valid keys are: :min_ram, :min_vcpus, :min_disk, :max_ram, :max_vcpus, :max_disk
         def self.find_by_constraints(constraints = {})
           constraints = constraints.with_indifferent_access
-          constraints[:ram] ||= -1.0/0.0
-          constraints[:vcpus] ||= -1.0/0.0
-          constraints[:disk] ||= -1.0/0.0
-
-          self.all.select { |flavor| flavor.ram >= constraints[:ram] and flavor.vcpus >= constraints[:vcpus] and flavor.disk >= constraints[:disk] }
+          constraints[:min_ram] ||= -1.0/0.0
+          constraints[:min_vcpus] ||= -1.0/0.0
+          constraints[:min_disk] ||= -1.0/0.0
+          constraints[:max_ram] ||= +1.0/0.0
+          constraints[:max_vcpus] ||= +1.0/0.0
+          constraints[:max_disk] ||= +1.0/0.0
+
+          self.all.select do |flavor|
+              flavor.ram >= constraints[:min_ram] and
+              flavor.vcpus >= constraints[:min_vcpus] and
+              flavor.disk >= constraints[:min_disk] and
+              flavor.ram <= constraints[:max_ram] and
+              flavor.vcpus <= constraints[:max_vcpus] and
+              flavor.disk <= constraints[:max_disk]
+          end
         end
 
         # Returns a list of Flavor that can be used with the given Image
@@ -143,8 +153,19 @@ module OpenStack
           image_instance = image.is_a?(OpenStack::Nova::Compute::Image) ? image : Image.find(image)
 
           constraints = {}
-          constraints[:ram] = image.min_ram if image_instance.min_ram > 0
-          constraints[:disk] = image.min_disk if image_instance.min_disk > 0
+          constraints[:min_ram] = image.min_ram if image_instance.min_ram > 0
+          constraints[:min_disk] = image.min_disk if image_instance.min_disk > 0
+
+          find_by_constraints constraints
+        end
+
+        # Returns a list of Flavor that can be used with the given quota-set
+        #
+        # ==== Attributes
+        # * +quota_set+ - An OpenStack::Nova::Compute::QuotaSet instance
+        def self.applicable_for_quota_set(quota_set)
+          constraints = {}
+          constraints[:max_ram] = quota_set.ram
 
           find_by_constraints constraints
         end

data/openstack_activeresource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "openstack_activeresource"
-  s.version = "0.6.3"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Davide Guerri"]
-  s.date = "2013-06-14"
+  s.date = "2013-06-25"
   s.description = "OpenStack Ruby and RoR bindings implemented with ActiveResource - See also http://www.unicloud.it"
   s.email = "d.guerri@rd.unidata.it"
   s.extra_rdoc_files = [

data/test/test_nova_flavors.rb

@@ -49,6 +49,18 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
       assert_not_nil flavor, "Cannot retrieve flavor"
     end
 
+    assert_nothing_raised ActiveResource::ResourceNotFound, "Cannot get flavors applicable for an image" do
+      image = OpenStack::Nova::Compute::Image.first
+      flavors = OpenStack::Nova::Compute::Flavor.applicable_for_image image
+      assert_not_empty flavors, "Cannot retrieve flavors applicable for an image"
+    end
+
+    assert_nothing_raised ActiveResource::ResourceNotFound, "Cannot get flavors applicable for quota-set" do
+      quota_set = OpenStack::Nova::Compute::QuotaSet.find TEST_CONFIG[:user_tenant_id]
+      flavors = OpenStack::Nova::Compute::Flavor.applicable_for_quota_set quota_set
+      assert_not_empty flavors, "Cannot retrieve flavors applicable for quota-set"
+    end
+
     return unless admin_test_possible?
 
     auth_admin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack_activeresource
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4007087770125427657
+      hash: -166848849655330033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: