openstack
/
neutron
Code Issues Proposed changes

Merge "[Functional] Wait for the initial state of ha router before test" into stable/wallaby

This commit is contained in:
Zuul 2021-09-24 09:44:07 +00:00 committed by Gerrit Code Review
parent ac8e0c31f9 39a2e5e4f2
commit b1ceec0efc
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/tests/functional/agent/l3/test_dvr_router.py
View File

@ -1590,8 +1590,12 @@ class TestDvrRouter(DvrRouterTestFramework, framework.L3AgentTestFramework):
primary, backup = self._get_primary_and_backup_routers(
router1, router2, check_external_device=False)
utils.wait_until_true(lambda: primary.ha_state == 'primary')
utils.wait_until_true(lambda: backup.ha_state == 'backup')
self._assert_ip_addresses_in_dvr_ha_snat_namespace_with_fip(primary)
self._assert_no_ip_addresses_in_dvr_ha_snat_namespace_with_fip(backup)
self.fail_ha_router(primary)
utils.wait_until_true(lambda: backup.ha_state == 'primary')
@ -1616,6 +1620,9 @@ class TestDvrRouter(DvrRouterTestFramework, framework.L3AgentTestFramework):
primary, backup = self._get_primary_and_backup_routers(
router1, router2, check_external_device=False)
utils.wait_until_true(lambda: primary.ha_state == 'primary')
utils.wait_until_true(lambda: backup.ha_state == 'backup')
self._assert_ip_addresses_in_dvr_ha_snat_namespace(primary)
self._assert_no_ip_addresses_in_dvr_ha_snat_namespace(backup)

6
neutron/tests/functional/agent/l3/test_ha_router.py
View File

@ -295,6 +295,7 @@ class L3HATestCase(framework.L3AgentTestFramework):
def test_delete_external_gateway_on_standby_router(self):
router_info = self.generate_router_info(enable_ha=True)
router = self.manage_router(self.agent, router_info)
common_utils.wait_until_true(lambda: router.ha_state == 'primary')
self.fail_ha_router(router)
common_utils.wait_until_true(lambda: router.ha_state == 'backup')
@ -434,6 +435,11 @@ class L3HATestFailover(framework.L3AgentTestFramework):
self._assert_ipv6_accept_ra(backup_router, False)
self._assert_ipv6_forwarding(backup_router, False, False)
common_utils.wait_until_true(
lambda: primary_router.ha_state == 'primary')
common_utils.wait_until_true(
lambda: backup_router.ha_state == 'backup')
self.fail_ha_router(router1)
# NOTE: passing backup_router as first argument, because we expect