x
/
ranger-agent
Code Issues Proposed changes

Port from python2: Specify exchange for Ranger-agent pods 

python2: https://review.opendev.org/#/c/693092/

Change-Id: Ia754aae4f2263d7ed0783f861c05212bb98f98b4
This commit is contained in:
Chi Lo 2019-11-13 15:24:31 -08:00
parent b0c32e7e47
commit 0aaed0f5bb
5 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ord/api/app.py
View File

@ -85,7 +85,9 @@ def setup_app(pecan_config=None, extra_hooks=None):
)
transport = messaging.get_rpc_transport(cfg.CONF)
target = messaging.Target(topic='ord-listener-q', server=cfg.CONF.host)
target = messaging.Target(topic='ord-listener-q',
exchange='ranger-agent',
server=cfg.CONF.host)
endpoints = [api.ListenerQueueHandler()]
server = messaging.get_rpc_server(transport,
target,

3
ord/client/rpcapi.py
View File

@ -25,7 +25,8 @@ class RpcAPI(object):
def __init__(self):
super(RpcAPI, self).__init__()
self.target = messaging.Target(topic='ord-notifier-q')
self.target = messaging.Target(topic='ord-notifier-q',
exchange='ranger-agent')
self.transport = messaging.get_rpc_transport(cfg.CONF)
self._client = messaging.RPCClient(self.transport, self.target)

3
ord/client/rpcengine.py
View File

@ -27,7 +27,8 @@ class RpcEngine(object):
def __init__(self):
super(RpcEngine, self).__init__()
try:
self.target = messaging.Target(topic='ord-listener-q')
self.target = messaging.Target(topic='ord-listener-q',
exchange='ranger-agent')
self.transport = messaging.get_rpc_transport(cfg.CONF)
self._client = messaging.RPCClient(self.transport, self.target)
except Exception as exception:

4
ord/engine/app.py
View File

@ -30,7 +30,9 @@ def start():
# start Notify message listener
transport = messaging.get_rpc_transport(cfg.CONF)
target = messaging.Target(topic='ord-notifier-q', server=cfg.CONF.host)
target = messaging.Target(topic='ord-notifier-q',
exchange='ranger-agent',
server=cfg.CONF.host)
endpoints = [QueueHandler(engine)]

20
ord/tests/unit/engine/test_healthcheck.py
View File

@ -56,21 +56,29 @@ class OrdEngineHealthcheckTestCase(base.BaseTestCase):
expected = {'database': 'failed', 'heat': 'unknown'}
self.assertEqual(status, expected)
@patch.object(heat.HeatClient, 'delete_stack',
side_effect=exc.HEATStackDeleteError())
@patch.object(heat, 'HeatClient')
@patch.object(db_api, 'retrieve_health_record', return_value={})
def test_execute_health_check_heat_success(self, mock_retrieve,
mock_delete):
mock_heat):
mock_delete = mock.MagicMock()
mock_delete.delete_stack.side_effect = exc.HEATStackDeleteError()
mock_heat.return_value = mock_delete
status = healthcheck.HealthCheck.execute_health_check()
expected = {'database': 'passed', 'heat': 'passed'}
self.assertEqual(status, expected)
@patch.object(heat.HeatClient, 'delete_stack',
side_effect=exc.HEATStackDeleteError('MessagingTimeout'))
@patch.object(heat, 'HeatClient')
@patch.object(db_api, 'retrieve_health_record', return_value={})
def test_execute_health_check_heat_failure(self, mock_retrieve,
mock_delete):
mock_heat):
mock_delete = mock.MagicMock()
mock_delete.delete_stack.side_effect = exc.HEATStackDeleteError(
'MessagingTimeout')
mock_heat.return_value = mock_delete
status = healthcheck.HealthCheck.execute_health_check()
expected = {'database': 'passed', 'heat': 'failed'}