flavor test

2 files changed, 35 insertions, 15 deletions

diff --git a/nova/scheduler/query.py b/nova/scheduler/query.py
index 4971bc7e4..1c593f1ba 100644
--- a/nova/scheduler/query.py
+++ b/nova/scheduler/query.py
@@ -74,10 +74,10 @@ class FlavorQuery:
         """Return a list of hosts that can create instance_type."""
         hosts = zone_manager.service_states.get('compute', {})
         selected_hosts = []
-        instance_type = query
+        query_type, instance_type = query
         for host, capabilities in hosts.iteritems():
-            host_ram_mb = capabilities.get['host_memory']['free']
-            disk_bytes = capabilities.get['disk']['available']
+            host_ram_mb = capabilities['host_memory']['free']
+            disk_bytes = capabilities['disk']['available']
             if host_ram_mb >= instance_type['memory_mb'] and \
                 disk_bytes >= instance_type['local_gb']:
                     selected_hosts.append((host, capabilities))
diff --git a/nova/tests/test_query.py b/nova/tests/test_query.py
index 0fab91933..d89183e9f 100644
--- a/nova/tests/test_query.py
+++ b/nova/tests/test_query.py
@@ -30,32 +30,39 @@ class QueryTestCase(test.TestCase):
     """Test case for query drivers."""
 
     def _host_caps(self, multiplier):
+        # Returns host capabilities in the following way:
+        # host0 = memory:free 10 (100max)
+        #         disk:available 100 (1000max)
+        # hostN = memory:free 10 + 10N
+        #         disk:available 100 + 100N
+        # in other words: hostN has more resources than host0
+        # which means ... don't go above 10 hosts.
         return {'host_name-description':'XenServer %s' % multiplier,
                 'host_hostname':'xs-%s' % multiplier,
                 'host_memory':{'total': 100,
-                             'overhead': 5,
-                             'free': 5 + multiplier * 5,
-                             'free-computed': 5 + multiplier * 5},
+                             'overhead': 10,
+                             'free': 10 + multiplier * 10,
+                             'free-computed': 10 + multiplier * 10},
                 'host_other-config':{},
                 'host_ip_address':'192.168.1.%d' % (100 + multiplier),
                 'host_cpu_info':{},
                 'disk':{'available': 100 + multiplier * 100,
                       'total': 1000,
-                      'used': 50 + multiplier * 50},
+                      'used': 0},
                 'host_uuid':'xxx-%d' % multiplier,
                 'host_name-label':'xs-%s' % multiplier}
 
     def setUp(self):
         self.old_flag = FLAGS.default_query_engine
         FLAGS.default_query_engine = 'nova.scheduler.query.AllHostsQuery'
-        self.instance_type = dict(name='tiny',
-                memory_mb=500,
-                vcpus=10,
-                local_gb=50,
-                flavorid=1,
-                swap=500,
-                rxtx_quota=30000,
-                rxtx_cap=200)
+        self.instance_type = dict(name= 'tiny',
+                memory_mb= 50,
+                vcpus= 10,
+                local_gb= 500,
+                flavorid= 1,
+                swap= 500,
+                rxtx_quota= 30000,
+                rxtx_cap= 200)
 
         hosts = {}
         for x in xrange(10):
@@ -69,10 +76,13 @@ class QueryTestCase(test.TestCase):
         FLAGS.default_query_engine = self.old_flag
 
     def test_choose_driver(self):
+        # Test default driver ...
         driver = query.choose_driver()
         self.assertEquals(str(driver), 'nova.scheduler.query.AllHostsQuery')
+        # Test valid driver ...
         driver = query.choose_driver('nova.scheduler.query.FlavorQuery')
         self.assertEquals(str(driver), 'nova.scheduler.query.FlavorQuery')
+        # Test invalid driver ...
         try:
             query.choose_driver('does not exist')
             self.fail("Should not find driver")
@@ -87,3 +97,13 @@ class QueryTestCase(test.TestCase):
         for host, capabilities in hosts:
             self.assertTrue(host.startswith('host'))
 
+    def test_flavor_driver(self):
+        driver = query.FlavorQuery()
+        # filter all hosts that can support 50 ram and 500 disk
+        cooked = driver.instance_type_to_query(self.instance_type)
+        hosts = driver.filter_hosts(self.zone_manager, cooked)
+        self.assertEquals(6, len(hosts))
+        just_hosts = [host for host, caps in hosts]
+        just_hosts.sort()
+        self.assertEquals('host4', just_hosts[0])
+        self.assertEquals('host9', just_hosts[5])