Merge "Add conf option for listener connection limit" into mcp/victoria
diff --git a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
index 10c264b..855466d 100644
--- a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
+++ b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
@@ -818,6 +818,14 @@
CONF.load_balancer.build_interval,
CONF.load_balancer.build_timeout)
+ if not CONF.load_balancer.test_with_noop:
+ waiters.wait_for_status(
+ self.mem_listener_client.show_listener,
+ self.listener_id, const.OPERATING_STATUS,
+ const.ONLINE,
+ CONF.load_balancer.build_interval,
+ CONF.load_balancer.build_timeout)
+
# Test that no client certificate connects
response = requests.get(
'https://{0}:{1}'.format(self.lb_vip_address, LISTENER1_TCP_PORT),
@@ -923,6 +931,14 @@
CONF.load_balancer.build_interval,
CONF.load_balancer.build_timeout)
+ if not CONF.load_balancer.test_with_noop:
+ waiters.wait_for_status(
+ self.mem_listener_client.show_listener,
+ self.listener_id, const.OPERATING_STATUS,
+ const.ONLINE,
+ CONF.load_balancer.build_interval,
+ CONF.load_balancer.build_timeout)
+
LISTENER2_TCP_PORT = '8443'
listener_name = data_utils.rand_name(
"lb_member_listener2-multi-list-client-auth")
@@ -949,7 +965,13 @@
const.ACTIVE,
CONF.load_balancer.build_interval,
CONF.load_balancer.build_timeout)
-
+ if not CONF.load_balancer.test_with_noop:
+ waiters.wait_for_status(
+ self.mem_listener_client.show_listener,
+ self.listener2_id, const.OPERATING_STATUS,
+ const.ONLINE,
+ CONF.load_balancer.build_interval,
+ CONF.load_balancer.build_timeout)
# Test that no client certificate fails to connect to listener1
self.assertRaises(
requests.exceptions.SSLError,
diff --git a/octavia_tempest_plugin/tests/test_base.py b/octavia_tempest_plugin/tests/test_base.py
index b491c5c..8082450 100644
--- a/octavia_tempest_plugin/tests/test_base.py
+++ b/octavia_tempest_plugin/tests/test_base.py
@@ -543,6 +543,17 @@
class LoadBalancerBaseTestWithCompute(LoadBalancerBaseTest):
+
+ @classmethod
+ def skip_checks(cls):
+ """Check if we should skip all of the children tests."""
+ super(LoadBalancerBaseTest, cls).skip_checks()
+
+ # TODO(vsaienko): Implement tests for fixed network.
+ if not CONF.auth.create_isolated_networks:
+ msg = ('Skip tests as they require dynamic networks.')
+ raise cls.skipException(msg)
+
@classmethod
def resource_setup(cls):
super(LoadBalancerBaseTestWithCompute, cls).resource_setup()