From 2ec87b059ed40fbf0e0532d910f5091f3c081a9b Mon Sep 17 00:00:00 2001 From: Dina Belova Date: Tue, 24 Jun 2014 13:33:33 +0400 Subject: [PATCH] Fix HBase available capabilities list Alarms were not presented in the capabilities list, although this functionality was already implemented. Fixed doc as well. Change-Id: I3785736455f1f9f548f4c7c06928d6f6cf7d6bc1 Closes-bug: #1333610 --- ceilometer/storage/impl_hbase.py | 4 ++++ ceilometer/tests/storage/test_impl_hbase.py | 4 ++-- doc/source/install/dbreco.rst | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ceilometer/storage/impl_hbase.py b/ceilometer/storage/impl_hbase.py index d620630a3..c56dd7dcd 100644 --- a/ceilometer/storage/impl_hbase.py +++ b/ceilometer/storage/impl_hbase.py @@ -46,6 +46,10 @@ AVAILABLE_CAPABILITIES = { 'metadata': True}, 'aggregation': {'standard': True}}, 'events': {'query': {'simple': True}}, + 'alarms': {'query': {'simple': True, + 'complex': False}, + 'history': {'query': {'simple': True, + 'complex': False}}}, } diff --git a/ceilometer/tests/storage/test_impl_hbase.py b/ceilometer/tests/storage/test_impl_hbase.py index 3dbf74535..2f42a3bc5 100644 --- a/ceilometer/tests/storage/test_impl_hbase.py +++ b/ceilometer/tests/storage/test_impl_hbase.py @@ -90,9 +90,9 @@ class CapabilitiesTest(test_base.BaseTestCase): 'stddev': False, 'cardinality': False}} }, - 'alarms': {'query': {'simple': False, + 'alarms': {'query': {'simple': True, 'complex': False}, - 'history': {'query': {'simple': False, + 'history': {'query': {'simple': True, 'complex': False}}}, 'events': {'query': {'simple': True}}, } diff --git a/doc/source/install/dbreco.rst b/doc/source/install/dbreco.rst index 6c3f28e79..d0ba56ed4 100644 --- a/doc/source/install/dbreco.rst +++ b/doc/source/install/dbreco.rst @@ -47,6 +47,6 @@ Driver API querying API statistics Alarms MongoDB Yes Yes Yes MySQL Yes Yes Yes PostgreSQL Yes Yes Yes -HBase Yes Yes, except groupby No +HBase Yes Yes, except groupby Yes DB2 Yes Yes No ================== ============================= =================== ======