diff options
| author | Flavio Percoco <flaper87@gmail.com> | 2014-11-24 15:12:39 +0100 |
|---|---|---|
| committer | Flavio Percoco <fpercoco@redhat.com> | 2014-12-09 14:45:06 +0000 |
| commit | 9829d7b6b9f2232bda8039b6db54be1d8885e7a0 (patch) | |
| tree | 428603b212b8f8ae3e7a3183e3ce5a7346018ce4 /glanceclient/v1 | |
| parent | 521cc25a0aed5c2783830847baa09344efaaf817 (diff) | |
| download | python-glanceclient-9829d7b6b9f2232bda8039b6db54be1d8885e7a0.tar.gz | |
Don't require version to create Client instance
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
Diffstat (limited to 'glanceclient/v1')
| -rw-r--r-- | glanceclient/v1/client.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/glanceclient/v1/client.py b/glanceclient/v1/client.py index aeb94a2..668ccfb 100644 --- a/glanceclient/v1/client.py +++ b/glanceclient/v1/client.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from glanceclient.common.http import HTTPClient +from glanceclient.common import http from glanceclient.common import utils from glanceclient.v1.image_members import ImageMemberManager from glanceclient.v1.images import ImageManager @@ -31,7 +31,8 @@ class Client(object): def __init__(self, endpoint, *args, **kwargs): """Initialize a new client for the Images v1 API.""" - self.http_client = HTTPClient(utils.strip_version(endpoint), - *args, **kwargs) + endpoint, version = utils.strip_version(endpoint) + self.version = version or 1.0 + self.http_client = http.HTTPClient(endpoint, *args, **kwargs) self.images = ImageManager(self.http_client) self.image_members = ImageMemberManager(self.http_client) |