Merge "Importing from trove-client compat"

openstack_dashboard/api/trove.py

@@ -21,6 +21,11 @@ try:
     from troveclient import client
     with_trove = True
 except ImportError:
+    try:
+        from troveclient.compat import auth
+        from troveclient.compat import client
+        with_trove = True
+    except ImportError:
         with_trove = False
 
 

openstack_dashboard/dashboards/project/databases/tests.py

@@ -24,7 +24,14 @@ from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
 
 if api.trove.with_trove:
+    try:
         from troveclient import common
+    except ImportError:
+        try:
+            from troveclient.compat import common
+        except ImportError:
+            pass
+
 
 INDEX_URL = reverse('horizon:project:databases:index')
 LAUNCH_URL = reverse('horizon:project:databases:launch')

openstack_dashboard/exceptions.py

@@ -29,6 +29,10 @@ try:
     from troveclient import exceptions as troveclient
     with_trove = True
 except ImportError:
+    try:
+        from troveclient.compat import exceptions as troveclient
+        with_trove = True
+    except ImportError:
         with_trove = False
 
 

openstack_dashboard/test/helpers.py

@@ -42,6 +42,10 @@ try:
     from troveclient import client as trove_client
     with_trove = True
 except ImportError:
+    try:
+        from troveclient.compat import client as trove_client
+        with_trove = True
+    except ImportError:
         with_trove = False
 
 import httplib2

openstack_dashboard/test/test_data/exceptions.py

@@ -23,6 +23,10 @@ try:
     from troveclient import exceptions as trove_exceptions
     with_trove = True
 except ImportError:
+    try:
+        from troveclient.compat import exceptions as trove_exceptions
+        with_trove = True
+    except ImportError:
         with_trove = False
 
 from openstack_dashboard.test.test_data import utils

openstack_dashboard/test/test_data/trove_data.py

@@ -19,6 +19,11 @@ try:
     from troveclient import instances
     with_trove = True
 except ImportError:
+    try:
+        from troveclient.v1 import backups
+        from troveclient.v1 import instances
+        with_trove = True
+    except ImportError:
         with_trove = False
 
 from openstack_dashboard.test.test_data import utils