openstack/deb-python-monascaclient
Code Issues Proposed changes

Merge "Fix dimension validation and help message for alarm count"

Browse Source
This commit is contained in:
Jenkins 2016-11-03 01:51:42 +00:00 committed by Gerrit Code Review
commit 89be3ee5e8
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
monascaclient/v2_0/shell.py
View File

@ -1087,12 +1087,13 @@ def do_alarm_definition_patch(mc, args):
help='The ID of the alarm definition.')
@utils.arg('--metric-name', metavar='<METRIC_NAME>',
help='Name of the metric.')
@utils.arg('--metric-dimensions', metavar='<KEY1=VALUE1,KEY2=VALUE2...>',
help='key value pair used to specify a metric dimension. '
'This can be specified multiple times, or once with parameters '
'separated by a comma. '
'Dimensions need quoting when they contain special chars [&,(,),{,},>,<] '
'that confuse the CLI parser.',
@utils.arg('--metric-dimensions', metavar='<KEY1=VALUE1,KEY2,KEY3=VALUE2...>',
help='key value pair used to specify a metric dimension or '
'just key to select all values of that dimension.'
'This can be specified multiple times, or once with parameters '
'separated by a comma. '
'Dimensions need quoting when they contain special chars [&,(,),{,},>,<] '
'that confuse the CLI parser.',
action='append')
@utils.arg('--state', metavar='<ALARM_STATE>',
help='ALARM_STATE is one of [UNDETERMINED, OK, ALARM].')
@ -1330,12 +1331,13 @@ def output_alarm_history(args, alarm_history):
help='The ID of the alarm definition.')
@utils.arg('--metric-name', metavar='<METRIC_NAME>',
help='Name of the metric.')
@utils.arg('--metric-dimensions', metavar='<KEY1=VALUE1,KEY2=VALUE2...>',
help='key value pair used to specify a metric dimension. '
'This can be specified multiple times, or once with parameters '
'separated by a comma. '
'Dimensions need quoting when they contain special chars [&,(,),{,},>,<] '
'that confuse the CLI parser.',
@utils.arg('--metric-dimensions', metavar='<KEY1=VALUE1,KEY2,KEY3=VALUE2...>',
help='key value pair used to specify a metric dimension or '
'just key to select all values of that dimension.'
'This can be specified multiple times, or once with parameters '
'separated by a comma. '
'Dimensions need quoting when they contain special chars [&,(,),{,},>,<] '
'that confuse the CLI parser.',
action='append')
@utils.arg('--state', metavar='<ALARM_STATE>',
help='ALARM_STATE is one of [UNDETERMINED, OK, ALARM].')
@ -1361,7 +1363,7 @@ def do_alarm_count(mc, args):
if args.metric_name:
fields['metric_name'] = args.metric_name
if args.metric_dimensions:
fields['metric_dimensions'] = utils.format_parameters(args.metric_dimensions)
fields['metric_dimensions'] = utils.format_dimensions_query(args.metric_dimensions)
if args.state:
if args.state.upper() not in state_types:
errmsg = ('Invalid state, not one of [' +