From 8161541042bea133f3f9e487fa6d35f11f93d9b6 Mon Sep 17 00:00:00 2001 From: Ethan Lynn Date: Mon, 2 Nov 2015 12:48:20 +0800 Subject: [PATCH] Add senlin client Add senlin client plugin to heat. blueprint senlin-resources Depends-on: I8aff7203f6f0df8545e8d9e7ecef969f60230727 Change-Id: Ia0c1e587d0310cc95a6e2666e836e18b32a333be --- heat/engine/clients/os/senlin.py | 35 ++++++++++++++++++++++++ heat/tests/clients/test_senlin_client.py | 24 ++++++++++++++++ requirements.txt | 1 + setup.cfg | 3 +- 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 heat/engine/clients/os/senlin.py create mode 100644 heat/tests/clients/test_senlin_client.py diff --git a/heat/engine/clients/os/senlin.py b/heat/engine/clients/os/senlin.py new file mode 100644 index 0000000000..cdfb625895 --- /dev/null +++ b/heat/engine/clients/os/senlin.py @@ -0,0 +1,35 @@ +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from heat.engine.clients import client_plugin + +from senlinclient import client +from senlinclient.common import exc + + +class SenlinClientPlugin(client_plugin.ClientPlugin): + + service_types = [CLUSTERING] = ['clustering'] + VERSION = '1' + + def _create(self): + con = self.context + args = { + 'auth_url': con.auth_url, + 'project_id': con.tenant_id, + 'token': self.auth_token, + } + return client.Client(self.VERSION, **args) + + def is_not_found(self, ex): + return isinstance(ex, exc.HTTPNotFound) diff --git a/heat/tests/clients/test_senlin_client.py b/heat/tests/clients/test_senlin_client.py new file mode 100644 index 0000000000..2182794d3f --- /dev/null +++ b/heat/tests/clients/test_senlin_client.py @@ -0,0 +1,24 @@ +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from heat.tests import common +from heat.tests import utils + + +class SenlinClientPluginTests(common.HeatTestCase): + + def test_cluster_get(self): + context = utils.dummy_context() + plugin = context.clients.client_plugin('senlin') + client = plugin.client() + self.assertIsNotNone(client.clusters) diff --git a/requirements.txt b/requirements.txt index 3f55941a8f..68aa90ce3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -43,6 +43,7 @@ python-neutronclient>=2.6.0 python-novaclient!=2.33.0,>=2.29.0 python-openstackclient>=1.5.0 python-saharaclient>=0.10.0 +python-senlinclient>=0.1.5 python-swiftclient>=2.2.0 python-troveclient>=1.2.0 python-zaqarclient>=0.1.1 diff --git a/setup.cfg b/setup.cfg index 9b94dbb46f..4c99056cb3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -67,9 +67,10 @@ heat.clients = monasca = heat.engine.clients.os.monasca:MonascaClientPlugin nova = heat.engine.clients.os.nova:NovaClientPlugin neutron = heat.engine.clients.os.neutron:NeutronClientPlugin + sahara = heat.engine.clients.os.sahara:SaharaClientPlugin + senlin = heat.engine.clients.os.senlin:SenlinClientPlugin swift = heat.engine.clients.os.swift:SwiftClientPlugin trove = heat.engine.clients.os.trove:TroveClientPlugin - sahara = heat.engine.clients.os.sahara:SaharaClientPlugin zaqar = heat.engine.clients.os.zaqar:ZaqarClientPlugin heat.constraints =