From a9b5cc401bc1b91fd28ff44eb93b0b103e126db5 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam Date: Thu, 3 Dec 2015 15:40:49 +0530 Subject: Makes monasca plugin as supported Adds python-monascaclient into requirments.txt and makes the monasca plugin as supported. Closes-bug: #1581379 Change-Id: I3793b06cab25d7a108bb140791f3f672fd9154a1 --- heat/engine/clients/os/monasca.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'heat/engine/clients') diff --git a/heat/engine/clients/os/monasca.py b/heat/engine/clients/os/monasca.py index 609e4a99d..af13c64e1 100644 --- a/heat/engine/clients/os/monasca.py +++ b/heat/engine/clients/os/monasca.py @@ -11,28 +11,23 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_utils import importutils +from monascaclient import client +from monascaclient import exc as monasca_exc from heat.common import exception as heat_exc from heat.engine.clients import client_plugin from heat.engine import constraints -client = importutils.try_import('monascaclient.client') -monasca_exc = importutils.try_import('monascaclient.exc') - CLIENT_NAME = 'monasca' class MonascaClientPlugin(client_plugin.ClientPlugin): exceptions_module = [monasca_exc] + service_types = [MONITORING] = ['monitoring'] VERSION = '2_0' - @staticmethod - def is_available(): - return client is not None - def _create(self): args = self._get_client_args(service_name=CLIENT_NAME, service_type=self.MONITORING) -- cgit v1.2.1