3 files changed, 54 insertions, 106 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-fix-grouping-for-postgresql-databases.patch b/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-fix-grouping-for-postgresql-databases.patch
deleted file mode 100644
index 4472ad0..0000000
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-fix-grouping-for-postgresql-databases.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d64999f1eba3db1444f36214bf4be7b8eaffdcb1 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Mon, 7 Apr 2014 16:24:18 -0400
-Subject: [PATCH] sqlalchemy: fix grouping for postgresql databases
-
-To avoid horizon errors, and avoid the following query issue:
-
-   ProgrammingError: (ProgrammingError) column "meter.unit" must appear in the GROUP BY clause or be used in an aggregate function
-
-We need to add meter.unit as an explicit group_by attribute
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- ceilometer/storage/impl_sqlalchemy.py |   10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py
-index 0e5df7008c5e..697f51136c37 100644
---- a/ceilometer/storage/impl_sqlalchemy.py
-+++ b/ceilometer/storage/impl_sqlalchemy.py
-@@ -674,8 +674,15 @@ class Connection(base.Connection):
-             group_attributes = [getattr(models.Sample, g) for g in groupby]
-             select.extend(group_attributes)
- 
--        query = session.query(*select).filter(
--            models.Meter.id == models.Sample.meter_id)
-+        # Group by Meter.unit for postgresql queries
-+        # In mysql this doesn't change anything because one meter has one unit
-+
-+        # mysql:
-+        # query = session.query(*select).filter(
-+        #    models.Meter.id == models.Sample.meter_id)
-+        # postgres:
-+        query = session.query(*select).filter(
-+            models.Meter.id == models.Sample.meter_id).group_by(models.Meter.unit)
- 
-         if groupby:
-             query = query.group_by(*group_attributes)
--- 
-1.7.10.4
-
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer-builtin-tests-config-location.patch b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer-builtin-tests-config-location.patch
index e945735..abb435e 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer-builtin-tests-config-location.patch
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer-builtin-tests-config-location.patch
@@ -8,11 +8,11 @@ these configuration file using absolute path.
 
 Signed-off-by: Vu Tran <vu.tran@windriver.com>
 
-diff --git a/ceilometer/tests/agentbase.py b/ceilometer/tests/agentbase.py
-index 4784037..43b9d6c 100644
---- a/ceilometer/tests/agentbase.py
-+++ b/ceilometer/tests/agentbase.py
-@@ -236,7 +236,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
+Index: git/ceilometer/tests/agentbase.py
+===================================================================
+--- git.orig/ceilometer/tests/agentbase.py
++++ git/ceilometer/tests/agentbase.py
+@@ -234,7 +234,7 @@
          self.CONF = self.useFixture(config.Config()).conf
          self.CONF.set_override(
              'pipeline_cfg_file',
@@ -21,33 +21,24 @@ index 4784037..43b9d6c 100644
          )
          self.useFixture(mockpatch.PatchObject(
              publisher, 'get_publisher', side_effect=self.get_publisher))
-diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/api/__init__.py
-index eee701a..06c1ee4 100644
---- a/ceilometer/tests/api/__init__.py
-+++ b/ceilometer/tests/api/__init__.py
-@@ -41,7 +41,7 @@ class TestBase(db_test_base.TestBase):
-         self.CONF.set_override("auth_version",
-                                "v2.0", group=acl.OPT_GROUP_NAME)
-         self.CONF.set_override("policy_file",
--                               self.path_get('etc/ceilometer/policy.json'))
-+                               self.path_get('/etc/ceilometer/policy.json'))
-         sources_file = self.path_get('ceilometer/tests/sources.json')
-         self.app = v1_app.make_app(self.CONF,
-                                    enable_acl=False,
-@@ -87,7 +87,7 @@ class FunctionalTest(db_test_base.TestBase):
+Index: git/ceilometer/tests/api/__init__.py
+===================================================================
+--- git.orig/ceilometer/tests/api/__init__.py
++++ git/ceilometer/tests/api/__init__.py
+@@ -46,7 +46,7 @@
          self.CONF.set_override("auth_version", "v2.0",
-                                group=acl.OPT_GROUP_NAME)
+                                group=OPT_GROUP_NAME)
          self.CONF.set_override("policy_file",
 -                               self.path_get('etc/ceilometer/policy.json'))
 +                               self.path_get('/etc/ceilometer/policy.json'))
          self.app = self._make_app()
  
      def _make_app(self, enable_acl=False):
