diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-19 23:14:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-19 23:14:45 +0000 |
| commit | 565f0b2fac370a41c1f34893d9d73d2c4e161474 (patch) | |
| tree | fde2c55b1801acb19d1b5ef29df714536fe49897 | |
| parent | a17723a6b02e9fabc852c9b650742fdb7aa93adb (diff) | |
| parent | 661c5c35f6b7bc8e2aff1201e07432e2afd83320 (diff) | |
| download | nova-565f0b2fac370a41c1f34893d9d73d2c4e161474.tar.gz nova-565f0b2fac370a41c1f34893d9d73d2c4e161474.tar.xz nova-565f0b2fac370a41c1f34893d9d73d2c4e161474.zip | |
Merge "Fix reversed args to call to _reschedule"
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0ad3cfc77..18cc91e12 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -636,7 +636,7 @@ class ComputeManager(manager.SchedulerDependentManager): task_state = task_states.SCHEDULING rescheduled = self._reschedule(context, request_spec, - instance['uuid'], filter_properties, + filter_properties, instance['uuid'], self.scheduler_rpcapi.run_instance, method_args, task_state) diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 5598da0db..662a90be4 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -5862,8 +5862,8 @@ class ComputeRescheduleOrReraiseTestCase(BaseTestCase): self.compute._deallocate_network(self.context, self.instance) - self.compute._reschedule(self.context, None, instance_uuid, - {}, self.compute.scheduler_rpcapi.run_instance, + self.compute._reschedule(self.context, None, {}, instance_uuid, + self.compute.scheduler_rpcapi.run_instance, method_args, task_states.SCHEDULING).AndReturn(True) self.compute._log_original_error(exc_info, instance_uuid) |