Fix glance endpoint tests

Glance endpoints are now located under http_client after reworking
for glance blueprint common-client-library-2. Change located in
glanceclient commit I5addc38eb2e2dd0be91b566fda7c0d81787ffa75

Test support both glanceclient versions for backward compatibility.

Change-Id: Idba3a05bdb09674b44dcc21c9427b4b85a29a1f7
(cherry picked from commit dac09ad2cd3a65efdd124b6001891428fff9811c)

1 files changed, 14 insertions, 2 deletions

diff --git a/ironic/tests/test_glance_service.py b/ironic/tests/test_glance_service.py
index 0d7719414..67ed00da6 100644
--- a/ironic/tests/test_glance_service.py
+++ b/ironic/tests/test_glance_service.py
@@ -117,6 +117,18 @@ class TestGlanceImageService(base.TestCase):
         fixture.update(kwargs)
         return fixture
 
+    @property
+    def endpoint(self):
+        # For glanceclient versions >= 0.13, the endpoint is located
+        # under http_client (blueprint common-client-library-2)
+        # I5addc38eb2e2dd0be91b566fda7c0d81787ffa75
+        # Test both options to keep backward compatibility
+        if getattr(self.service.client, 'endpoint', None):
+            endpoint = self.service.client.endpoint
+        else:
+            endpoint = self.service.client.http_client.endpoint
+        return endpoint
+
     def _make_datetime_fixture(self):
         return self._make_fixture(created_at=self.NOW_GLANCE_FORMAT,
                                   updated_at=self.NOW_GLANCE_FORMAT,
@@ -579,7 +591,7 @@ class TestGlanceImageService(base.TestCase):
 
     def test_check_image_service__no_client_set_http(self):
         def func(service, *args, **kwargs):
-            return (service.client.endpoint, args, kwargs)
+            return (self.endpoint, args, kwargs)
 
         self.service.client = None
         params = {'image_href': 'http://123.123.123.123:9292/image_uuid'}
@@ -590,7 +602,7 @@ class TestGlanceImageService(base.TestCase):
 
     def test_get_image_service__no_client_set_https(self):
         def func(service, *args, **kwargs):
-            return (service.client.endpoint, args, kwargs)
+            return (self.endpoint, args, kwargs)
 
         self.service.client = None
         params = {'image_href': 'https://123.123.123.123:9292/image_uuid'}