-diff --git a/ceilometer/tests/api/v2/test_app.py b/ceilometer/tests/api/v2/test_app.py
-index d6982b7..0b3ebcf 100644
---- a/ceilometer/tests/api/v2/test_app.py
-+++ b/ceilometer/tests/api/v2/test_app.py
-@@ -47,7 +47,7 @@ class TestApp(base.BaseTestCase):
+Index: git/ceilometer/tests/api/v2/test_app.py
+===================================================================
+--- git.orig/ceilometer/tests/api/v2/test_app.py
++++ git/ceilometer/tests/api/v2/test_app.py
+@@ -45,7 +45,7 @@
          self.CONF.set_override("auth_version", "v2.0",
                                 group=acl.OPT_GROUP_NAME)
          self.CONF.set_override("pipeline_cfg_file",
@@ -55,22 +46,22 @@ index d6982b7..0b3ebcf 100644
 +                               self.path_get("/etc/ceilometer/pipeline.yaml"))
          self.CONF.set_override('connection', "log://", group="database")
          self.CONF.set_override("auth_uri", None, group=acl.OPT_GROUP_NAME)
- 
-@@ -55,7 +55,7 @@ class TestApp(base.BaseTestCase):
-         self.assertTrue(api_app.auth_uri.startswith('foottp'))
+         file_name = self.path_get('etc/ceilometer/api_paste.ini')
+@@ -55,7 +55,7 @@
+         self.assertTrue(api_app.auth_uri.startswith('file'))
  
      def test_keystone_middleware_parse_conffile(self):
 -        pipeline_conf = self.path_get("etc/ceilometer/pipeline.yaml")
 +        pipeline_conf = self.path_get("/etc/ceilometer/pipeline.yaml")
