4844a25779
Add support for --timing options. Use cliff via a pseudo-command 'Timing' to support multiple outputformats. If an output format other than the default 'table' is selected use CSV since the timing data is in list form. Will pick up timing data for any client object that has a method similar to novaclient's get_timings(). TODO: * Stop instantiating all of the clientmanager client objects just to check for timing data. Descriptor magic required? Change-Id: I7f1076b7a250fba6a8b24b2ae9353a7f51b792b2
86 lines
2.8 KiB
Python
86 lines
2.8 KiB
Python
# Copyright 2012-2013 OpenStack, LLC.
|
|
#
|
|
# 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.
|
|
#
|
|
|
|
import logging
|
|
|
|
from openstackclient.common import utils
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
DEFAULT_COMPUTE_API_VERSION = '2'
|
|
API_VERSION_OPTION = 'os_compute_api_version'
|
|
API_NAME = 'compute'
|
|
API_VERSIONS = {
|
|
'1.1': 'novaclient.v1_1.client.Client',
|
|
'2': 'novaclient.v1_1.client.Client',
|
|
}
|
|
|
|
|
|
def make_client(instance):
|
|
"""Returns a compute service client."""
|
|
compute_client = utils.get_client_class(
|
|
API_NAME,
|
|
instance._api_version[API_NAME],
|
|
API_VERSIONS)
|
|
LOG.debug('instantiating compute client: %s', compute_client)
|
|
|
|
# Set client http_log_debug to True if verbosity level is high enough
|
|
http_log_debug = utils.get_effective_log_level() <= logging.DEBUG
|
|
|
|
client = compute_client(
|
|
username=instance._username,
|
|
api_key=instance._password,
|
|
project_id=instance._project_name,
|
|
auth_url=instance._auth_url,
|
|
cacert=instance._cacert,
|
|
insecure=instance._insecure,
|
|
region_name=instance._region_name,
|
|
# FIXME(dhellmann): get endpoint_type from option?
|
|
endpoint_type='publicURL',
|
|
# FIXME(dhellmann): add extension discovery
|
|
extensions=[],
|
|
service_type=API_NAME,
|
|
# FIXME(dhellmann): what is service_name?
|
|
service_name='',
|
|
http_log_debug=http_log_debug,
|
|
timings=instance.timing,
|
|
)
|
|
|
|
# Populate the Nova client to skip another auth query to Identity
|
|
if instance._url:
|
|
# token flow
|
|
client.client.management_url = instance._url
|
|
else:
|
|
# password flow
|
|
client.client.management_url = instance.get_endpoint_for_service_type(
|
|
API_NAME)
|
|
client.client.service_catalog = instance._service_catalog
|
|
client.client.auth_token = instance._token
|
|
return client
|
|
|
|
|
|
def build_option_parser(parser):
|
|
"""Hook to add global options"""
|
|
parser.add_argument(
|
|
'--os-compute-api-version',
|
|
metavar='<compute-api-version>',
|
|
default=utils.env(
|
|
'OS_COMPUTE_API_VERSION',
|
|
default=DEFAULT_COMPUTE_API_VERSION),
|
|
help='Compute API version, default=' +
|
|
DEFAULT_COMPUTE_API_VERSION +
|
|
' (Env: OS_COMPUTE_API_VERSION)')
|
|
return parser
|