Skip iptables act/stby test based on topology set

Task: 35877
Story: 2006260

Change-Id: I53671c7e93737b0d7bc038b4dd136a179facd34a
This commit is contained in:
Carlos Goncalves 2019-07-22 11:45:04 +02:00
parent b6fb3d1993
commit ee09a1b782
4 changed files with 10 additions and 0 deletions

View File

@ -97,6 +97,7 @@ ERROR = 'ERROR'
SORT = 'sort'
SINGLE = 'SINGLE'
ACTIVE_STANDBY = 'ACTIVE_STANDBY'
SUPPORTED_LB_TOPOLOGIES = (SINGLE, ACTIVE_STANDBY)
# Protocols
HTTP = 'HTTP'

View File

@ -111,6 +111,10 @@ OctaviaGroup = [
default={'amphora': 'The Octavia Amphora driver.',
'octavia': 'Deprecated alias of the Octavia Amphora '
'driver.'}),
cfg.StrOpt('loadbalancer_topology',
default=const.SINGLE,
choices=const.SUPPORTED_LB_TOPOLOGIES,
help='Load balancer topology configuration.'),
# Networking
cfg.BoolOpt('test_with_ipv6',
default=True,

View File

@ -46,6 +46,10 @@ class ActiveStandbyIptablesScenarioTest(
"or 'octavia' (alias to 'amphora', "
"deprecated) set.")
if CONF.load_balancer.loadbalancer_topology != const.ACTIVE_STANDBY:
raise cls.skipException("Configured load balancer topology is not "
"%s." % const.ACTIVE_STANDBY)
@classmethod
def resource_setup(cls):
"""Setup resources needed by the tests."""

View File

@ -502,6 +502,7 @@
"$TEMPEST_CONFIG":
load_balancer:
check_timeout: 180
loadbalancer_topology: 'ACTIVE_STANDBY'
tempest_test_regex: ^octavia_tempest_plugin.tests.act_stdby_scenario.v2.test_active_standby_iptables
tox_envlist: all