x/stacklight-integration-tests
Code Issues Proposed changes

Fix for OSTF tests

Browse Source 
Change-Id: I4ff36561e1e4be509f5d8b62b090197e413d6f31
This commit is contained in:
Artem 2016-10-06 15:59:56 +03:00 committed by Artem Minasyan
parent 1de5aeb232
commit 652981ce7a
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
stacklight_tests/toolchain/test_openstack_telemetry.py
View File

@ -49,8 +49,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
def _deploy_telemetry_plugin(self, caller, advanced_options=None, def _deploy_telemetry_plugin(self, caller, advanced_options=None,
additional_tests=None, additional_tests=None,
additional_plugins=None, roles=None, additional_plugins=None, roles=None,
settings=None, should_fail=0, settings=None, test_sets=None):
failed_test_name=None):
self.check_run(caller) self.check_run(caller)
self.env.revert_snapshot("ready_with_5_slaves") self.env.revert_snapshot("ready_with_5_slaves")
self.add_plugin(self.OPENSTACK_TELEMETRY) self.add_plugin(self.OPENSTACK_TELEMETRY)
@ -72,8 +71,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
} if not roles else roles } if not roles else roles
self.helpers.deploy_cluster(nodes_roles=node_roles) self.helpers.deploy_cluster(nodes_roles=node_roles)
self.check_plugins_online() self.check_plugins_online()
self.helpers.run_ostf(should_fail=should_fail, self.helpers.run_ostf(test_sets=test_sets)
failed_test_name=failed_test_name)
self.OPENSTACK_TELEMETRY.check_ceilometer_sample_functionality() self.OPENSTACK_TELEMETRY.check_ceilometer_sample_functionality()
self.OPENSTACK_TELEMETRY.check_ceilometer_alarm_functionality() self.OPENSTACK_TELEMETRY.check_ceilometer_alarm_functionality()
if additional_tests: if additional_tests:
@ -413,14 +411,12 @@ class TestOpenstackTelemetry(api.ToolchainApi):
""" """
settings = {'ceilometer': True} settings = {'ceilometer': True}
failed_test_name = ("Ceilometer test to list meters, alarms, " test_sets = ['smoke']
"resources and events")
self._deploy_telemetry_plugin("deploy_telemetry_ceilometer_core", self._deploy_telemetry_plugin("deploy_telemetry_ceilometer_core",
roles=self.ceilometer_core_roles, roles=self.ceilometer_core_roles,
settings=settings, settings=settings,
should_fail=1, test_sets=test_sets)
failed_test_name=failed_test_name)
@test(depends_on_groups=["prepare_slaves_5"], @test(depends_on_groups=["prepare_slaves_5"],
groups=["deploy_telemetry_ceilometer_core_resource_api", "deploy", groups=["deploy_telemetry_ceilometer_core_resource_api", "deploy",
@ -460,15 +456,14 @@ class TestOpenstackTelemetry(api.ToolchainApi):
settings = {'ceilometer': True} settings = {'ceilometer': True}
failed_test_name = ("Ceilometer test to list meters, alarms, " test_sets = ['smoke']
"resources and events")
self._deploy_telemetry_plugin( self._deploy_telemetry_plugin(
"deploy_telemetry_ceilometer_core_resource_api", "deploy_telemetry_ceilometer_core_resource_api",
advanced_options=options, advanced_options=options,
additional_tests=additional_tests, additional_tests=additional_tests,
roles=self.ceilometer_core_roles, settings=settings, roles=self.ceilometer_core_roles, settings=settings,
should_fail=1, failed_test_name=failed_test_name) test_sets=test_sets)
@test(depends_on_groups=["prepare_slaves_5"], @test(depends_on_groups=["prepare_slaves_5"],
groups=["deploy_telemetry_ceilometer_core_event_api", "deploy", groups=["deploy_telemetry_ceilometer_core_event_api", "deploy",
@ -508,15 +503,14 @@ class TestOpenstackTelemetry(api.ToolchainApi):
settings = {'ceilometer': True} settings = {'ceilometer': True}
failed_test_name = ("Ceilometer test to list meters, alarms, " test_sets = ['smoke']
"resources and events")
self._deploy_telemetry_plugin( self._deploy_telemetry_plugin(
"deploy_telemetry_ceilometer_core_event_api", "deploy_telemetry_ceilometer_core_event_api",
advanced_options=options, advanced_options=options,
additional_tests=additional_tests, additional_tests=additional_tests,
roles=self.ceilometer_core_roles, settings=settings, roles=self.ceilometer_core_roles, settings=settings,
should_fail=1, failed_test_name=failed_test_name) test_sets=test_sets)
@test(depends_on_groups=["prepare_slaves_5"], @test(depends_on_groups=["prepare_slaves_5"],
groups=["deploy_telemetry_ceilometer_core_resource_event_api", groups=["deploy_telemetry_ceilometer_core_resource_event_api",
@ -591,15 +585,13 @@ class TestOpenstackTelemetry(api.ToolchainApi):
""" """
settings = {'ceilometer': True} settings = {'ceilometer': True}
failed_test_name = ("Ceilometer test to list meters, alarms, " test_sets = ['smoke']
"resources and events")
self._deploy_telemetry_plugin("deploy_telemetry_ceilometer_core_kafka", self._deploy_telemetry_plugin("deploy_telemetry_ceilometer_core_kafka",
additional_plugins=self.KAFKA, additional_plugins=self.KAFKA,
roles=self.ceilometer_core_kafka_roles, roles=self.ceilometer_core_kafka_roles,
settings=settings, settings=settings,
should_fail=1, test_sets=test_sets)
failed_test_name=failed_test_name)
@test(depends_on_groups=["prepare_slaves_5"], @test(depends_on_groups=["prepare_slaves_5"],
groups=["deploy_telemetry_ceilometer_core_kafka_resource_api", groups=["deploy_telemetry_ceilometer_core_kafka_resource_api",
@ -639,8 +631,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
settings = {'ceilometer': True} settings = {'ceilometer': True}
failed_test_name = ("Ceilometer test to list meters, alarms, " test_sets = ['smoke']
"resources and events")
self._deploy_telemetry_plugin( self._deploy_telemetry_plugin(
"deploy_telemetry_ceilometer_core_kafka_resource_api", "deploy_telemetry_ceilometer_core_kafka_resource_api",
@ -648,7 +639,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
additional_tests=additional_tests, additional_tests=additional_tests,
additional_plugins=self.KAFKA, additional_plugins=self.KAFKA,
roles=self.ceilometer_core_kafka_roles, settings=settings, roles=self.ceilometer_core_kafka_roles, settings=settings,
should_fail=1, failed_test_name=failed_test_name) test_sets=test_sets)
@test(depends_on_groups=["prepare_slaves_5"], @test(depends_on_groups=["prepare_slaves_5"],
groups=["deploy_telemetry_ceilometer_core_kafka_event_api", "deploy", groups=["deploy_telemetry_ceilometer_core_kafka_event_api", "deploy",
@ -688,8 +679,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
settings = {'ceilometer': True} settings = {'ceilometer': True}
failed_test_name = ("Ceilometer test to list meters, alarms, " test_sets = ['smoke']
"resources and events")
self._deploy_telemetry_plugin( self._deploy_telemetry_plugin(
"deploy_telemetry_ceilometer_core_kafka_event_api", "deploy_telemetry_ceilometer_core_kafka_event_api",
@ -697,7 +687,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
additional_tests=additional_tests, additional_tests=additional_tests,
additional_plugins=self.KAFKA, additional_plugins=self.KAFKA,
roles=self.ceilometer_core_kafka_roles, settings=settings, roles=self.ceilometer_core_kafka_roles, settings=settings,
should_fail=1, failed_test_name=failed_test_name) test_sets=test_sets)
@test(depends_on_groups=["prepare_slaves_5"], @test(depends_on_groups=["prepare_slaves_5"],
groups=["deploy_telemetry_ceilometer_core_kafka_resource_event_api", groups=["deploy_telemetry_ceilometer_core_kafka_resource_event_api",