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
47 lines
1.7 KiB
Python
47 lines
1.7 KiB
Python
# Copyright 2014 Red Hat, Inc.
|
|
# 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.
|
|
|
|
import testtools
|
|
|
|
from glanceclient import client
|
|
from glanceclient.v1 import client as v1
|
|
from glanceclient.v2 import client as v2
|
|
|
|
|
|
class ClientTest(testtools.TestCase):
|
|
|
|
def test_no_endpoint_error(self):
|
|
self.assertRaises(ValueError, client.Client, None)
|
|
|
|
def test_endpoint(self):
|
|
gc = client.Client(1, "http://example.com")
|
|
self.assertEqual("http://example.com", gc.http_client.endpoint)
|
|
self.assertIsInstance(gc, v1.Client)
|
|
|
|
def test_versioned_endpoint(self):
|
|
gc = client.Client(1, "http://example.com/v2")
|
|
self.assertEqual("http://example.com", gc.http_client.endpoint)
|
|
self.assertIsInstance(gc, v1.Client)
|
|
|
|
def test_versioned_endpoint_no_version(self):
|
|
gc = client.Client(endpoint="http://example.com/v2")
|
|
self.assertEqual("http://example.com", gc.http_client.endpoint)
|
|
self.assertIsInstance(gc, v2.Client)
|
|
|
|
def test_versioned_endpoint_with_minor_revision(self):
|
|
gc = client.Client(2.2, "http://example.com/v2.1")
|
|
self.assertEqual("http://example.com", gc.http_client.endpoint)
|
|
self.assertIsInstance(gc, v2.Client)
|