diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-01 15:50:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-01 15:50:43 +0000 |
| commit | 3a35d9c03dedee38f2de367de5f67846a24da490 (patch) | |
| tree | b09e0f4638cc30365574c0f8b4b1c0317a03b029 /nova | |
| parent | 56a5ba1170783cb968db76f16ef2217bac7a1272 (diff) | |
| parent | 5e7275f5bca9c7c6f30a442c3bd2b66eba19fe04 (diff) | |
Merge "Fix get_diagnostics RPC arg ordering."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index d80781c73..cdb68dcca 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1770,7 +1770,7 @@ class ComputeManager(manager.SchedulerDependentManager): @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) @wrap_instance_fault - def get_diagnostics(self, context, instance_uuid=None, instance=None): + def get_diagnostics(self, context, instance=None, instance_uuid=None): """Retrieve diagnostics for an instance on this host.""" if not instance: instance = self.db.instance_get_by_uuid(context, instance_uuid) diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index d9b87fd15..5bfe17ad8 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -889,7 +889,11 @@ class ComputeTestCase(BaseTestCase): self.compute.run_instance(self.context, instance['uuid']) diagnostics = self.compute.get_diagnostics(self.context, - instance['uuid']) + instance_uuid=instance['uuid']) + self.assertEqual(diagnostics, 'FAKE_DIAGNOSTICS') + + diagnostics = self.compute.get_diagnostics(self.context, + instance=instance) self.assertEqual(diagnostics, 'FAKE_DIAGNOSTICS') self.compute.terminate_instance(self.context, instance['uuid']) |