commit 4dd2fef1fb51b54d9fea6aad8b05615fb1a50364
author Vasyl Saienko <vsaienko@mirantis.com> Sat Jan 25 13:54:12 2020 +0200
committer Vasyl Saienko <vsaienko@mirantis.com> Sat Jan 25 13:55:32 2020 +0200
tree e8701126036991dca9573d56fd20d09ee1c06dfb
parent 19b0cb91aeba1eebe5e95fb593ad2842cad112f9

Fix gnocchi client import

Related-Prod: PRODX-2479
Change-Id: I84e9a70c81e37ac23fcfc5871c2b6299ddadddef

heat_tempest_plugin/services/clients.py

diff --git a/heat_tempest_plugin/services/clients.py b/heat_tempest_plugin/services/clients.py
index 7604670..a9bd981 100644
--- a/heat_tempest_plugin/services/clients.py
+++ b/heat_tempest_plugin/services/clients.py
@@ -200,5 +200,10 @@
             'session': self.identity_client.session,
             'adapter_options': adapter_options
         }
-        return gnocchi_client.Client(version=self.GNOCCHI_VERSION,
-                                     **args)
+        try:
+            return gnocchi_client.Client(version=self.GNOCCHI_VERSION,
+                                         **args)
+        except ImportError:
+            # catches ujson vs Python GCC compat problem,
+            # see https://github.com/esnme/ultrajson/issues/346
+            return None