diff options
Diffstat (limited to 'ceilometerclient/v2/shell.py')
| -rw-r--r-- | ceilometerclient/v2/shell.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index b67d765..7b0e89e 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -231,7 +231,12 @@ def do_sample_create(cc, args={}): k, v = var[0], var[1] if v is not None: if k == 'resource_metadata': - fields[k] = json.loads(v) + try: + fields[k] = json.loads(v) + except ValueError: + msg = ('Invalid resource metadata, it should be a json' + ' string, like: \'{"foo":"bar"}\'') + raise exc.CommandError(msg) else: fields[arg_to_field_mapping.get(k, k)] = v sample = cc.samples.create(**fields) |