openstack/python-aodhclient
Code Issues Proposed changes

Merge "improve threshold & event alarm query formatting"

Browse Source
This commit is contained in:
Jenkins 2016-05-30 08:10:26 +00:00 committed by Gerrit Code Review
commit e745247fab
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
aodhclient/tests/functional/test_alarm.py
View File

@ -387,6 +387,56 @@ class AodhClientTest(base.ClientTestBase):
self.assertNotIn(alarm_id,
[r['alarm_id'] for r in self.parser.listing(result)])
def _test_alarm_create_show_query(self, create_params, expected_lines):
def test(params):
result = self.aodh('alarm', params=params)
alarm = self.details_multiple(result)[0]
for key, value in six.iteritems(expected_lines):
self.assertEqual(value, alarm[key])
return alarm
alarm = test(create_params)
params = 'show %s' % alarm['alarm_id']
test(params)
self.aodh('alarm', params='delete %s' % alarm['alarm_id'])
def test_threshold_alarm_create_show_query(self):
params = ('create --type threshold --name alarm-multiple-query '
'-m cpu_util --threshold 90 --query "project_id=123;'
'resource_id=456"')
expected_lines = {
'query': 'project_id = 123 AND',
'': 'resource_id = 456'
}
self._test_alarm_create_show_query(params, expected_lines)
params = ('create --type threshold --name alarm-single-query '
'-m cpu_util --threshold 90 --query project_id=123')
expected_lines = {'query': 'project_id = 123'}
self._test_alarm_create_show_query(params, expected_lines)
params = ('create --type threshold --name alarm-no-query '
'-m cpu_util --threshold 90')
self._test_alarm_create_show_query(params, {'query': ''})
def test_event_alarm_create_show_query(self):
params = ('create --type event --name alarm-multiple-query '
'--query "traits.project_id=789;traits.resource_id=012"')
expected_lines = {
'query': 'traits.project_id = 789 AND',
'': 'traits.resource_id = 012',
}
self._test_alarm_create_show_query(params, expected_lines)
params = ('create --type event --name alarm-single-query '
'--query "traits.project_id=789"')
expected_lines = {'query': 'traits.project_id = 789'}
self._test_alarm_create_show_query(params, expected_lines)
params = 'create --type event --name alarm-no-query'
self._test_alarm_create_show_query(params, {'query': ''})
class AodhClientGnocchiRulesTest(base.ClientTestBase):

8
aodhclient/v2/alarm_cli.py
View File

@ -31,6 +31,7 @@ ALARM_TYPES = ['threshold', 'event', 'composite',
ALARM_STATES = ['ok', 'alarm', 'insufficient data']
ALARM_SEVERITY = ['low', 'moderate', 'critical']
ALARM_OPERATORS = ['lt', 'le', 'eq', 'ne', 'ge', 'gt']
ALARM_OP_MAP = dict(zip(ALARM_OPERATORS, ('<', '<=', '=', '!=', '>=', '>')))
STATISTICS = ['max', 'min', 'avg', 'sum', 'count']
ALARM_LIST_COLS = ['alarm_id', 'type', 'name', 'state', 'severity', 'enabled']
@ -86,6 +87,13 @@ def _format_alarm(alarm):
alarm["time_constraints"] = jsonutils.dumps(alarm["time_constraints"],
sort_keys=True,
indent=2)
# only works for threshold and event alarm
if isinstance(alarm.get('query'), list):
query_rows = []
for q in alarm['query']:
op = ALARM_OP_MAP.get(q['op'], q['op'])
query_rows.append('%s %s %s' % (q['field'], op, q['value']))
alarm['query'] = ' AND\n'.join(query_rows)
return alarm