openstack/heat
Code Issues Proposed changes

Merge "Avoid dynamic import from monasca client"

Browse Source
This commit is contained in:
Zuul 2020-02-20 03:13:40 +00:00 committed by Gerrit Code Review
commit 1c867cd194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heat/engine/clients/os/monasca.py
View File

@ -11,8 +11,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from monascaclient import client
from monascaclient import exc as monasca_exc 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.common import exception as heat_exc
from heat.engine.clients import client_plugin 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') interface = self._get_client_option(CLIENT_NAME, 'endpoint_type')
endpoint = self.url_for(service_type=self.MONITORING, endpoint = self.url_for(service_type=self.MONITORING,
endpoint_type=interface) 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, session=self.context.keystone_session,
service_type='monitoring',
endpoint=endpoint) endpoint=endpoint)
def is_not_found(self, ex): def is_not_found(self, ex):

5
heat/tests/clients/test_monasca_client.py
View File

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