openstack
/
ceilometer
Code Issues Proposed changes

remove complex capabilities for meter, resource and statistics 

complex query functionalities for those there APIs are never exist
or plan to do so, leave it in capabilities is misleading to end user,
because they never can be True for any back end storage.

Change-Id: Ie1f640abe4970a0e6ea6fe076961855c9dca66e5
APIImpact: /v2/capabilities response removes some never used fields
This commit is contained in:
ZhiQiang Fan 2016-04-03 05:32:59 +08:00
parent 6a0f84dcbb
commit 7a4eca2cfb
5 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ceilometer/api/controllers/v2/capabilities.py
View File

@ -49,18 +49,15 @@ class Capabilities(base.Base):
return cls(
api=_flatten_capabilities({
'meters': {'query': {'simple': True,
'metadata': True,
'complex': False}},
'metadata': True}},
'resources': {'query': {'simple': True,
'metadata': True,
'complex': False}},
'metadata': True}},
'samples': {'query': {'simple': True,
'metadata': True,
'complex': True}},
'statistics': {'groupby': True,
'query': {'simple': True,
'metadata': True,
'complex': False},
'metadata': True},
'aggregation': {'standard': True,
'selectable': {
'max': True,

9
ceilometer/storage/base.py
View File

@ -113,18 +113,15 @@ class Connection(object):
# A dictionary representing the capabilities of this driver.
CAPABILITIES = {
'meters': {'query': {'simple': False,
'metadata': False,
'complex': False}},
'metadata': False}},
'resources': {'query': {'simple': False,
'metadata': False,
'complex': False}},
'metadata': False}},
'samples': {'query': {'simple': False,
'metadata': False,
'complex': False}},
'statistics': {'groupby': False,
'query': {'simple': False,
'metadata': False,
'complex': False},
'metadata': False},
'aggregation': {'standard': False,
'selectable': {
'max': False,

9
ceilometer/tests/functional/storage/test_impl_hbase.py
View File

@ -63,18 +63,15 @@ class CapabilitiesTest(test_base.BaseTestCase):
def test_capabilities(self):
expected_capabilities = {
'meters': {'query': {'simple': True,
'metadata': True,
'complex': False}},
'metadata': True}},
'resources': {'query': {'simple': True,
'metadata': True,
'complex': False}},
'metadata': True}},
'samples': {'query': {'simple': True,
'metadata': True,
'complex': False}},
'statistics': {'groupby': False,
'query': {'simple': True,
'metadata': True,
'complex': False},
'metadata': True},
'aggregation': {'standard': True,
'selectable': {
'max': False,

9
ceilometer/tests/functional/storage/test_impl_mongodb.py
View File

@ -93,18 +93,15 @@ class CapabilitiesTest(test_base.BaseTestCase):
def test_capabilities(self):
expected_capabilities = {
'meters': {'query': {'simple': True,
'metadata': True,
'complex': False}},
'metadata': True}},
'resources': {'query': {'simple': True,
'metadata': True,
'complex': False}},
'metadata': True}},
'samples': {'query': {'simple': True,
'metadata': True,
'complex': True}},
'statistics': {'groupby': True,
'query': {'simple': True,
'metadata': True,
'complex': False},
'metadata': True},
'aggregation': {'standard': True,
'selectable': {
'max': True,

9
ceilometer/tests/functional/storage/test_impl_sqlalchemy.py
View File

@ -151,18 +151,15 @@ class CapabilitiesTest(test_base.BaseTestCase):
def test_capabilities(self):
expected_capabilities = {
'meters': {'query': {'simple': True,
'metadata': True,
'complex': False}},
'metadata': True}},
'resources': {'query': {'simple': True,
'metadata': True,
'complex': False}},
'metadata': True}},
'samples': {'query': {'simple': True,
'metadata': True,
'complex': True}},
'statistics': {'groupby': True,
'query': {'simple': True,
'metadata': True,
'complex': False},
'metadata': True},
'aggregation': {'standard': True,
'selectable': {
'max': True,