From 1f12c62301a57b753bd5c3a1f5181f0f754225cf Mon Sep 17 00:00:00 2001 From: Rohit Jaiswal Date: Tue, 16 Jun 2015 19:45:50 +0000 Subject: Removes whitespace from CLI queries Strips leading and trailing whitespaces from CLI query field and value parameter before building url. Closes-Bug: 1464694 Change-Id: Ibe99747e22afe05eee187d59aaf0603f58e91373 --- ceilometerclient/tests/unit/v2/test_options.py | 14 ++++++++++++++ ceilometerclient/v2/options.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ceilometerclient/tests/unit/v2/test_options.py b/ceilometerclient/tests/unit/v2/test_options.py index 1a9ec24..8de17d4 100644 --- a/ceilometerclient/tests/unit/v2/test_options.py +++ b/ceilometerclient/tests/unit/v2/test_options.py @@ -237,3 +237,17 @@ class CliTest(utils.BaseTestCase): 'type': 'datetime', 'value': '2014-03-11T16:02:58'}], ar) + + def test_with_whitespace(self): + ar = options.cli_to_array('start_timestamp= 2015-01-01T00:00:00;' + ' end_timestamp =2015-06-20T14:01:59 ') + + self.assertEqual([{'field': 'start_timestamp', + 'op': 'eq', + 'type': '', + 'value': '2015-01-01T00:00:00'}, + {'field': 'end_timestamp', + 'op': 'eq', + 'type': '', + 'value': '2015-06-20T14:01:59'}], + ar) diff --git a/ceilometerclient/v2/options.py b/ceilometerclient/v2/options.py index bf80ce5..b586542 100644 --- a/ceilometerclient/v2/options.py +++ b/ceilometerclient/v2/options.py @@ -99,7 +99,7 @@ def cli_to_array(cli_query): if not len(value): _value_error('value') - return field, operator, value + return field.strip(), operator, value.strip() def split_by_data_type(query_value): frags = DATA_TYPE_RE.match(query_value) -- cgit v1.2.1