diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-02-24 15:40:16 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-02-24 15:40:16 +0000 |
| commit | 76ec5af4e776ae036dc41390389c8334d9799049 (patch) | |
| tree | 596394c208e86edfac6b209a4c04245116cf7d2d /nova/virt | |
| parent | d1a6cb96c1c72894cbba24e6806da5c81fb915df (diff) | |
| parent | f277be5839c76dc2b9efb6ad49dc2a979b1a028d (diff) | |
merge trunk
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/fake.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 92749f38a..4346dffc1 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -319,7 +319,9 @@ class FakeConnection(object): return 'FAKE CONSOLE OUTPUT' def get_ajax_console(self, instance): - return 'http://fakeajaxconsole.com/?token=FAKETOKEN' + return {'token': 'FAKETOKEN', + 'host': 'fakeajaxconsole.com', + 'port': 6969} def get_console_pool_info(self, console_type): return {'address': '127.0.0.1', |