From f891b6862f0b980051b7e6e0d88eb6e10b72ac29 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Mon, 9 Jan 2017 10:11:02 +0800 Subject: Use public and unified method get_console_url() Novaclient has provided a public and unified method get_console_url() to get console urls of server. This change switches to use it. Change-Id: Ie6b9d8cfc57a6943b5d64a4064e4bdd372cd8cd3 Depends-on: I36c6209b17ef453e1c2e47841daf41f81af471dc Closes-Bug: #1654913 --- openstackclient/compute/v2/console.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'openstackclient/compute') 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 ({}, {}) -- cgit v1.2.1