commit 403c2b60ecd90b7ec7e549585b222032cad7509d
author Jenkins <jenkins@review.openstack.org> Tue Jan 10 15:22:46 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 10 15:22:46 2017 +0000
tree a7756f7c4688482073797c7767fb28911b646e3d
parent ac132414a9e6903a3f06bbec7cc356da3f15a306
parent be6361774f35030b6dfbdc6f740ad8c95a91feed

Merge "tempest: Allow to not run deprecated API tests"

ceilometer/tests/tempest/api/base.py

diff --git a/ceilometer/tests/tempest/api/base.py b/ceilometer/tests/tempest/api/base.py
index 03e9acd..5239fb9 100644
--- a/ceilometer/tests/tempest/api/base.py
+++ b/ceilometer/tests/tempest/api/base.py
@@ -47,8 +47,9 @@
     @classmethod
     def skip_checks(cls):
         super(BaseTelemetryTest, cls).skip_checks()
-        if not CONF.service_available.ceilometer:
-            raise cls.skipException("Ceilometer support is required")
+        if (not CONF.service_available.ceilometer or
+                not CONF.telemetry.deprecated_api_enabled):
+            raise cls.skipException("Ceilometer API support is required")
 
     @classmethod
     def setup_credentials(cls):

ceilometer/tests/tempest/config.py

diff --git a/ceilometer/tests/tempest/config.py b/ceilometer/tests/tempest/config.py
index 6df0ff4..3749b97 100644
--- a/ceilometer/tests/tempest/config.py
+++ b/ceilometer/tests/tempest/config.py
@@ -36,4 +36,8 @@
     cfg.BoolOpt('event_enabled',
                 default=True,
                 help="Runs Ceilometer event-related tests"),
+    cfg.BoolOpt('deprecated_api_enabled',
+                default=True,
+                help="Runs Ceilometer deprecated API tests"),
+
 ]