Merge "Patch to fix test_amphora_update using the unique load balancer" into mcp/caracal
diff --git a/octavia_tempest_plugin/tests/api/v2/test_member.py b/octavia_tempest_plugin/tests/api/v2/test_member.py
index 546ad9b..079e988 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_member.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_member.py
@@ -2273,7 +2273,7 @@
CONF.load_balancer.build_timeout,
pool_id=pool_id)
status = const.OFFLINE
- if CONF.load_balancer.test_with_noop:
+ if CONF.load_balancer.test_with_noop or provider == 'tungstenfabric':
status = const.NO_MONITOR
member = waiters.wait_for_status(
self.mem_member_client.show_member,
diff --git a/octavia_tempest_plugin/tests/api/v2/test_pool.py b/octavia_tempest_plugin/tests/api/v2/test_pool.py
index def10aa..339fee6 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_pool.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_pool.py
@@ -40,12 +40,7 @@
lb_name = data_utils.rand_name("lb_member_lb1_pool")
lb_kwargs = {const.PROVIDER: CONF.load_balancer.provider,
const.NAME: lb_name}
- if CONF.load_balancer.provider == 'tungstenfabric':
- cls._setup_lb_network_kwargs(lb_kwargs, 4)
- else:
- lb_kwargs.update({
- const.VIP_NETWORK_ID: cls.lb_member_vip_net[const.ID]
- })
+ cls._setup_lb_network_kwargs(lb_kwargs)
lb = cls.mem_lb_client.create_loadbalancer(**lb_kwargs)
cls.lb_id = lb[const.ID]
@@ -351,7 +346,7 @@
algorithm=algorithm)
if not listener_protocol:
raise testtools.TestCase.skipException(
- "TungstenFabric can't create listener with loadbalancer "
+ "TungstenFabric can't create pool with loadbalancer "
"argument."
)
diff --git a/octavia_tempest_plugin/tests/scenario/v2/test_pool.py b/octavia_tempest_plugin/tests/scenario/v2/test_pool.py
index f63d96d..d3959e7 100644
--- a/octavia_tempest_plugin/tests/scenario/v2/test_pool.py
+++ b/octavia_tempest_plugin/tests/scenario/v2/test_pool.py
@@ -344,7 +344,7 @@
algorithm=algorithm)
if not listener_protocol:
raise testtools.TestCase.skipException(
- "TungstenFabric can't create listener with loadbalancer "
+ "TungstenFabric can't create pool with loadbalancer "
"argument."
)