-         content = "[DEFAULT]\n"\
-                   "pipeline_cfg_file = {0}\n"\
-                   "[{1}]\n"\
-diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py
-index d0e0e73..293e022 100644
---- a/ceilometer/tests/db.py
-+++ b/ceilometer/tests/db.py
-@@ -62,7 +62,7 @@ class TestBase(test_base.BaseTestCase):
-         # the system.
+         api_conf = self.path_get('etc/ceilometer/api_paste.ini')
+         content = ("[DEFAULT]\n"
+                    "rpc_backend = fake\n"
+Index: git/ceilometer/tests/db.py
+===================================================================
+--- git.orig/ceilometer/tests/db.py
++++ git/ceilometer/tests/db.py
+@@ -137,7 +137,7 @@
+         self.CONF.import_opt('pipeline_cfg_file', 'ceilometer.pipeline')
          self.CONF.set_override(
              'pipeline_cfg_file',
 -            self.path_get('etc/ceilometer/pipeline.yaml')
@@ -78,35 +69,35 @@ index d0e0e73..293e022 100644
          )
  
      def tearDown(self):
-diff --git a/ceilometer/tests/test_bin.py b/ceilometer/tests/test_bin.py
-index 0b9a556..649d603 100644
---- a/ceilometer/tests/test_bin.py
-+++ b/ceilometer/tests/test_bin.py
-@@ -76,7 +76,7 @@ class BinTestCase(base.BaseTestCase):
+Index: git/ceilometer/tests/test_bin.py
+===================================================================
+--- git.orig/ceilometer/tests/test_bin.py
++++ git/ceilometer/tests/test_bin.py
+@@ -79,7 +79,7 @@
  class BinSendSampleTestCase(base.BaseTestCase):
      def setUp(self):
          super(BinSendSampleTestCase, self).setUp()
 -        pipeline_cfg_file = self.path_get('etc/ceilometer/pipeline.yaml')
 +        pipeline_cfg_file = self.path_get('/etc/ceilometer/pipeline.yaml')
-         content = "[DEFAULT]\n"\
-                   "rpc_backend=ceilometer.openstack.common.rpc.impl_fake\n"\
-                   "pipeline_cfg_file={0}\n".format(pipeline_cfg_file)
-@@ -103,8 +103,8 @@ class BinApiTestCase(base.BaseTestCase):
-         super(BinApiTestCase, self).setUp()
+         content = ("[DEFAULT]\n"
+                    "rpc_backend=fake\n"
+                    "pipeline_cfg_file={0}\n".format(pipeline_cfg_file))
+@@ -116,8 +116,8 @@
+         # create ceilometer.conf file
          self.api_port = random.randint(10000, 11000)
          self.http = httplib2.Http()
 -        pipeline_cfg_file = self.path_get('etc/ceilometer/pipeline.yaml')
 -        policy_file = self.path_get('etc/ceilometer/policy.json')
 +        pipeline_cfg_file = self.path_get('/etc/ceilometer/pipeline.yaml')
 +        policy_file = self.path_get('/etc/ceilometer/policy.json')
-         content = "[DEFAULT]\n"\
-                   "rpc_backend=ceilometer.openstack.common.rpc.impl_fake\n"\
-                   "auth_strategy=noauth\n"\
-diff --git a/ceilometer/tests/test_decoupled_pipeline.py b/ceilometer/tests/test_decoupled_pipeline.py
-index 293adb3..33c0397 100644
---- a/ceilometer/tests/test_decoupled_pipeline.py
-+++ b/ceilometer/tests/test_decoupled_pipeline.py
-@@ -210,7 +210,7 @@ class TestDecoupledPipeline(pipeline_base.BasePipelineTestCase):
+         content = ("[DEFAULT]\n"
+                    "rpc_backend=fake\n"
+                    "auth_strategy=noauth\n"
+Index: git/ceilometer/tests/test_decoupled_pipeline.py
+===================================================================
+--- git.orig/ceilometer/tests/test_decoupled_pipeline.py
++++ git/ceilometer/tests/test_decoupled_pipeline.py
+@@ -209,7 +209,7 @@
  
      def _do_test_rate_of_change_in_boilerplate_pipeline_cfg(self, index,
                                                              meters, units):
@@ -115,11 +106,11 @@ index 293adb3..33c0397 100644
              data = fap.read()
          pipeline_cfg = yaml.safe_load(data)
          for s in pipeline_cfg['sinks']:
-diff --git a/ceilometer/tests/test_deprecated_pipeline.py b/ceilometer/tests/test_deprecated_pipeline.py
-index 606dcad..bbd15b4 100644
---- a/ceilometer/tests/test_deprecated_pipeline.py
-+++ b/ceilometer/tests/test_deprecated_pipeline.py
-@@ -76,7 +76,7 @@ class TestDeprecatedPipeline(pipeline_base.BasePipelineTestCase):
+Index: git/ceilometer/tests/test_deprecated_pipeline.py
+===================================================================
+--- git.orig/ceilometer/tests/test_deprecated_pipeline.py
++++ git/ceilometer/tests/test_deprecated_pipeline.py
+@@ -75,7 +75,7 @@
  
      def _do_test_rate_of_change_in_boilerplate_pipeline_cfg(self, index,
                                                              meters, units):
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index afa905c..4c94300 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -7,17 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "ceilometer"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://ceilometer.conf \
            file://ceilometer.init \
-           file://0001-sqlalchemy-fix-grouping-for-postgresql-databases.patch \
            file://fix_ceilometer_memory_leak.patch \
            file://ceilometer-builtin-tests-config-location.patch \
-           file://skip-failed-unsupported-db-ceilometer-builtin-tests.patch \
 "
 
-SRCREV="c8733b2bc1301bc8dd5119a630d855ace1c747bf"
-PV="2014.1+git${SRCPV}"
+SRCREV="d4baab8a135b88ccb673b8e6dd35386786b52281"
+PV="2014.2.b1+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 CEILOMETER_SECRET ?= "12121212"