openstack
/
ceilometer
Code Issues Proposed changes

Merge "apply limit constraint on storage base interface"

This commit is contained in:
Jenkins 2015-09-17 16:02:12 +00:00 committed by Gerrit Code Review
parent e4189bf41d 5c17ff6470
commit d909342cfc
7 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometer/api/controllers/v2/meters.py
View File

@ -491,11 +491,8 @@ class MetersController(rest.RestController):
# Timestamp field is not supported for Meter queries
limit = v2_utils.enforce_limit(limit)
kwargs = v2_utils.query_to_kwargs(
q, pecan.request.storage_conn.get_meters, allow_timestamps=False)
if 'limit' in kwargs:
raise base.ClientSideError(_(
"Limit is not a valid field for queries, "
"use 'limit' parameter."))
q, pecan.request.storage_conn.get_meters,
['limit'], allow_timestamps=False)
return [Meter.from_db_model(m)
for m in pecan.request.storage_conn.get_meters(limit=limit,
**kwargs)]

6
ceilometer/api/controllers/v2/resources.py
View File

@ -142,11 +142,7 @@ class ResourcesController(rest.RestController):
q = q or []
limit = utils.enforce_limit(limit)
kwargs = utils.query_to_kwargs(
q, pecan.request.storage_conn.get_resources)
if 'limit' in kwargs:
raise base.ClientSideError(_(
"Limit is not a valid field for queries, "
"use 'limit' parameter."))
q, pecan.request.storage_conn.get_resources, ['limit'])
resources = [
Resource.from_db_and_links(r,
self._resource_links(r.resource_id,

6
ceilometer/storage/base.py
View File

@ -176,7 +176,7 @@ class Connection(object):
def get_resources(user=None, project=None, source=None,
start_timestamp=None, start_timestamp_op=None,
end_timestamp=None, end_timestamp_op=None,
metaquery=None, resource=None):
metaquery=None, resource=None, limit=None):
"""Return an iterable of models.Resource instances.
Iterable items containing resource information.
@ -189,12 +189,13 @@ class Connection(object):
:param end_timestamp_op: Optional timestamp end range operation.
:param metaquery: Optional dict with metadata to match on.
:param resource: Optional resource filter.
:param limit: Maximum number of results to return.
"""
raise ceilometer.NotImplementedError('Resources not implemented')
@staticmethod
def get_meters(user=None, project=None, resource=None, source=None,
metaquery=None):
metaquery=None, limit=None):
"""Return an iterable of model.Meter instances.
Iterable items containing meter information.
@ -203,6 +204,7 @@ class Connection(object):
:param resource: Optional resource filter.
:param source: Optional source filter.
:param metaquery: Optional dict with metadata to match on.
:param limit: Maximum number of results to return.
"""
raise ceilometer.NotImplementedError('Meters not implemented')

5
ceilometer/storage/impl_log.py
View File

@ -55,7 +55,7 @@ class Connection(base.Connection):
def get_resources(self, user=None, project=None, source=None,
start_timestamp=None, start_timestamp_op=None,
end_timestamp=None, end_timestamp_op=None,
metaquery=None, resource=None):
metaquery=None, resource=None, limit=None):
"""Return an iterable of dictionaries containing resource information.
{ 'resource_id': UUID of the resource,
@ -75,6 +75,7 @@ class Connection(base.Connection):
:param end_timestamp_op: Optional end time operator, like lt, le.
:param metaquery: Optional dict with metadata to match on.
:param resource: Optional resource filter.
:param limit: Maximum number of results to return.
"""
return []
@ -98,7 +99,7 @@ class Connection(base.Connection):
"""
return []
def get_samples(self, sample_filter):
def get_samples(self, sample_filter, limit=None):
"""Return an iterable of samples.
Items are created by

4
ceilometer/tests/functional/gabbi/gabbits/meters.yaml
View File

@ -374,10 +374,10 @@ tests:
url: /v2/meters?q.field=limit&q.op=eq&q.type=&q.value=1
status: 400
response_strings:
- Limit is not a valid field for queries,
- 'Unknown argument: \"limit\": unrecognized field in query'
- name: get meters filter limit and limit
url: /v2/meters?q.field=limit&q.op=eq&q.type=&q.value=1&limit=1
status: 400
response_strings:
- Limit is not a valid field for queries,
- 'Unknown argument: \"limit\": unrecognized field in query'

4
ceilometer/tests/functional/gabbi/gabbits/resources-fixtured.yaml
View File

@ -77,10 +77,10 @@ tests:
url: /v2/resources?q.field=limit&q.op=eq&q.type=&q.value=1
status: 400
response_strings:
- Limit is not a valid field for queries,
- 'Unknown argument: \"limit\": unrecognized field in query'
- name: get resources filter limit and limit
url: /v2/resources?q.field=limit&q.op=eq&q.type=&q.value=1&limit=1
status: 400
response_strings:
- Limit is not a valid field for queries,
- 'Unknown argument: \"limit\": unrecognized field in query'

6
ceilometer/tests/unit/api/v2/test_query.py
View File

@ -380,7 +380,8 @@ class TestQueryToKwArgs(tests_base.BaseTestCase):
value='abc')]
exc = self.assertRaises(
wsme.exc.UnknownArgument,
utils.query_to_kwargs, q, storage_base.Connection.get_meters)
utils.query_to_kwargs,
q, storage_base.Connection.get_meters, ['limit'])
valid_keys = ['project', 'resource', 'source', 'user']
msg = ("unrecognized field in query: %s, "
"valid keys: %s") % (q, valid_keys)
@ -393,7 +394,8 @@ class TestQueryToKwArgs(tests_base.BaseTestCase):
value='abc')]
exc = self.assertRaises(
wsme.exc.UnknownArgument,
utils.query_to_kwargs, q, storage_base.Connection.get_resources)
utils.query_to_kwargs,
q, storage_base.Connection.get_resources, ['limit'])
valid_keys = ['project', 'resource',
'search_offset', 'source', 'timestamp', 'user']
msg = ("unrecognized field in query: %s, "