0ef8535036
Leverage the new cliff command class attribute (_description) to get the help of a command, this allows us to mark strings for translation. We could not do this before since the help was grabbed from the docstring. This also depends on a new release of cliff and a bump to the minimum level in osc's requirements. Closes-Bug: 1636209 Depends-On: Id915f6aa7d95a0ff3dc6e2ceaac5decb3f3bf0da Change-Id: I8673080bb5625e8e3c499feaefd42dfc7121e96f
152 lines
4.9 KiB
Python
152 lines
4.9 KiB
Python
# Copyright 2012-2013 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
"""Compute v2 Console action implementations"""
|
|
|
|
import sys
|
|
|
|
from osc_lib.cli import parseractions
|
|
from osc_lib.command import command
|
|
from osc_lib import utils
|
|
import six
|
|
|
|
from openstackclient.i18n import _
|
|
|
|
|
|
class ShowConsoleLog(command.Command):
|
|
_description = _("Show server's console output")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ShowConsoleLog, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'server',
|
|
metavar='<server>',
|
|
help=_("Server to show console log (name or ID)")
|
|
)
|
|
parser.add_argument(
|
|
'--lines',
|
|
metavar='<num-lines>',
|
|
type=int,
|
|
default=None,
|
|
action=parseractions.NonNegativeAction,
|
|
help=_("Number of lines to display from the end of the log "
|
|
"(default=all)")
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
compute_client = self.app.client_manager.compute
|
|
|
|
server = utils.find_resource(
|
|
compute_client.servers,
|
|
parsed_args.server,
|
|
)
|
|
length = parsed_args.lines
|
|
if length:
|
|
# NOTE(dtroyer): get_console_output() appears to shortchange the
|
|
# output by one line
|
|
length += 1
|
|
|
|
data = server.get_console_output(length=length)
|
|
sys.stdout.write(data)
|
|
|
|
|
|
class ShowConsoleURL(command.ShowOne):
|
|
_description = _("Show server's remote console URL")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ShowConsoleURL, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'server',
|
|
metavar='<server>',
|
|
help=_("Server to show URL (name or ID)")
|
|
)
|
|
type_group = parser.add_mutually_exclusive_group()
|
|
type_group.add_argument(
|
|
'--novnc',
|
|
dest='url_type',
|
|
action='store_const',
|
|
const='novnc',
|
|
default='novnc',
|
|
help=_("Show noVNC console URL (default)")
|
|
)
|
|
type_group.add_argument(
|
|
'--xvpvnc',
|
|
dest='url_type',
|
|
action='store_const',
|
|
const='xvpvnc',
|
|
help=_("Show xvpvnc console URL")
|
|
)
|
|
type_group.add_argument(
|
|
'--spice',
|
|
dest='url_type',
|
|
action='store_const',
|
|
const='spice-html5',
|
|
help=_("Show SPICE console URL")
|
|
)
|
|
type_group.add_argument(
|
|
'--rdp',
|
|
dest='url_type',
|
|
action='store_const',
|
|
const='rdp-html5',
|
|
help=_("Show RDP console URL"),
|
|
)
|
|
type_group.add_argument(
|
|
'--serial',
|
|
dest='url_type',
|
|
action='store_const',
|
|
const='serial',
|
|
help=_("Show serial console URL"),
|
|
)
|
|
type_group.add_argument(
|
|
'--mks',
|
|
dest='url_type',
|
|
action='store_const',
|
|
const='webmks',
|
|
help=_("Show WebMKS console URL"),
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
compute_client = self.app.client_manager.compute
|
|
server = utils.find_resource(
|
|
compute_client.servers,
|
|
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()
|
|
|
|
if not data:
|
|
return ({}, {})
|
|
|
|
info = {}
|
|
# 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)))
|