diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/scheduler/driver.py | 4 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_scheduler.py | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 39d3446c6..c701d8051 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -74,9 +74,7 @@ def cast_to_compute_host(context, host, method, update_db=True, **kwargs): """Cast request to a compute host queue""" if update_db: - # fall back on the id if the uuid is not present - instance_id = kwargs.get('instance_id', None) - instance_uuid = kwargs.get('instance_uuid', instance_id) + instance_uuid = kwargs.get('instance_uuid', None) if instance_uuid is not None: now = timeutils.utcnow() db.instance_update(context, instance_uuid, diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index b9cb4de59..865eb20df 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -854,10 +854,10 @@ class SchedulerDriverModuleTestCase(test.TestCase): driver.cast_to_volume_host(self.context, host, method, update_db=False, **fake_kwargs) - def test_cast_to_compute_host_update_db_with_instance_id(self): + def test_cast_to_compute_host_update_db_with_instance_uuid(self): host = 'fake_host1' method = 'fake_method' - fake_kwargs = {'instance_id': 31337, + fake_kwargs = {'instance_uuid': 'fake_uuid', 'extra_arg': 'meow'} queue = 'fake_queue' @@ -867,7 +867,7 @@ class SchedulerDriverModuleTestCase(test.TestCase): self.mox.StubOutWithMock(rpc, 'cast') timeutils.utcnow().AndReturn('fake-now') - db.instance_update(self.context, 31337, + db.instance_update(self.context, 'fake_uuid', {'host': host, 'scheduled_at': 'fake-now'}) rpc.queue_get_for(self.context, 'compute', host).AndReturn(queue) rpc.cast(self.context, queue, @@ -878,7 +878,7 @@ class SchedulerDriverModuleTestCase(test.TestCase): driver.cast_to_compute_host(self.context, host, method, update_db=True, **fake_kwargs) - def test_cast_to_compute_host_update_db_without_instance_id(self): + def test_cast_to_compute_host_update_db_without_instance_uuid(self): host = 'fake_host1' method = 'fake_method' fake_kwargs = {'extra_arg': 'meow'} |