summaryrefslogtreecommitdiff
path: root/ceilometerclient/v2/shell.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-11-28 00:20:24 +0000
committerGerrit Code Review <review@openstack.org>2013-11-28 00:20:24 +0000
commit2950b30089ab7f38b70a9dd6b40cf0823d4ade3a (patch)
tree3f81094961b2cf4016173fa83520387bace4f2b1 /ceilometerclient/v2/shell.py
parent181d913ca1415aa1ad28fb1e4ddbdd08b72a155f (diff)
parent08b476d2c9edeff7d025038467922f3d1cda6f19 (diff)
downloadpython-ceilometerclient-1.0.7.tar.gz
Merge "Allow alarm-threshold-update to upate generic attributes"1.0.7
Diffstat (limited to 'ceilometerclient/v2/shell.py')
-rw-r--r--ceilometerclient/v2/shell.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py
index 07fd8c1..a4cec33 100644
--- a/ceilometerclient/v2/shell.py
+++ b/ceilometerclient/v2/shell.py
@@ -438,7 +438,7 @@ def do_alarm_threshold_update(cc, args={}):
fields = utils.key_with_slash_to_nested_dict(fields)
fields.pop('alarm_id')
fields['type'] = 'threshold'
- if 'query' in fields['threshold_rule']:
+ if 'threshold_rule' in fields and 'query' in fields['threshold_rule']:
fields['threshold_rule']['query'] = options.cli_to_array(
fields['threshold_rule']['query'])
try: