Honor service_available options
... to determine whether tests requiring optional services should run.
Change-Id: I93da830fc37004b0c0146c573babf59fd2f71f24
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
diff --git a/heat_tempest_plugin/tests/functional/test_encryption_vol_type.py b/heat_tempest_plugin/tests/functional/test_encryption_vol_type.py
index c0dd884..0a06bc4 100644
--- a/heat_tempest_plugin/tests/functional/test_encryption_vol_type.py
+++ b/heat_tempest_plugin/tests/functional/test_encryption_vol_type.py
@@ -12,6 +12,7 @@
from tempest.lib import decorators
+from heat_tempest_plugin.common import test
from heat_tempest_plugin.tests.functional import functional_base
test_encryption_vol_type = {
@@ -38,6 +39,7 @@
}
+@test.requires_service('cinder')
class EncryptionVolTypeTest(functional_base.FunctionalTestsBase):
def setUp(self):
super(EncryptionVolTypeTest, self).setUp()
diff --git a/heat_tempest_plugin/tests/functional/test_event_sinks.py b/heat_tempest_plugin/tests/functional/test_event_sinks.py
index 7835462..a1472df 100644
--- a/heat_tempest_plugin/tests/functional/test_event_sinks.py
+++ b/heat_tempest_plugin/tests/functional/test_event_sinks.py
@@ -20,6 +20,7 @@
@test.requires_service_type('messaging')
+@test.requires_service('zaqar')
class ZaqarEventSinkTest(functional_base.FunctionalTestsBase):
template = '''
heat_template_version: "2013-05-23"
diff --git a/heat_tempest_plugin/tests/functional/test_software_config.py b/heat_tempest_plugin/tests/functional/test_software_config.py
index ada67f2..3bc716c 100644
--- a/heat_tempest_plugin/tests/functional/test_software_config.py
+++ b/heat_tempest_plugin/tests/functional/test_software_config.py
@@ -184,6 +184,7 @@
@test.requires_service_type('messaging')
+@test.requires_service('zaqar')
class ZaqarSignalTransportTest(functional_base.FunctionalTestsBase):
server_template = '''
heat_template_version: "2013-05-23"
diff --git a/heat_tempest_plugin/tests/functional/test_waitcondition.py b/heat_tempest_plugin/tests/functional/test_waitcondition.py
index 78a998f..b6cd6c2 100644
--- a/heat_tempest_plugin/tests/functional/test_waitcondition.py
+++ b/heat_tempest_plugin/tests/functional/test_waitcondition.py
@@ -21,6 +21,7 @@
@test.requires_service_type('messaging')
+@test.requires_service('zaqar')
class ZaqarWaitConditionTest(functional_base.FunctionalTestsBase):
template = '''
heat_template_version: "2013-05-23"
diff --git a/heat_tempest_plugin/tests/scenario/test_aodh_alarm.py b/heat_tempest_plugin/tests/scenario/test_aodh_alarm.py
index dafca12..47609b6 100644
--- a/heat_tempest_plugin/tests/scenario/test_aodh_alarm.py
+++ b/heat_tempest_plugin/tests/scenario/test_aodh_alarm.py
@@ -21,6 +21,8 @@
LOG = logging.getLogger(__name__)
+@test.requires_service('aodh')
+@test.requires_service('gnocchi')
class AodhAlarmTest(scenario_base.ScenarioTestsBase):
"""Class is responsible for testing of aodh usage."""
def setUp(self):
diff --git a/heat_tempest_plugin/tests/scenario/test_octavia_lbaas.py b/heat_tempest_plugin/tests/scenario/test_octavia_lbaas.py
index 46781d0..f6c9000 100644
--- a/heat_tempest_plugin/tests/scenario/test_octavia_lbaas.py
+++ b/heat_tempest_plugin/tests/scenario/test_octavia_lbaas.py
@@ -17,6 +17,7 @@
@test.requires_resource_type('OS::Octavia::LoadBalancer')
+@test.requires_service('octavia')
class LoadBalancerTest(scenario_base.ScenarioTestsBase):
def setUp(self):
super(LoadBalancerTest, self).setUp()