bf834f6d75
The 'cpu_info' field returned by the 'os-hypervisors' API is an object and should be formatted as such. However, this is complicated by the fact that the object in this field is stringified until microversion 2.28 and is only returned as an actual object on later microversions. Handle the conversion from the string for older microversions and display things correctly for all releases. Change-Id: Ide31466cbb9e89c96d6bd542fe039ab5ed1fac1f Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
147 lines
5.1 KiB
Python
147 lines
5.1 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.
|
|
#
|
|
|
|
"""Hypervisor action implementations"""
|
|
|
|
import json
|
|
import re
|
|
|
|
from novaclient import api_versions
|
|
from novaclient import exceptions as nova_exceptions
|
|
from osc_lib.cli import format_columns
|
|
from osc_lib.command import command
|
|
from osc_lib import utils
|
|
|
|
from openstackclient.i18n import _
|
|
|
|
|
|
class ListHypervisor(command.Lister):
|
|
_description = _("List hypervisors")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ListHypervisor, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
"--matching",
|
|
metavar="<hostname>",
|
|
help=_("Filter hypervisors using <hostname> substring")
|
|
)
|
|
parser.add_argument(
|
|
'--long',
|
|
action='store_true',
|
|
help=_("List additional fields in output")
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
compute_client = self.app.client_manager.compute
|
|
columns = (
|
|
"ID",
|
|
"Hypervisor Hostname",
|
|
"Hypervisor Type",
|
|
"Host IP",
|
|
"State"
|
|
)
|
|
if parsed_args.long:
|
|
columns += ("vCPUs Used", "vCPUs", "Memory MB Used", "Memory MB")
|
|
|
|
if parsed_args.matching:
|
|
data = compute_client.hypervisors.search(parsed_args.matching)
|
|
else:
|
|
data = compute_client.hypervisors.list()
|
|
|
|
return (columns,
|
|
(utils.get_item_properties(
|
|
s, columns,
|
|
) for s in data))
|
|
|
|
|
|
class ShowHypervisor(command.ShowOne):
|
|
_description = _("Display hypervisor details")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ShowHypervisor, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
"hypervisor",
|
|
metavar="<hypervisor>",
|
|
help=_("Hypervisor to display (name or ID)")
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
compute_client = self.app.client_manager.compute
|
|
hypervisor = utils.find_resource(compute_client.hypervisors,
|
|
parsed_args.hypervisor)._info.copy()
|
|
|
|
aggregates = compute_client.aggregates.list()
|
|
hypervisor["aggregates"] = list()
|
|
if aggregates:
|
|
# Hypervisors in nova cells are prefixed by "<cell>@"
|
|
if "@" in hypervisor['service']['host']:
|
|
cell, service_host = hypervisor['service']['host'].split(
|
|
'@', 1)
|
|
else:
|
|
cell = None
|
|
service_host = hypervisor['service']['host']
|
|
|
|
if cell:
|
|
# The host aggregates are also prefixed by "<cell>@"
|
|
member_of = [aggregate.name
|
|
for aggregate in aggregates
|
|
if cell in aggregate.name and
|
|
service_host in aggregate.hosts]
|
|
else:
|
|
member_of = [aggregate.name
|
|
for aggregate in aggregates
|
|
if service_host in aggregate.hosts]
|
|
hypervisor["aggregates"] = member_of
|
|
|
|
try:
|
|
uptime = compute_client.hypervisors.uptime(hypervisor['id'])._info
|
|
# Extract data from uptime value
|
|
# format: 0 up 0, 0 users, load average: 0, 0, 0
|
|
# example: 17:37:14 up 2:33, 3 users,
|
|
# load average: 0.33, 0.36, 0.34
|
|
m = re.match(
|
|
r"\s*(.+)\sup\s+(.+),\s+(.+)\susers?,\s+load average:\s(.+)",
|
|
uptime['uptime'])
|
|
if m:
|
|
hypervisor["host_time"] = m.group(1)
|
|
hypervisor["uptime"] = m.group(2)
|
|
hypervisor["users"] = m.group(3)
|
|
hypervisor["load_average"] = m.group(4)
|
|
except nova_exceptions.HTTPNotImplemented:
|
|
pass
|
|
|
|
hypervisor["service_id"] = hypervisor["service"]["id"]
|
|
hypervisor["service_host"] = hypervisor["service"]["host"]
|
|
del hypervisor["service"]
|
|
|
|
if compute_client.api_version < api_versions.APIVersion('2.28'):
|
|
# microversion 2.28 transformed this to a JSON blob rather than a
|
|
# string; on earlier fields, do this manually
|
|
if hypervisor['cpu_info']:
|
|
hypervisor['cpu_info'] = json.loads(hypervisor['cpu_info'])
|
|
else:
|
|
hypervisor['cpu_info'] = {}
|
|
|
|
columns = tuple(sorted(hypervisor))
|
|
data = utils.get_dict_properties(
|
|
hypervisor, columns,
|
|
formatters={
|
|
'cpu_info': format_columns.DictColumn,
|
|
})
|
|
|
|
return (columns, data)
|