diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-07-20 16:03:18 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-07-25 20:10:35 -0400 |
| commit | a43909352f2ef8c4a3fc540f8952ab2defa09ad6 (patch) | |
| tree | 808c7c6553261c5185a52091aff2314f92b047bf /nova/tests | |
| parent | 1d0362929d2bbb39a5665b0d0ce9972ca66c643b (diff) | |
Send a full instance via rpc for get_console_output.
Change the get_console_output method of the compute rpc API to take a
full instance over rpc instead of just the instance UUID. This cuts
down on database access needed by nova-compute.
Part of blueprint no-db-messaging.
Change-Id: I114081fceddc2c7226aab9bd560f3664000a43af
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 9 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 63af3813b..1c8784bfd 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -769,7 +769,7 @@ class ComputeTestCase(BaseTestCase): self.compute.run_instance(self.context, instance['uuid']) output = self.compute.get_console_output(self.context, - instance['uuid']) + instance=jsonutils.to_primitive(instance)) self.assertEqual(output, 'FAKE CONSOLE OUTPUT\nANOTHER\nLAST LINE') self.compute.terminate_instance(self.context, instance['uuid']) @@ -779,8 +779,7 @@ class ComputeTestCase(BaseTestCase): self.compute.run_instance(self.context, instance['uuid']) output = self.compute.get_console_output(self.context, - instance['uuid'], - tail_length=2) + instance=jsonutils.to_primitive(instance), tail_length=2) self.assertEqual(output, 'ANOTHER\nLAST LINE') self.compute.terminate_instance(self.context, instance['uuid']) @@ -3678,9 +3677,9 @@ class ComputeAPITestCase(BaseTestCase): self.mox.StubOutWithMock(rpc, 'call') rpc_msg = {'method': 'get_console_output', - 'args': {'instance_uuid': fake_instance['uuid'], + 'args': {'instance': fake_instance, 'tail_length': fake_tail_length}, - 'version': compute_rpcapi.ComputeAPI.BASE_RPC_API_VERSION} + 'version': '1.7'} rpc.call(self.context, 'compute.%s' % fake_instance['host'], rpc_msg, None).AndReturn(fake_console_output) diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index 5c0fcd006..87682eb45 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -49,8 +49,8 @@ class ComputeRpcAPITestCase(test.TestCase): ctxt = context.RequestContext('fake_user', 'fake_project') methods_with_instance = [ - 'pause_instance', 'reboot_instance', 'suspend_instance', - 'unpause_instance' + 'get_console_output', 'pause_instance', 'reboot_instance', + 'suspend_instance', 'unpause_instance' ] if 'rpcapi_class' in kwargs: @@ -161,7 +161,7 @@ class ComputeRpcAPITestCase(test.TestCase): def test_get_console_output(self): self._test_compute_api('get_console_output', 'call', - instance=self.fake_instance, tail_length='tl') + instance=self.fake_instance, tail_length='tl', version='1.7') def test_get_console_pool_info(self): self._test_compute_api('get_console_pool_info', 'call', |