Fix always false condition in glance wrapper

If statement's condition in GlanceClientWrapper's method 'call'
always false, because 'version' key passed through kwargs is
string, and variable chacked in 'call' is None or int.

Change-Id: Ief1e8d2c41aaa774666bc59d63cdea68f80f308a
Closes-Bug: #1439275

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index 5b9c85ed18b898c30abe47df56fb8d14ce661b00..3c1edb47f134a04ca10280df5815e8575e9155d1 100644 (file)
--- a/cinder/image/glance.py
+++ b/cinder/image/glance.py
@@ -74,8 +74,7 @@ def _parse_image_ref(image_href):
     return (image_id, netloc, use_ssl)
 
 
-def _create_glance_client(context, netloc, use_ssl,
-                          version=CONF.glance_api_version):
+def _create_glance_client(context, netloc, use_ssl, version=None):
     """Instantiate a new glanceclient.Client object."""
     if version is None:
         version = CONF.glance_api_version
@@ -161,7 +160,7 @@ class GlanceClientWrapper(object):
         retry the request according to CONF.glance_num_retries.
         """
         version = self.version
-        if version in kwargs:
+        if 'version' in kwargs:
             version = kwargs['version']
 
         retry_excs = (glanceclient.exc.ServiceUnavailable,

diff --git a/cinder/tests/image/test_glance.py b/cinder/tests/image/test_glance.py
index f4f9ee150e2f65575c86da6408fa251d78ae102f..f7f8ea45b718be12acb9f908e8a357129ded512b 100644 (file)
--- a/cinder/tests/image/test_glance.py
+++ b/cinder/tests/image/test_glance.py
@@ -606,6 +606,14 @@ class TestGlanceClientVersion(test.TestCase):
         glance.GlanceClientWrapper('fake', 'fake_host', 9292, version=2)
         self.assertEqual('2', _mockglanceclient.call_args[0][0])
 
+    @mock.patch('cinder.image.glance.glanceclient.Client')
+    def test_call_glance_version_by_arg(self, _mockglanceclient):
+        """Test glance version set by arg to GlanceClientWrapper"""
+        glance_wrapper = glance.GlanceClientWrapper()
+        glance_wrapper.call('fake_context', 'method', version=2)
+
+        self.assertEqual('2', _mockglanceclient.call_args[0][0])
+
 
 def _create_failing_glance_client(info):
     class MyGlanceStubClient(glance_stubs.StubGlanceClient):