9829d7b6b9
We currently require a version to always be passed to discover the client version that should be loaded. However, this information is commonly present in the URL instead. The current behavior forces consumers of the library to keep the required version around and/or to strip it themselves from the URL. This patch relaxes that requirement by making the version a keyword and requesting instead an endpoint to be passed. The patch gives priority to the version in the endpoint and falls back to the keyword if the later is not present. Follow-up patches will improve this code making it interact a bit more with the endpoint's catalog. Closes-bug: #1395714 Change-Id: I4ada9e724ac4709429e502b5a006604ca0453f61
63 lines
2.4 KiB
Python
63 lines
2.4 KiB
Python
# Copyright 2012 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
|
|
from glanceclient.common import http
|
|
from glanceclient.common import utils
|
|
from glanceclient.v2 import image_members
|
|
from glanceclient.v2 import image_tags
|
|
from glanceclient.v2 import images
|
|
from glanceclient.v2 import metadefs
|
|
from glanceclient.v2 import schemas
|
|
from glanceclient.v2 import tasks
|
|
|
|
|
|
class Client(object):
|
|
"""Client for the OpenStack Images v2 API.
|
|
|
|
:param string endpoint: A user-supplied endpoint URL for the glance
|
|
service.
|
|
:param string token: Token for authentication.
|
|
:param integer timeout: Allows customization of the timeout for client
|
|
http requests. (optional)
|
|
"""
|
|
|
|
def __init__(self, endpoint, *args, **kwargs):
|
|
endpoint, version = utils.strip_version(endpoint)
|
|
self.version = version or 2.0
|
|
self.http_client = http.HTTPClient(endpoint, *args, **kwargs)
|
|
|
|
self.schemas = schemas.Controller(self.http_client)
|
|
|
|
self.images = images.Controller(self.http_client, self.schemas)
|
|
self.image_tags = image_tags.Controller(self.http_client,
|
|
self.schemas)
|
|
self.image_members = image_members.Controller(self.http_client,
|
|
self.schemas)
|
|
|
|
self.tasks = tasks.Controller(self.http_client, self.schemas)
|
|
|
|
self.metadefs_resource_type = (
|
|
metadefs.ResourceTypeController(self.http_client, self.schemas))
|
|
|
|
self.metadefs_property = (
|
|
metadefs.PropertyController(self.http_client, self.schemas))
|
|
|
|
self.metadefs_object = (
|
|
metadefs.ObjectController(self.http_client, self.schemas))
|
|
|
|
self.metadefs_namespace = (
|
|
metadefs.NamespaceController(self.http_client, self.schemas))
|