Merge "Move zaqar client into main tree"
This commit is contained in:
commit
6a28b484a0
|
@ -1 +0,0 @@
|
||||||
python-zaqarclient>=0.0.3
|
|
|
@ -24,10 +24,6 @@ packages =
|
||||||
data_files =
|
data_files =
|
||||||
lib/heat/zaqar = heat_zaqar/resources/*
|
lib/heat/zaqar = heat_zaqar/resources/*
|
||||||
|
|
||||||
[entry_points]
|
|
||||||
heat.clients =
|
|
||||||
zaqar = heat_zaqar.client:ZaqarClientPlugin
|
|
||||||
|
|
||||||
[global]
|
[global]
|
||||||
setup-hooks =
|
setup-hooks =
|
||||||
pbr.hooks.setup_hook
|
pbr.hooks.setup_hook
|
||||||
|
|
|
@ -17,22 +17,20 @@ from heat.common.i18n import _LE
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
try:
|
from zaqarclient.queues.v1 import client as zaqarclient
|
||||||
from zaqarclient.queues.v1 import client as zaqarclient
|
from zaqarclient.transport import errors as zaqar_errors
|
||||||
from zaqarclient.transport import errors as zaqar_errors
|
|
||||||
except ImportError:
|
|
||||||
zaqarclient = None
|
|
||||||
zaqar_errors = None
|
|
||||||
|
|
||||||
from heat.engine.clients import client_plugin
|
from heat.engine.clients import client_plugin
|
||||||
|
|
||||||
|
|
||||||
class ZaqarClientPlugin(client_plugin.ClientPlugin):
|
class ZaqarClientPlugin(client_plugin.ClientPlugin):
|
||||||
|
|
||||||
exception_module = zaqar_errors
|
exceptions_module = zaqar_errors
|
||||||
|
|
||||||
def _create(self):
|
def _create(self):
|
||||||
|
return self.create_for_tenant(self.context.tenant_id)
|
||||||
|
|
||||||
|
def create_for_tenant(self, tenant_id):
|
||||||
con = self.context
|
con = self.context
|
||||||
if self.auth_token is None:
|
if self.auth_token is None:
|
||||||
LOG.error(_LE("Zaqar connection failed, no auth_token!"))
|
LOG.error(_LE("Zaqar connection failed, no auth_token!"))
|
||||||
|
@ -41,7 +39,7 @@ class ZaqarClientPlugin(client_plugin.ClientPlugin):
|
||||||
opts = {
|
opts = {
|
||||||
'os_auth_token': con.auth_token,
|
'os_auth_token': con.auth_token,
|
||||||
'os_auth_url': con.auth_url,
|
'os_auth_url': con.auth_url,
|
||||||
'os_project_id': con.tenant,
|
'os_project_id': tenant_id,
|
||||||
'os_service_type': 'messaging',
|
'os_service_type': 'messaging',
|
||||||
}
|
}
|
||||||
auth_opts = {'backend': 'keystone',
|
auth_opts = {'backend': 'keystone',
|
||||||
|
@ -49,7 +47,7 @@ class ZaqarClientPlugin(client_plugin.ClientPlugin):
|
||||||
conf = {'auth_opts': auth_opts}
|
conf = {'auth_opts': auth_opts}
|
||||||
endpoint = self.url_for(service_type='messaging')
|
endpoint = self.url_for(service_type='messaging')
|
||||||
|
|
||||||
client = zaqarclient.Client(url=endpoint, conf=conf)
|
client = zaqarclient.Client(url=endpoint, conf=conf, version=1.1)
|
||||||
|
|
||||||
return client
|
return client
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
#
|
||||||
|
# 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 ZaqarClientPluginTests(common.HeatTestCase):
|
||||||
|
|
||||||
|
def test_create(self):
|
||||||
|
context = utils.dummy_context()
|
||||||
|
plugin = context.clients.client_plugin('zaqar')
|
||||||
|
client = plugin.client()
|
||||||
|
self.assertEqual('http://server.test:5000/v3', client.api_url)
|
||||||
|
self.assertEqual(1.1, client.api_version)
|
||||||
|
self.assertEqual('test_tenant_id',
|
||||||
|
client.conf['auth_opts']['options']['os_project_id'])
|
||||||
|
|
||||||
|
def test_create_for_tenant(self):
|
||||||
|
context = utils.dummy_context()
|
||||||
|
plugin = context.clients.client_plugin('zaqar')
|
||||||
|
client = plugin.create_for_tenant('other_tenant')
|
||||||
|
self.assertEqual('other_tenant',
|
||||||
|
client.conf['auth_opts']['options']['os_project_id'])
|
|
@ -39,6 +39,7 @@ python-novaclient>=2.22.0
|
||||||
python-saharaclient>=0.9.0
|
python-saharaclient>=0.9.0
|
||||||
python-swiftclient>=2.2.0
|
python-swiftclient>=2.2.0
|
||||||
python-troveclient>=1.0.7
|
python-troveclient>=1.0.7
|
||||||
|
python-zaqarclient>=0.0.3
|
||||||
PyYAML>=3.1.0
|
PyYAML>=3.1.0
|
||||||
qpid-python
|
qpid-python
|
||||||
requests>=2.5.2
|
requests>=2.5.2
|
||||||
|
|
|
@ -57,6 +57,7 @@ heat.clients =
|
||||||
swift = heat.engine.clients.os.swift:SwiftClientPlugin
|
swift = heat.engine.clients.os.swift:SwiftClientPlugin
|
||||||
trove = heat.engine.clients.os.trove:TroveClientPlugin
|
trove = heat.engine.clients.os.trove:TroveClientPlugin
|
||||||
sahara = heat.engine.clients.os.sahara:SaharaClientPlugin
|
sahara = heat.engine.clients.os.sahara:SaharaClientPlugin
|
||||||
|
zaqar = heat.engine.clients.os.zaqar:ZaqarClientPlugin
|
||||||
|
|
||||||
heat.constraints =
|
heat.constraints =
|
||||||
nova.flavor = heat.engine.clients.os.nova:FlavorConstraint
|
nova.flavor = heat.engine.clients.os.nova:FlavorConstraint
|
||||||
|
|
Loading…
Reference in New Issue