diff --git a/octavia_tempest_plugin/common/constants.py b/octavia_tempest_plugin/common/constants.py index a60800f2..44bf3e50 100644 --- a/octavia_tempest_plugin/common/constants.py +++ b/octavia_tempest_plugin/common/constants.py @@ -196,6 +196,9 @@ AMPHORA_STATUSES = ( STATUS_PENDING_DELETE, STATUS_DELETED, STATUS_ERROR ) +# Amphora providers list +AMPHORA_PROVIDERS = ['amphora', 'amphorav2', 'octavia'] + # Flavor capabilities LOADBALANCER_TOPOLOGY = 'loadbalancer_topology' diff --git a/octavia_tempest_plugin/config.py b/octavia_tempest_plugin/config.py index 5e09ba1c..7987c65b 100644 --- a/octavia_tempest_plugin/config.py +++ b/octavia_tempest_plugin/config.py @@ -108,8 +108,12 @@ OctaviaGroup = [ 'octavia.api.drivers entrypoint. Example: ' 'amphora:The Octavia Amphora driver.,' 'octavia:Deprecated alias of the Octavia ' - 'Amphora driver.'), + 'Amphora driver.,' + 'amphorav2:The Octavia Amphora driver that uses ' + 'taskflow jobboard persistence.'), default={'amphora': 'The Octavia Amphora driver.', + 'amphorav2': 'The Octavia Amphora driver that uses ' + 'taskflow jobboard persistence.', 'octavia': 'Deprecated alias of the Octavia Amphora ' 'driver.'}), cfg.StrOpt('loadbalancer_topology', diff --git a/octavia_tempest_plugin/tests/api/v2/test_amphora.py b/octavia_tempest_plugin/tests/api/v2/test_amphora.py index 78736798..7cf77dd5 100644 --- a/octavia_tempest_plugin/tests/api/v2/test_amphora.py +++ b/octavia_tempest_plugin/tests/api/v2/test_amphora.py @@ -30,7 +30,7 @@ class AmphoraAPITest(test_base.LoadBalancerBaseTest): @classmethod def skip_checks(cls): super(AmphoraAPITest, cls).skip_checks() - if CONF.load_balancer.provider not in ['amphora', 'octavia']: + if CONF.load_balancer.provider not in const.AMPHORA_PROVIDERS: raise cls.skipException('Amphora tests only run with the amphora ' 'provider enabled.') diff --git a/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py b/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py index 10ae85d4..b4dde1ff 100644 --- a/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py +++ b/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py @@ -826,7 +826,7 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest): lb = self.mem_lb_client.show_loadbalancer(lb[const.ID]) self.assertEqual(const.ACTIVE, lb[const.PROVISIONING_STATUS]) - if CONF.load_balancer.provider in ['amphora', 'octavia']: + if CONF.load_balancer.provider in const.AMPHORA_PROVIDERS: before_amphorae = self.lb_admin_amphora_client.list_amphorae( query_params='{loadbalancer_id}={lb_id}'.format( loadbalancer_id=const.LOADBALANCER_ID, lb_id=lb[const.ID])) @@ -840,7 +840,7 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest): CONF.load_balancer.lb_build_interval, CONF.load_balancer.lb_build_timeout) - if CONF.load_balancer.provider in ['amphora', 'octavia']: + if CONF.load_balancer.provider in const.AMPHORA_PROVIDERS: after_amphorae = self.lb_admin_amphora_client.list_amphorae( query_params='{loadbalancer_id}={lb_id}'.format( loadbalancer_id=const.LOADBALANCER_ID, lb_id=lb[const.ID])) diff --git a/octavia_tempest_plugin/tests/scenario/v2/test_amphora.py b/octavia_tempest_plugin/tests/scenario/v2/test_amphora.py index 30a116c2..91013216 100644 --- a/octavia_tempest_plugin/tests/scenario/v2/test_amphora.py +++ b/octavia_tempest_plugin/tests/scenario/v2/test_amphora.py @@ -34,7 +34,7 @@ class AmphoraScenarioTest(test_base.LoadBalancerBaseTest): def skip_checks(cls): super(AmphoraScenarioTest, cls).skip_checks() - if CONF.load_balancer.provider not in ['amphora', 'octavia']: + if CONF.load_balancer.provider not in const.AMPHORA_PROVIDERS: raise cls.skipException("Amphora tests require provider 'amphora' " "or 'octavia' (alias to 'amphora', " " deprecated) set") diff --git a/octavia_tempest_plugin/tests/spare_pool_scenario/v2/test_spare_pool.py b/octavia_tempest_plugin/tests/spare_pool_scenario/v2/test_spare_pool.py index 072bd204..80c886b5 100644 --- a/octavia_tempest_plugin/tests/spare_pool_scenario/v2/test_spare_pool.py +++ b/octavia_tempest_plugin/tests/spare_pool_scenario/v2/test_spare_pool.py @@ -31,7 +31,7 @@ class SparePoolTest(test_base.LoadBalancerBaseTestWithCompute): def skip_checks(cls): super(SparePoolTest, cls).skip_checks() - if CONF.load_balancer.provider not in ['amphora', 'octavia']: + if CONF.load_balancer.provider not in const.AMPHORA_PROVIDERS: raise cls.skipException("Amphora tests require provider 'amphora' " "or 'octavia' (alias to 'amphora', " "deprecated) set")