Merge "Avoid dynamic import from monasca client"

heat/engine/clients/os/monasca.py

@@ -11,8 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from monascaclient import client
 from monascaclient import exc as monasca_exc
+from monascaclient.v2_0 import client as monasca_client
 
 from heat.common import exception as heat_exc
 from heat.engine.clients import client_plugin
@@ -32,9 +32,12 @@ class MonascaClientPlugin(client_plugin.ClientPlugin):
         interface = self._get_client_option(CLIENT_NAME, 'endpoint_type')
         endpoint = self.url_for(service_type=self.MONITORING,
                                 endpoint_type=interface)
-        return client.Client(
-            self.VERSION,
+
+        # Directly use v2_0 client to avoid dynamic import in monasca client,
+        # We can switch back once https://review.opendev.org/#/c/700989 fixed.
+        return monasca_client.Client(
             session=self.context.keystone_session,
+            service_type='monitoring',
             endpoint=endpoint)
 
     def is_not_found(self, ex):

heat/tests/clients/test_monasca_client.py

@@ -14,8 +14,6 @@
 import mock
 import six
 
-import monascaclient
-
 from heat.common import exception as heat_exception
 from heat.engine.clients.os import monasca as client_plugin
 from heat.tests import common
@@ -49,8 +47,7 @@ class MonascaClientPluginTest(common.HeatTestCase):
         client = plugin.client()
         self.assertIsNotNone(client.metrics)
 
-    @mock.patch.object(monascaclient.client, '_session')
-    def test_client_uses_session(self, mock_session):
+    def test_client_uses_session(self):
         context = mock.MagicMock()
         monasca_client = client_plugin.MonascaClientPlugin(context=context)
         self.assertIsNotNone(monasca_client._create())