openstack
/
ceilometer
Code Issues Proposed changes

Merge "Improve the timestamp validation of ceilometer API"

This commit is contained in:
Jenkins 2014-09-16 14:51:30 +00:00 committed by Gerrit Code Review
parent 62575e463a 6c7954ee9d
commit 85b859f42f
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ceilometer/api/controllers/v2.py
View File

@ -593,8 +593,8 @@ def _get_query_timestamps(args=None):
query_end: Final timestamp to use for query
end_timestamp: end_timestamp parameter from request
search_offset: search_offset parameter from request
"""
if args is None:
return {'query_start': None,
'query_end': None,
@ -603,23 +603,25 @@ def _get_query_timestamps(args=None):
'search_offset': 0}
search_offset = int(args.get('search_offset', 0))
def _parse_timestamp(timestamp):
if not timestamp:
return None
try:
iso_timestamp = timeutils.parse_isotime(timestamp)
iso_timestamp = iso_timestamp.replace(tzinfo=None)
except ValueError:
raise wsme.exc.InvalidInput('timestamp', timestamp,
'invalid timestamp format')
return iso_timestamp
start_timestamp = args.get('start_timestamp')
if start_timestamp:
start_timestamp = timeutils.parse_isotime(start_timestamp)
start_timestamp = start_timestamp.replace(tzinfo=None)
query_start = (start_timestamp -
datetime.timedelta(minutes=search_offset))
else:
query_start = None
end_timestamp = args.get('end_timestamp')
if end_timestamp:
end_timestamp = timeutils.parse_isotime(end_timestamp)
end_timestamp = end_timestamp.replace(tzinfo=None)
query_end = end_timestamp + datetime.timedelta(minutes=search_offset)
else:
query_end = None
start_timestamp = _parse_timestamp(start_timestamp)
end_timestamp = _parse_timestamp(end_timestamp)
query_start = start_timestamp - datetime.timedelta(
minutes=search_offset) if start_timestamp else None
query_end = end_timestamp + datetime.timedelta(
minutes=search_offset) if end_timestamp else None
return {'query_start': query_start,
'query_end': query_end,
'start_timestamp': start_timestamp,

12
ceilometer/tests/api/v2/test_query.py
View File

@ -321,3 +321,15 @@ class TestQueryToKwArgs(tests_base.BaseTestCase):
storage.SampleFilter.__init__)
for o in ['user', 'project', 'resource']:
self.assertEqual('fake_%s_id' % o, kwargs.get(o))
def test_timestamp_validation(self):
q = [api.Query(field='timestamp',
op='le',
value='123')]
exc = self.assertRaises(
wsme.exc.InvalidInput,
api._query_to_kwargs, q, storage.SampleFilter.__init__)
expected_exc = wsme.exc.InvalidInput('timestamp', '123',
'invalid timestamp format')
self.assertEqual(str(expected_exc), str(exc))