diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-04 21:59:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-04 21:59:31 +0000 |
| commit | 7e9db618f41fd7afcc2479bd472643a87e9bd949 (patch) | |
| tree | 4afd2069e16df0b93c2f27707f968d19e47bcae4 | |
| parent | 7fb11ad981b2e0d123a1f615770792f8c2bcee20 (diff) | |
| parent | 5ff9619f3989d7baec00eb397d265439d6e87d9c (diff) | |
| download | nova-7e9db618f41fd7afcc2479bd472643a87e9bd949.tar.gz nova-7e9db618f41fd7afcc2479bd472643a87e9bd949.tar.xz nova-7e9db618f41fd7afcc2479bd472643a87e9bd949.zip | |
Merge "Add instance_name field to console detail command which will give the caller the necessary information to actually connect."
| -rw-r--r-- | nova/api/openstack/v2/consoles.py | 1 | ||||
| -rw-r--r-- | nova/tests/api/openstack/v2/test_consoles.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/openstack/v2/consoles.py b/nova/api/openstack/v2/consoles.py index ad0d8cbb4..1c832f316 100644 --- a/nova/api/openstack/v2/consoles.py +++ b/nova/api/openstack/v2/consoles.py @@ -39,6 +39,7 @@ def _translate_detail_keys(cons): info = {'id': cons['id'], 'console_type': pool['console_type'], 'password': cons['password'], + 'instance_name': cons['instance_name'], 'port': cons['port'], 'host': pool['public_hostname']} return dict(console=info) diff --git a/nova/tests/api/openstack/v2/test_consoles.py b/nova/tests/api/openstack/v2/test_consoles.py index 2b7f89149..801dab767 100644 --- a/nova/tests/api/openstack/v2/test_consoles.py +++ b/nova/tests/api/openstack/v2/test_consoles.py @@ -155,12 +155,13 @@ class ConsolesControllerTest(test.TestCase): pool = dict(console_type='fake_type', public_hostname='fake_hostname') return dict(id=console_id, password='fake_password', - port='fake_port', pool=pool) + port='fake_port', pool=pool, instance_name='inst-0001') expected = {'console': {'id': 20, 'port': 'fake_port', 'host': 'fake_hostname', 'password': 'fake_password', + 'instance_name': 'inst-0001', 'console_type': 'fake_type'}} self.stubs.Set(console.API, 'get_console', fake_get_console) |