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:
parent
d45df6cedd
commit
3cd5ec897d
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue