From 2ad84562646622746c292711c2da5eb988e691a2 Mon Sep 17 00:00:00 2001 From: Maor Blaustein Date: Sun, 30 Mar 2025 16:44:10 +0300 Subject: [PATCH] Apply rollout wait to remaining tests This change applies rollout wait introduced in patch [1] to any other test that can benefit from such extra stability. [1] 945106: Wait for config rollout to complete in test_api_server https://review.opendev.org/c/x/whitebox-neutron-tempest-plugin/+/945106 Change-Id: I2aaa0170f702c278be1d193dca30450c46f1303f --- whitebox_neutron_tempest_plugin/tests/scenario/test_ovn_fdb.py | 3 ++- .../tests/scenario/test_security_group_logging.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/test_ovn_fdb.py b/whitebox_neutron_tempest_plugin/tests/scenario/test_ovn_fdb.py index 51d006d..46f6d82 100644 --- a/whitebox_neutron_tempest_plugin/tests/scenario/test_ovn_fdb.py +++ b/whitebox_neutron_tempest_plugin/tests/scenario/test_ovn_fdb.py @@ -57,7 +57,8 @@ class OvnFdbAgingTest(wb_base.BaseTempestTestCaseOvn): FDB_AGE_THRESHOLD)] self.set_service_setting(file=wb_utils.get_ml2_conf_file(), config_list=config_list, - cfg_change=False) + cfg_change=False, + wait_res='deploy/neutron') # 2) restart neutron api on all controllers simultaneously if not WB_CONF.openstack_type == 'podified': diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/test_security_group_logging.py b/whitebox_neutron_tempest_plugin/tests/scenario/test_security_group_logging.py index 5869c48..f3f40f9 100644 --- a/whitebox_neutron_tempest_plugin/tests/scenario/test_security_group_logging.py +++ b/whitebox_neutron_tempest_plugin/tests/scenario/test_security_group_logging.py @@ -483,7 +483,8 @@ class BaseSecGroupLoggingTest( wb_base.ConfigOption('network_log', 'burst_limit', burst_val), wb_base.ConfigOption('network_log', 'rate_limit', rate_val)] self.set_service_setting(file=self.ML2_CONF_FILE, - config_list=config_list) + config_list=config_list, + wait_res='deploy/neutron') # 5) restart neutron api on all controllers simultaneously if not WB_CONF.openstack_type == 'podified': service_ptn = utils.get_neutron_api_service_name()