openstack
/
congress-tempest-plugin
Code Issues Proposed changes

Fix test mocking and disable ceilometer tempest test 

In response to this change:
7e185ad96b (diff-38dac991635941a0cc209c729f58298e)

And this change removal of ceilometer v2 API
https://review.openstack.org/#/c/512286/

Change-Id: Ie806b1a6bd731af656e0610372cac083c4ee82a9
This commit is contained in:
Eric Kao 2017-10-25 14:18:41 -07:00
parent d45df6cedd
commit 3cd5ec897d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/scenario/congress_datasources/test_ceilometer.py → tests/scenario/congress_datasources/_disabled_test_ceilometer.py
View File

18
tests/scenario/manager_congress.py
View File

@ -65,14 +65,16 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
cls.os_admin.qos_rule_client = qos_rule_client.QosRuleClient(
auth_prov, "network", CONF.identity.region)
# Get telemtery_client
if getattr(CONF.service_available, 'ceilometer', False):
import ceilometer.tests.tempest.service.client as telemetry_client
cls.os_admin.telemetry_client = (
telemetry_client.TelemetryClient(
auth_prov,
CONF.telemetry.catalog_type, CONF.identity.region,
endpoint_type=CONF.telemetry.endpoint_type))
# FIXME(ekcs): disabled right now because the required client has been
# removed from ceilometer repo along with the v2 API
# # Get telemtery_client
# if getattr(CONF.service_available, 'ceilometer', False):
# import ceilometer.tests.tempest.service.client as telemetry_client
# cls.os_admin.telemetry_client = (
# telemetry_client.TelemetryClient(
# auth_prov,
# CONF.telemetry.catalog_type, CONF.identity.region,
# endpoint_type=CONF.telemetry.endpoint_type))
# Get alarms client
if getattr(CONF.service_available, 'aodh_plugin', False):