diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-20 19:46:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-20 19:46:15 +0000 |
| commit | 477694db49101fecce2f282d9b7f83d8efcef286 (patch) | |
| tree | e840bb91db60503730ba3bbb3330ac1311159408 /openstackclient/compute | |
| parent | 91f7451180a88bee4d9e26738bb62c48a37a2451 (diff) | |
| parent | f891b6862f0b980051b7e6e0d88eb6e10b72ac29 (diff) | |
| download | python-openstackclient-477694db49101fecce2f282d9b7f83d8efcef286.tar.gz | |
Merge "Use public and unified method get_console_url()"
Diffstat (limited to 'openstackclient/compute')
| -rw-r--r-- | openstackclient/compute/v2/console.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py index 358df501..25f92108 100644 --- a/openstackclient/compute/v2/console.py +++ b/openstackclient/compute/v2/console.py @@ -126,18 +126,7 @@ 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-html5']: - data = server.get_spice_console(parsed_args.url_type) - if parsed_args.url_type in ['rdp-html5']: - data = server.get_rdp_console(parsed_args.url_type) - if parsed_args.url_type in ['serial']: - data = server.get_serial_console(parsed_args.url_type) - if parsed_args.url_type in ['webmks']: - data = server.get_mks_console() - + data = server.get_console_url(parsed_args.url_type) if not data: return ({}, {}) |