openstack
/
congress-tempest-plugin
Code Issues Proposed changes

Switch to Ceilometer tempest plugin 

Ceilometer has implemented their tests and all supported code
in tempest plugin and now tempest is going to remove all
Ceilometer tests and its supported interfaces from tempest-
I0775bcc15dc9cbae6e075fe92f44b5f6c9b9d5d2

This patch switch Congress Ceilometer tests to Ceilometer tempest plugin.

Change-Id: I4d75c8ad5ed9074ed33976ae5a85e48ef70f5554
This commit is contained in:
ghanshyam 2016-04-14 11:42:08 +09:00
parent 5a0b785cf4
commit 03eb74547e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/scenario/congress_datasources/test_ceilometer.py
View File

@ -14,7 +14,6 @@
# under the License.
from oslo_log import log as logging
from tempest import clients
from tempest import config
from tempest.lib import exceptions
from tempest import test
@ -31,15 +30,14 @@ class TestCeilometerDriver(manager_congress.ScenarioPolicyBase):
@classmethod
def skip_checks(cls):
super(TestCeilometerDriver, cls).skip_checks()
if not CONF.service_available.ceilometer:
if not getattr(CONF.service_available, 'ceilometer', False):
msg = ("%s skipped as ceilometer is not available" %
cls.__class__.__name__)
raise cls.skipException(msg)
def setUp(cls):
super(TestCeilometerDriver, cls).setUp()
cls.os = clients.Manager(cls.admin_manager.auth_provider.credentials)
cls.telemetry_client = cls.os.telemetry_client
cls.telemetry_client = cls.admin_manager.telemetry_client
cls.datasource_id = manager_congress.get_datasource_id(
cls.admin_manager.congress_client, 'ceilometer')

8
tests/scenario/manager_congress.py
View File

@ -55,6 +55,14 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
cls.admin_manager.congress_client = policy_client.PolicyClient(
auth_prov, "policy", CONF.identity.region)
if getattr(CONF.service_available, 'ceilometer', False):
import ceilometer.tests.tempest.service.client as telemetry_client
cls.admin_manager.telemetry_client = (
telemetry_client.TelemetryClient(
auth_prov, CONF.telemetry.catalog_type,
CONF.identity.region,
endpoint_type=CONF.telemetry.endpoint_type))
def _setup_network_and_servers(self):
self.security_group = (self._create_security_group
(tenant_id=self.tenant_id))