From e0e06b94256c3eddf1035b78b352982bc97852ba Mon Sep 17 00:00:00 2001
From: Ildiko Vancsa <ildiko.vancsa@ericsson.com>
Date: Fri, 3 Apr 2015 13:38:10 +0200
Subject: [PATCH] Remove 'samples:groupby' from the Capabilities list

The 'samples:groupby' field in capabilities does not mark a real
functionality, but can cause confusion, therefore it is removed
from that list. The example in the documentation was also updated.

Change-Id: Id902c3c7d55b5ca11bbc8b909b0b07f487887fc1
closes-Bug: #1440031
---
 ceilometer/api/controllers/v2/capabilities.py    | 1 -
 ceilometer/storage/base.py                       | 1 -
 ceilometer/storage/impl_sqlalchemy.py            | 1 -
 ceilometer/tests/storage/test_impl_db2.py        | 1 -
 ceilometer/tests/storage/test_impl_hbase.py      | 1 -
 ceilometer/tests/storage/test_impl_mongodb.py    | 1 -
 ceilometer/tests/storage/test_impl_sqlalchemy.py | 1 -
 7 files changed, 7 deletions(-)

diff --git a/ceilometer/api/controllers/v2/capabilities.py b/ceilometer/api/controllers/v2/capabilities.py
index 1f007422..9e696f63 100644
--- a/ceilometer/api/controllers/v2/capabilities.py
+++ b/ceilometer/api/controllers/v2/capabilities.py
@@ -59,7 +59,6 @@ class Capabilities(base.Base):
                                         'metadata': True,
                                         'complex': False}},
                 'samples': {'pagination': True,
-                            'groupby': True,
                             'query': {'simple': True,
                                       'metadata': True,
                                       'complex': True}},
diff --git a/ceilometer/storage/base.py b/ceilometer/storage/base.py
index 75af5ba8..93b4b423 100644
--- a/ceilometer/storage/base.py
+++ b/ceilometer/storage/base.py
@@ -145,7 +145,6 @@ class Connection(object):
                                 'metadata': False,
                                 'complex': False}},
         'samples': {'pagination': False,
-                    'groupby': False,
                     'query': {'simple': False,
                               'metadata': False,
                               'complex': False}},
diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py
index 8c507b74..b29deda3 100644
--- a/ceilometer/storage/impl_sqlalchemy.py
+++ b/ceilometer/storage/impl_sqlalchemy.py
@@ -73,7 +73,6 @@ AVAILABLE_CAPABILITIES = {
     'resources': {'query': {'simple': True,
                             'metadata': True}},
     'samples': {'pagination': True,
-                'groupby': True,
                 'query': {'simple': True,
                           'metadata': True,
                           'complex': True}},
diff --git a/ceilometer/tests/storage/test_impl_db2.py b/ceilometer/tests/storage/test_impl_db2.py
index a35f04ac..2f8db2fb 100644
--- a/ceilometer/tests/storage/test_impl_db2.py
+++ b/ceilometer/tests/storage/test_impl_db2.py
@@ -50,7 +50,6 @@ class CapabilitiesTest(test_base.BaseTestCase):
                                     'metadata': True,
                                     'complex': False}},
             'samples': {'pagination': False,
-                        'groupby': False,
                         'query': {'simple': True,
                                   'metadata': True,
                                   'complex': True}},
diff --git a/ceilometer/tests/storage/test_impl_hbase.py b/ceilometer/tests/storage/test_impl_hbase.py
index 80327b98..bd097e3f 100644
--- a/ceilometer/tests/storage/test_impl_hbase.py
+++ b/ceilometer/tests/storage/test_impl_hbase.py
@@ -66,7 +66,6 @@ class CapabilitiesTest(test_base.BaseTestCase):
                                     'metadata': True,
                                     'complex': False}},
             'samples': {'pagination': False,
-                        'groupby': False,
                         'query': {'simple': True,
                                   'metadata': True,
                                   'complex': False}},
diff --git a/ceilometer/tests/storage/test_impl_mongodb.py b/ceilometer/tests/storage/test_impl_mongodb.py
index 818423fb..ffa09924 100644
--- a/ceilometer/tests/storage/test_impl_mongodb.py
+++ b/ceilometer/tests/storage/test_impl_mongodb.py
@@ -178,7 +178,6 @@ class CapabilitiesTest(test_base.BaseTestCase):
                                     'metadata': True,
                                     'complex': False}},
             'samples': {'pagination': False,
-                        'groupby': False,
                         'query': {'simple': True,
                                   'metadata': True,
                                   'complex': True}},
diff --git a/ceilometer/tests/storage/test_impl_sqlalchemy.py b/ceilometer/tests/storage/test_impl_sqlalchemy.py
index 8d3823f6..71259e43 100644
--- a/ceilometer/tests/storage/test_impl_sqlalchemy.py
+++ b/ceilometer/tests/storage/test_impl_sqlalchemy.py
@@ -161,7 +161,6 @@ class CapabilitiesTest(test_base.BaseTestCase):
                                     'metadata': True,
                                     'complex': False}},
             'samples': {'pagination': True,
-                        'groupby': True,
                         'query': {'simple': True,
                                   'metadata': True,
                                   'complex': True}},