From 384b8825b485d4918f15713212d9e5d64eef2682 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Mon, 27 Oct 2014 15:34:18 +0100 Subject: [PATCH] Fix incorrect variable name valid_versions does not exist here, it is obviously supposed to mean _VALID_VERSIONS. Closes-Bug: #1386232 Change-Id: I477baa7642feba72f80d884d6183512185b02cf1 --- cinderclient/client.py | 2 +- cinderclient/tests/test_client.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/cinderclient/client.py b/cinderclient/client.py index 358b2a25e..1bb449f8a 100644 --- a/cinderclient/client.py +++ b/cinderclient/client.py @@ -66,7 +66,7 @@ def get_volume_api_from_url(url): return version[1:] msg = "Invalid client version '%s'. must be one of: %s" % ( - (version, ', '.join(valid_versions))) + (version, ', '.join(_VALID_VERSIONS))) raise exceptions.UnsupportedVersion(msg) diff --git a/cinderclient/tests/test_client.py b/cinderclient/tests/test_client.py index bc70f1bb8..f8fce259f 100644 --- a/cinderclient/tests/test_client.py +++ b/cinderclient/tests/test_client.py @@ -61,3 +61,16 @@ class ClientTest(utils.TestCase): self.assertNotIn("fakePassword", 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)