0b2987fef3
The find_resource method had two hacks in in to support cinder and keystone and I have removed those in favor of a monkey patch for cinder. The find_resource method used to attempt to UUID parse the id, but it would do a manager.get anyway. I changed it to skip the UUID parsing. This will make things run minorly faster and it supports LDAP for keystone. The find_resource used to attempt to use display_name=name_or_id when finding. This was a hack for cinder support, but it breaks keystone because keystone totally messes up with the bogus filter and keystone refuses to fix it. Change-Id: I66e45a6341f704900f1d5321a0e70eac3d051665 Closes-Bug: #1306699
86 lines
2.6 KiB
Python
86 lines
2.6 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 cinderclient.v1 import volume_snapshots
|
|
from cinderclient.v1 import volumes
|
|
from openstackclient.common import utils
|
|
|
|
# Monkey patch for v1 cinderclient
|
|
volumes.Volume.NAME_ATTR = 'display_name'
|
|
volume_snapshots.Snapshot.NAME_ATTR = 'display_name'
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
DEFAULT_VOLUME_API_VERSION = '1'
|
|
API_VERSION_OPTION = 'os_volume_api_version'
|
|
API_NAME = "volume"
|
|
API_VERSIONS = {
|
|
"1": "cinderclient.v1.client.Client"
|
|
}
|
|
|
|
|
|
def make_client(instance):
|
|
"""Returns a volume service client."""
|
|
volume_client = utils.get_client_class(
|
|
API_NAME,
|
|
instance._api_version[API_NAME],
|
|
API_VERSIONS
|
|
)
|
|
|
|
LOG.debug('instantiating volume 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 = volume_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,
|
|
http_log_debug=http_log_debug
|
|
)
|
|
|
|
# Populate the Cinder 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-volume-api-version',
|
|
metavar='<volume-api-version>',
|
|
default=utils.env(
|
|
'OS_VOLUME_API_VERSION',
|
|
default=DEFAULT_VOLUME_API_VERSION),
|
|
help='Volume API version, default=' +
|
|
DEFAULT_VOLUME_API_VERSION +
|
|
' (Env: OS_VOLUME_API_VERSION)')
|
|
return parser
|