2a2e2dd273
split_by_op was returning data against which further error checking was then required. This change moves that error handling inside the method and simplifies the regular expression so that it splits (greedily) on the first operator it finds. If the split is not possible, it is a ValueError. If the field or value are empty, that is a ValueError. Both split_by_op and split_by_datatype were doing a findall() where a match() and split() do the right job and more efficiently. Regular expression compilation has been moved to the module level to insure they need only be compiled once. Operator keys must be sorted by length to ensure the point at which the split happens is most greedy. Using a split keeps the regex short and removes any statements about the left and right hand sides of the operator. Tests added to cover the method more completely, including testing for corner cases such as single character field or values or operators showing up in unexpected locations. 'string' variable renamed to 'query' and 'query_value' to avoid confusion. Named parameters on string substitution for clarity. Note that the tests which do self.assertRaises could more explicitly check the exception with self.assertRaisesRegexp but that would break compatibility with Python 2.6. Change-Id: Icd815ff65aba9eae3f76afee3bb33e85d85bea72 Closes-Bug: #1314544
241 lines
9.4 KiB
Python
241 lines
9.4 KiB
Python
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from ceilometerclient.tests import utils
|
|
from ceilometerclient.v2 import options
|
|
|
|
|
|
class BuildUrlTest(utils.BaseTestCase):
|
|
|
|
def test_one(self):
|
|
url = options.build_url('/', [{'field': 'this',
|
|
'op': 'gt',
|
|
'value': 43}])
|
|
self.assertEqual(url, '/?q.field=this&q.op=gt&q.type=&q.value=43')
|
|
|
|
def test_two(self):
|
|
url = options.build_url('/', [{'field': 'this',
|
|
'op': 'gt',
|
|
'value': 43},
|
|
{'field': 'that',
|
|
'op': 'lt',
|
|
'value': 88}])
|
|
ops = 'q.op=gt&q.op=lt'
|
|
vals = 'q.value=43&q.value=88'
|
|
types = 'q.type=&q.type='
|
|
fields = 'q.field=this&q.field=that'
|
|
self.assertEqual(url, '/?%s&%s&%s&%s' % (fields, ops, types, vals))
|
|
|
|
def test_default_op(self):
|
|
url = options.build_url('/', [{'field': 'this',
|
|
'value': 43}])
|
|
self.assertEqual(url, '/?q.field=this&q.op=&q.type=&q.value=43')
|
|
|
|
def test_one_param(self):
|
|
url = options.build_url('/', None, ['period=60'])
|
|
self.assertEqual(url, '/?period=60')
|
|
|
|
def test_two_params(self):
|
|
url = options.build_url('/', None, ['period=60',
|
|
'others=value'])
|
|
self.assertEqual(url, '/?period=60&others=value')
|
|
|
|
def test_with_data_type(self):
|
|
url = options.build_url('/', [{'field': 'f1',
|
|
'value': '10',
|
|
'type': 'integer'}])
|
|
|
|
self.assertEqual('/?q.field=f1&q.op=&q.type=integer&q.value=10', url)
|
|
|
|
|
|
class CliTest(utils.BaseTestCase):
|
|
|
|
def test_one(self):
|
|
ar = options.cli_to_array('this<=34')
|
|
self.assertEqual(ar, [{'field': 'this', 'op': 'le',
|
|
'value': '34', 'type': ''}])
|
|
|
|
def test_two(self):
|
|
ar = options.cli_to_array('this<=34;that!=foo')
|
|
self.assertEqual(ar, [{'field': 'this', 'op': 'le',
|
|
'value': '34', 'type': ''},
|
|
{'field': 'that', 'op': 'ne',
|
|
'value': 'foo', 'type': ''}])
|
|
|
|
def test_negative(self):
|
|
ar = options.cli_to_array('this>=-783')
|
|
self.assertEqual(ar, [{'field': 'this', 'op': 'ge',
|
|
'value': '-783', 'type': ''}])
|
|
|
|
def test_float(self):
|
|
ar = options.cli_to_array('this<=283.347')
|
|
self.assertEqual(ar, [{'field': 'this',
|
|
'op': 'le', 'value': '283.347',
|
|
'type': ''}])
|
|
|
|
def test_comma(self):
|
|
ar = options.cli_to_array('this=2.4,fooo=doof')
|
|
self.assertEqual([{'field': 'this',
|
|
'op': 'eq',
|
|
'value': '2.4,fooo=doof',
|
|
'type': ''}],
|
|
ar)
|
|
|
|
def test_special_character(self):
|
|
ar = options.cli_to_array('key~123=value!123')
|
|
self.assertEqual([{'field': 'key~123',
|
|
'op': 'eq',
|
|
'value': 'value!123',
|
|
'type': ''}],
|
|
ar)
|
|
|
|
def _do_test_typed_float_op(self, op, op_str):
|
|
ar = options.cli_to_array('that%sfloat::283.347' % op)
|
|
self.assertEqual([{'field': 'that',
|
|
'type': 'float',
|
|
'value': '283.347',
|
|
'op': op_str}],
|
|
ar)
|
|
|
|
def test_typed_float_eq(self):
|
|
self._do_test_typed_float_op('<', 'lt')
|
|
|
|
def test_typed_float_le(self):
|
|
self._do_test_typed_float_op('<=', 'le')
|
|
|
|
def test_typed_string_whitespace(self):
|
|
ar = options.cli_to_array('state=string::insufficient data')
|
|
self.assertEqual([{'field': 'state',
|
|
'op': 'eq',
|
|
'type': 'string',
|
|
'value': 'insufficient data'}],
|
|
ar)
|
|
|
|
def test_typed_string_whitespace_complex(self):
|
|
ar = options.cli_to_array(
|
|
'that>=float::99.9999;state=string::insufficient data'
|
|
)
|
|
self.assertEqual([{'field': 'that',
|
|
'op': 'ge',
|
|
'type': 'float',
|
|
'value': '99.9999'},
|
|
{'field': 'state',
|
|
'op': 'eq',
|
|
'type': 'string',
|
|
'value': 'insufficient data'}],
|
|
ar)
|
|
|
|
def test_invalid_operator(self):
|
|
self.assertRaises(ValueError, options.cli_to_array,
|
|
'this=2.4;fooo-doof')
|
|
|
|
def test_with_dot(self):
|
|
ar = options.cli_to_array('metadata.this<=34')
|
|
self.assertEqual(ar, [{'field': 'metadata.this',
|
|
'op': 'le', 'value': '34',
|
|
'type': ''}])
|
|
|
|
def test_single_char_field_or_value(self):
|
|
ar = options.cli_to_array('m<=34;large.thing>s;x!=y')
|
|
self.assertEqual([{'field': 'm',
|
|
'op': 'le',
|
|
'value': '34',
|
|
'type': ''},
|
|
{'field': 'large.thing',
|
|
'op': 'gt',
|
|
'value': 's',
|
|
'type': ''},
|
|
{'field': 'x',
|
|
'op': 'ne',
|
|
'value': 'y',
|
|
'type': ''}],
|
|
ar)
|
|
|
|
def test_without_data_type(self):
|
|
ar = options.cli_to_array('hostname=localhost')
|
|
self.assertEqual(ar, [{'field': 'hostname',
|
|
'op': 'eq',
|
|
'value': 'localhost',
|
|
'type': ''}])
|
|
|
|
def test_with_string_data_type(self):
|
|
ar = options.cli_to_array('hostname=string::localhost')
|
|
self.assertEqual(ar, [{'field': 'hostname',
|
|
'op': 'eq',
|
|
'type': 'string',
|
|
'value': 'localhost'}])
|
|
|
|
def test_with_int_data_type(self):
|
|
ar = options.cli_to_array('port=integer::1234')
|
|
self.assertEqual(ar, [{'field': 'port',
|
|
'op': 'eq',
|
|
'type': 'integer',
|
|
'value': '1234'}])
|
|
|
|
def test_with_bool_data_type(self):
|
|
ar = options.cli_to_array('port=boolean::true')
|
|
self.assertEqual(ar, [{'field': 'port',
|
|
'op': 'eq',
|
|
'type': 'boolean',
|
|
'value': 'true'}])
|
|
|
|
def test_with_float_data_type(self):
|
|
ar = options.cli_to_array('average=float::1234.5678')
|
|
self.assertEqual(ar, [{'field': 'average',
|
|
'op': 'eq',
|
|
'type': 'float',
|
|
'value': '1234.5678'}])
|
|
|
|
def test_with_datetime_data_type(self):
|
|
ar = options.cli_to_array('timestamp=datetime::sometimestamp')
|
|
self.assertEqual(ar, [{'field': 'timestamp',
|
|
'op': 'eq',
|
|
'type': 'datetime',
|
|
'value': 'sometimestamp'}])
|
|
|
|
def test_with_incorrect_type(self):
|
|
ar = options.cli_to_array('timestamp=invalid::sometimestamp')
|
|
self.assertEqual(ar, [{'field': 'timestamp',
|
|
'op': 'eq',
|
|
'type': '',
|
|
'value': 'invalid::sometimestamp'}])
|
|
|
|
def test_with_single_colon(self):
|
|
ar = options.cli_to_array('timestamp=datetime:sometimestamp')
|
|
self.assertEqual(ar, [{'field': 'timestamp',
|
|
'op': 'eq',
|
|
'type': '',
|
|
'value': 'datetime:sometimestamp'}])
|
|
|
|
def test_missing_key(self):
|
|
self.assertRaises(ValueError, options.cli_to_array,
|
|
'average=float::1234.0;>=string::hello')
|
|
|
|
def test_missing_value(self):
|
|
self.assertRaises(ValueError, options.cli_to_array,
|
|
'average=float::1234.0;house>=')
|
|
|
|
def test_timestamp_value(self):
|
|
ar = options.cli_to_array(
|
|
'project=cow;timestamp>=datetime::2014-03-11T16:02:58'
|
|
)
|
|
self.assertEqual([{'field': 'project',
|
|
'op': 'eq',
|
|
'type': '',
|
|
'value': 'cow'},
|
|
{'field': 'timestamp',
|
|
'op': 'ge',
|
|
'type': 'datetime',
|
|
'value': '2014-03-11T16:02:58'}],
|
|
ar)
|