diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-20 15:51:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-20 15:51:20 +0000 |
| commit | a99b54ef758477376a6254face4ff7fcc698dd8f (patch) | |
| tree | 33fb29305bd3e4d0c5f3bd7e5ab6cbc9f7c6a538 /openstackclient/compute/v2 | |
| parent | 8c1c2f46a93471e63c513f4c5a20297a5afa67d6 (diff) | |
| parent | 8cceaddaac43729c068f0f99675967ee3a7b228a (diff) | |
| download | python-openstackclient-a99b54ef758477376a6254face4ff7fcc698dd8f.tar.gz | |
Merge "Fix console url show command broken in microversion case"
Diffstat (limited to 'openstackclient/compute/v2')
| -rw-r--r-- | openstackclient/compute/v2/console.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py index 97d3f318..4179fa5c 100644 --- a/openstackclient/compute/v2/console.py +++ b/openstackclient/compute/v2/console.py @@ -93,7 +93,7 @@ class ShowConsoleURL(command.ShowOne): '--spice', dest='url_type', action='store_const', - const='spice', + const='spice-html5', help=_("Show SPICE console URL") ) return parser @@ -105,14 +105,20 @@ class ShowConsoleURL(command.ShowOne): parsed_args.server, ) + data = None if parsed_args.url_type in ['novnc', 'xvpvnc']: data = server.get_vnc_console(parsed_args.url_type) - if parsed_args.url_type in ['spice']: + if parsed_args.url_type in ['spice-html5']: data = server.get_spice_console(parsed_args.url_type) if not data: return ({}, {}) info = {} - info.update(data['console']) + # NOTE(Rui Chen): Return 'remote_console' in compute microversion API + # 2.6 and later, return 'console' in compute + # microversion API from 2.0 to 2.5, do compatibility + # handle for different microversion API. + console_data = data.get('remote_console', data.get('console')) + info.update(console_data) return zip(*sorted(six.iteritems(info))) |