Merge lp:~klmitch/nova/weigh-instances into lp:~hudson-openstack/nova/trunk

[Kevin L. Mitchell]

Make weigh_hosts() return a host per instance, instead of just a list of hosts.

[Sandy Walsh (sandy-walsh)]

lgtm

review: Approve

[lp:~klmitch/nova/weigh-instances]

1531. By Kevin L. Mitchell on 2011-09-07

fix a couple of typos in the added unit test

1532. By Kevin L. Mitchell on 2011-09-07

pull-up from trunk

1533. By Kevin L. Mitchell on 2011-09-08

pull-up from trunk

[Josh Kearney (jk0)]

LGTM

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~klmitch/nova/weigh-instances into lp:nova failed. Below is the output from the failed tests.

=== modified file 'nova/scheduler/base_scheduler.py'
--- nova/scheduler/base_scheduler.py	2011-08-15 22:09:39 +0000
+++ nova/scheduler/base_scheduler.py	2011-09-08 15:51:28 +0000
@@ -55,5 +55,17 @@
         scheduling objectives
         """
         # NOTE(sirp): The default logic is the same as the NoopCostFunction
-        return [dict(weight=1, hostname=hostname, capabilities=capabilities)
-                for hostname, capabilities in hosts]
+        hosts = [dict(weight=1, hostname=hostname, capabilities=capabilities)
+                 for hostname, capabilities in hosts]
+
+        # NOTE(Vek): What we actually need to return is enough hosts
+        #            for all the instances!
+        num_instances = request_spec.get('num_instances', 1)
+        instances = []
+        while num_instances > len(hosts):
+            instances.extend(hosts)
+            num_instances -= len(hosts)
+        if num_instances > 0:
+            instances.extend(hosts[:num_instances])
+
+        return instances
 
=== modified file 'nova/tests/scheduler/test_abstract_scheduler.py'
--- nova/tests/scheduler/test_abstract_scheduler.py	2011-08-12 18:58:26 +0000
+++ nova/tests/scheduler/test_abstract_scheduler.py	2011-09-08 15:51:28 +0000
@@ -26,6 +26,7 @@
 from nova.compute import api as compute_api
 from nova.scheduler import driver
 from nova.scheduler import abstract_scheduler
+from nova.scheduler import base_scheduler
 from nova.scheduler import zone_manager
 
 
@@ -65,6 +66,11 @@
     pass
 
 
+class FakeBaseScheduler(base_scheduler.BaseScheduler):
+    # No need to stub anything at the moment
+    pass
+
+
 class FakeZoneManager(zone_manager.ZoneManager):
     def __init__(self):
         self.service_states = {
@@ -365,3 +371,30 @@
 
         self.assertEqual(fixture._decrypt_blob(test_data),
                          json.dumps(test_data))
+
+
+class BaseSchedulerTestCase(test.TestCase):
+    """Test case for Base Scheduler."""
+
+    def test_weigh_hosts(self):
+        """
+        Try to weigh a short list of hosts and make sure enough
+        entries for a larger number instances are returned.
+        """
+
+        sched = FakeBaseScheduler()
+
+        # Fake out a list of hosts
+        zm = FakeZoneManager()
+        hostlist = [(host, services['compute'])
+                    for host, services in zm.service_states.items()
+                    if 'compute' in services]
+
+        # Call weigh_hosts()
+        num_instances = len(hostlist) * 2 + len(hostlist) / 2
+        instlist = sched.weigh_hosts('compute',
+                                     dict(num_instances=num_instances),
+                                     hostlist)
+
+        # Should be enough entries to cover all instances
+        self.assertEqual(len(instlist), num_instances)