diff options
| author | William Wolf <will.wolf@rackspace.com> | 2011-05-06 14:12:33 -0400 |
|---|---|---|
| committer | William Wolf <will.wolf@rackspace.com> | 2011-05-06 14:12:33 -0400 |
| commit | 500c14d8a879cb255e159acb69eda17de8f2b047 (patch) | |
| tree | 4ae0528e71c3213fb6f6df45ab6749dd2e299389 | |
| parent | 4a0142bdcd3d15c629ca96ba6d3d7fdaa13ed278 (diff) | |
| parent | 016be4ccdfe3f7791021bc717a1445b36cde371f (diff) | |
merge from trunk
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | nova/compute/manager.py | 3 | ||||
| -rw-r--r-- | nova/tests/test_cloud.py | 2 | ||||
| -rw-r--r-- | nova/virt/fake.py | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -81,4 +81,5 @@ Vishvananda Ishaya <vishvananda@gmail.com> William Wolf <will.wolf@rackspace.com> Yoshiaki Tamura <yoshi@midokura.jp> Youcef Laribi <Youcef.Laribi@eu.citrix.com> +Yuriy Taraday <yorik.sar@gmail.com> Zhixue Wu <Zhixue.Wu@citrix.com> diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 1ff78007b..c6f957073 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -749,7 +749,8 @@ class ComputeManager(manager.SchedulerDependentManager): instance_ref = self.db.instance_get(context, instance_id) LOG.audit(_("Get console output for instance %s"), instance_id, context=context) - return self.driver.get_console_output(instance_ref) + output = self.driver.get_console_output(instance_ref) + return output.decode('utf-8', 'replace').encode('ascii', 'replace') @exception.wrap_exception def get_ajax_console(self, context, instance_id): diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py index c45bdd12c..f271c03f2 100644 --- a/nova/tests/test_cloud.py +++ b/nova/tests/test_cloud.py @@ -290,7 +290,7 @@ class CloudTestCase(test.TestCase): instance_id = rv['instancesSet'][0]['instanceId'] output = self.cloud.get_console_output(context=self.context, instance_id=[instance_id]) - self.assertEquals(b64decode(output['output']), 'FAKE CONSOLE OUTPUT') + self.assertEquals(b64decode(output['output']), 'FAKE CONSOLE?OUTPUT') # TODO(soren): We need this until we can stop polling in the rpc code # for unit tests. greenthread.sleep(0.3) diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 33f37b512..5ac376e46 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -367,7 +367,7 @@ class FakeConnection(driver.ComputeDriver): return [0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L] def get_console_output(self, instance): - return 'FAKE CONSOLE OUTPUT' + return 'FAKE CONSOLE\xffOUTPUT' def get_ajax_console(self, instance): return {'token': 'FAKETOKEN', |