e60bf28ae3
Glanceclient image listing was special cased as it wasn't implemented in glanceclient directly. This is no longer the case and we should use glanceclient's functions. Change-Id: If8d1246f1bd97c07f9f10f5457aa32124efa0be3
89 lines
2.4 KiB
Python
89 lines
2.4 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.
|
|
#
|
|
|
|
import logging
|
|
|
|
from openstackclient.common import utils
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
DEFAULT_IMAGE_API_VERSION = '1'
|
|
API_VERSION_OPTION = 'os_image_api_version'
|
|
API_NAME = "image"
|
|
API_VERSIONS = {
|
|
"1": "glanceclient.v1.client.Client",
|
|
"2": "glanceclient.v2.client.Client",
|
|
}
|
|
|
|
IMAGE_API_TYPE = 'image'
|
|
IMAGE_API_VERSIONS = {
|
|
'1': 'openstackclient.api.image_v1.APIv1',
|
|
'2': 'openstackclient.api.image_v2.APIv2',
|
|
}
|
|
|
|
|
|
def make_client(instance):
|
|
"""Returns an image service client"""
|
|
image_client = utils.get_client_class(
|
|
API_NAME,
|
|
instance._api_version[API_NAME],
|
|
API_VERSIONS)
|
|
LOG.debug('Instantiating image client: %s', image_client)
|
|
|
|
endpoint = instance.get_endpoint_for_service_type(
|
|
API_NAME,
|
|
region_name=instance._region_name,
|
|
)
|
|
|
|
client = image_client(
|
|
endpoint,
|
|
token=instance.auth.get_token(instance.session),
|
|
cacert=instance._cacert,
|
|
insecure=instance._insecure,
|
|
)
|
|
|
|
# Create the low-level API
|
|
|
|
image_api = utils.get_client_class(
|
|
API_NAME,
|
|
instance._api_version[API_NAME],
|
|
IMAGE_API_VERSIONS)
|
|
LOG.debug('Instantiating image api: %s', image_api)
|
|
|
|
client.api = image_api(
|
|
session=instance.session,
|
|
endpoint=instance.get_endpoint_for_service_type(
|
|
IMAGE_API_TYPE,
|
|
region_name=instance._region_name,
|
|
)
|
|
)
|
|
|
|
return client
|
|
|
|
|
|
def build_option_parser(parser):
|
|
"""Hook to add global options"""
|
|
parser.add_argument(
|
|
'--os-image-api-version',
|
|
metavar='<image-api-version>',
|
|
default=utils.env(
|
|
'OS_IMAGE_API_VERSION',
|
|
default=DEFAULT_IMAGE_API_VERSION),
|
|
help='Image API version, default=' +
|
|
DEFAULT_IMAGE_API_VERSION +
|
|
' (Env: OS_IMAGE_API_VERSION)')
|
|
return parser
|