Merge "Revert "Ignore L3HA router having multiple master agents""
This commit is contained in:
commit
ac346082e7
@ -14,6 +14,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
|
import pytest
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
@ -121,11 +122,11 @@ class L3HARouterTest(RouterTest):
|
|||||||
#: Resources stack with Nova server to send messages to
|
#: Resources stack with Nova server to send messages to
|
||||||
stack = tobiko.required_setup_fixture(stacks.L3haServerStackFixture)
|
stack = tobiko.required_setup_fixture(stacks.L3haServerStackFixture)
|
||||||
|
|
||||||
|
@pytest.mark.flaky(reruns=5, reruns_delay=120)
|
||||||
@neutron.skip_if_missing_networking_extensions('l3_agent_scheduler')
|
@neutron.skip_if_missing_networking_extensions('l3_agent_scheduler')
|
||||||
def test_router_is_scheduled_on_l3_agents(self):
|
def test_router_is_scheduled_on_l3_agents(self):
|
||||||
master_agent, backup_agents = (
|
master_agent, backup_agents = (
|
||||||
neutron.wait_for_master_and_backup_agents(self.router['id'],
|
neutron.wait_for_master_and_backup_agents(self.router['id']))
|
||||||
unique_master=False))
|
|
||||||
self.assertGreaterEqual(len(backup_agents), 1)
|
self.assertGreaterEqual(len(backup_agents), 1)
|
||||||
self._check_routers_namespace_on_host(master_agent['host'])
|
self._check_routers_namespace_on_host(master_agent['host'])
|
||||||
for backup_agent in backup_agents:
|
for backup_agent in backup_agents:
|
||||||
|
Loading…
Reference in New Issue
Block a user