Merge lp:~pwlars/adt-image-mapper/keystone-token-refresh into lp:adt-image-mapper

[Paul Larson]

Handle a common situation where the token needs to be refreshed

Handle a common situation where the token needs to be refreshed

[Thomi Richards (thomir-deactivatedaccount)]

hacky, but it should work.

review: Approve

[Paul Larson (pwlars)]

Yeah, I normally don't like catching blanket exceptions like that, but the one we really need to catch I think would need to be caught deeper in the client itself. On the plus side, if anything else goes wrong here it'll log the exception and give it one more chance to right itself before failing the request.

=== modified file 'adt_image_mapper/cloud.py'
--- adt_image_mapper/cloud.py	2015-03-13 01:08:05 +0000
+++ adt_image_mapper/cloud.py	2015-03-19 02:58:11 +0000
@@ -30,9 +30,7 @@
         self._config = config
         self._glance_client = None
 
-    def get_image_for_series(self, series_name, architecture):
-        logger.info("Searching for image with series=%r, arch=%r", series_name, architecture)
-        glance_client = self.get_glance_client()
+    def _get_candidate_image(self, glance_client, series_name, architecture):
         candidate_image = None
         for image in  glance_client.images.list():
             logger.debug("Testing  image %r", image.name)
@@ -51,11 +49,26 @@
                 candidate_image = image
             else:
                 logger.debug("Rejected because version is less")
+        return candidate_image
+
+    def get_image_for_series(self, series_name, architecture):
+        logger.info("Searching for image with series=%r, arch=%r", series_name, architecture)
+        glance_client = self.get_glance_client()
+        try:
+            candidate_image = self._get_candidate_image(
+                glance_client, series_name, architecture)
+        except Exception as e:
+            logger.debug("The following exception is probably just the "
+                         "token needing to be refreshed")
+            logger.exception("Exception caught:")
+            glance_client = self.get_glance_client(refresh=True)
+            candidate_image = self._get_candidate_image(
+                glance_client, series_name, architecture)
         logger.info("Search finished, found %r", candidate_image)
         return candidate_image.name if candidate_image else None
 
-    def get_glance_client(self):
-        if self._glance_client is None:
+    def get_glance_client(self, refresh=False):
+        if self._glance_client is None or refresh is True:
             keystone = keystoneclient.v2_0.client.Client(
                 username=self._config.get('nova', 'os_username'),
                 password=self._config.get('nova', 'os_password'),