openstack
/
nova
Code Issues Proposed changes

Fix console api pass tuple as topic to console rpc api 

The topic should be string, not a tuple

Fix bug 1221541

Change-Id: I4bbb9bdeb5108436fe76db69f1546ac2bd0c7a40
This commit is contained in:
He Jie Xu 2013-09-10 12:03:28 +08:00
parent ec73243738
commit b15a16a363
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/console/api.py
View File

@ -55,7 +55,7 @@ class API(base.Base):
# console info. I am not sure which is better
# here.
instance = self._get_instance(context, instance_uuid)
topic = self._get_console_topic(context, instance['host']),
topic = self._get_console_topic(context, instance['host'])
rpcapi = console_rpcapi.ConsoleAPI(topic=topic)
rpcapi.add_console(context, instance['id'])

10
nova/tests/console/test_console.py
View File

@ -178,11 +178,11 @@ class ConsoleAPITestCase(test.TestCase):
compute_rpcapi.ComputeAPI.get_console_topic(
self.context, 'fake_host').AndReturn('compute.fake_host')
self.mox.StubOutWithMock(console_rpcapi.ConsoleAPI, 'add_console')
console_rpcapi.ConsoleAPI.add_console(self.context,
self.fake_instance['id'])
self.mox.StubOutClassWithMocks(console_rpcapi, 'ConsoleAPI')
console_api_mock = console_rpcapi.ConsoleAPI(
topic='compute.fake_host')
console_api_mock.add_console(self.context,
self.fake_instance['id'])
self.mox.ReplayAll()