openstack/python-cinderclient
Code Issues Proposed changes

Merge "Fix incorrect variable name"

Browse Source
This commit is contained in:
Jenkins
2015-01-06 19:52:00 +00:00
committed by Gerrit Code Review
parent 59177814a4 384b8825b4
commit 9c1ec1d19c
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cinderclient/client.py
View File

@@ -66,7 +66,7 @@ def get_volume_api_from_url(url):
return version[1:] return version[1:]
msg = "Invalid client version '%s'. must be one of: %s" % ( msg = "Invalid client version '%s'. must be one of: %s" % (
(version, ', '.join(valid_versions))) (version, ', '.join(_VALID_VERSIONS)))
raise exceptions.UnsupportedVersion(msg) raise exceptions.UnsupportedVersion(msg)

13
cinderclient/tests/test_client.py
View File

@@ -61,3 +61,16 @@ class ClientTest(utils.TestCase):
self.assertNotIn("fakePassword", output[1]) self.assertNotIn("fakePassword", output[1])
self.assertIn("fakeUser", output[1]) self.assertIn("fakeUser", output[1])
def test_versions(self):
v1_url = 'http://fakeurl/v1/tenants'
v2_url = 'http://fakeurl/v2/tenants'
unknown_url = 'http://fakeurl/v9/tenants'
self.assertEqual('1',
cinderclient.client.get_volume_api_from_url(v1_url))
self.assertEqual('2',
cinderclient.client.get_volume_api_from_url(v2_url))
self.assertRaises(cinderclient.exceptions.UnsupportedVersion,
cinderclient.client.get_volume_api_from_url,
unknown_url)