Merge pull request #35 from aznashwan/retry-secret-payload

Error out of no Import OSMorphing tools are found.

coriolis/osmorphing/manager.py

@@ -72,19 +72,15 @@ def morph_image(origin_provider, destination_provider, connection_info,
     except exception.OSMorphingToolsNotFound:
         export_os_morphing_tools = None
 
-    try:
-        (import_os_morphing_tools,
-         os_info) = destination_provider.get_os_morphing_tools(
-            conn, osmorphing_info)
-        import_os_morphing_tools.set_environment(environment)
-    except exception.OSMorphingToolsNotFound:
-        import_os_morphing_tools = None
-        os_info = None
+    (import_os_morphing_tools,
+     os_info) = destination_provider.get_os_morphing_tools(
+         conn, osmorphing_info)
 
     if not import_os_morphing_tools:
         event_manager.progress_update(
             'No OS morphing tools found for this instance')
     else:
+        import_os_morphing_tools.set_environment(environment)
         event_manager.progress_update('OS being migrated: %s' % str(os_info))
 
         (packages_add, _) = import_os_morphing_tools.get_packages()

coriolis/providers/base.py

@@ -129,6 +129,9 @@ class BaseEndpointDestinationOptionsProvider(
 class BaseInstanceProvider(BaseProvider):
 
     def get_os_morphing_tools(self, conn, osmorphing_info):
+        """ Returns a tuple containing the instantiated OSMorphing tools class
+        to use as well as the OS info returned by the tools' `check_os` method.
+        """
         raise exception.OSMorphingToolsNotFound()
 
 

coriolis/secrets.py

@@ -13,4 +13,6 @@ def get_secret(ctxt, secret_ref):
     session = keystone.create_keystone_session(ctxt)
     barbican = barbican_client.Client(session=session)
     sec = utils.retry_on_error()(barbican.secrets.get)(secret_ref)
-    return json.loads(sec.payload)
+    # NOTE: accessing `payload` leads to another API call being made:
+    payload = utils.retry_on_error()(getattr)(sec, "payload")
+    return json.loads(payload)