diff --git a/tobiko/openstack/stacks/__init__.py b/tobiko/openstack/stacks/__init__.py index e28f58f3f..091607613 100644 --- a/tobiko/openstack/stacks/__init__.py +++ b/tobiko/openstack/stacks/__init__.py @@ -37,6 +37,8 @@ CirrosSameHostServerStackFixture = _cirros.CirrosSameHostServerStackFixture L3haNetworkStackFixture = _l3ha.L3haNetworkStackFixture L3haServerStackFixture = _l3ha.L3haServerStackFixture +L3haUbuntuServerStackFixture = _l3ha.L3haUbuntuServerStackFixture +L3haCentosServerStackFixture = _l3ha.L3haCentosServerStackFixture L3haPeerServerStackFixture = _l3ha.L3haPeerServerStackFixture L3haDifferentHostServerStackFixture = _l3ha.L3haDifferentHostServerStackFixture L3haSameHostServerStackFixture = _l3ha.L3haSameHostServerStackFixture diff --git a/tobiko/openstack/stacks/_l3ha.py b/tobiko/openstack/stacks/_l3ha.py index d7f36aabc..5999273bf 100644 --- a/tobiko/openstack/stacks/_l3ha.py +++ b/tobiko/openstack/stacks/_l3ha.py @@ -15,9 +15,11 @@ from __future__ import absolute_import import tobiko from tobiko.openstack import neutron +from tobiko.openstack.stacks import _centos from tobiko.openstack.stacks import _cirros from tobiko.openstack.stacks import _neutron from tobiko.openstack.stacks import _nova +from tobiko.openstack.stacks import _ubuntu @neutron.skip_if_missing_networking_extensions('l3-ha') @@ -27,7 +29,7 @@ class L3haNetworkStackFixture(_neutron.NetworkStackFixture): @neutron.skip_if_missing_networking_extensions('l3-ha') class L3haServerStackFixture(_cirros.CirrosServerStackFixture): - #: Heat stack for creating internal network with custom MTU value + #: Heat stack for creating internal network with L3HA enabled network_stack = tobiko.required_setup_fixture( L3haNetworkStackFixture) @@ -45,3 +47,13 @@ class L3haSameHostServerStackFixture( class L3haDifferentHostServerStackFixture( L3haPeerServerStackFixture, _nova.DifferentHostServerStackFixture): pass + + +class L3haCentosServerStackFixture(_centos.CentosServerStackFixture, + L3haServerStackFixture): + pass + + +class L3haUbuntuServerStackFixture(_ubuntu.UbuntuServerStackFixture, + L3haServerStackFixture): + pass diff --git a/tobiko/tests/scenario/neutron/test_port.py b/tobiko/tests/scenario/neutron/test_port.py index 12219eed6..7386111c0 100644 --- a/tobiko/tests/scenario/neutron/test_port.py +++ b/tobiko/tests/scenario/neutron/test_port.py @@ -88,3 +88,19 @@ class PortTest(testtools.TestCase): class L3HAPortTest(PortTest): #: Resources stack with floating IP and Nova server stack = tobiko.required_setup_fixture(stacks.L3haServerStackFixture) + + +@neutron.skip_if_missing_networking_extensions('l3-ha') +@neutron.skip_if_missing_networking_agents(binary='neutron-l3-agent', + count=2) +class CentosServerL3HAPortTestWith(PortTest): + #: Resources stack with floating IP and Nova server + stack = tobiko.required_setup_fixture(stacks.L3haCentosServerStackFixture) + + +@neutron.skip_if_missing_networking_extensions('l3-ha') +@neutron.skip_if_missing_networking_agents(binary='neutron-l3-agent', + count=2) +class UbuntuServerL3HAPortTestWith(PortTest): + #: Resources stack with floating IP and Nova server + stack = tobiko.required_setup_fixture(stacks.L3haUbuntuServerStackFixture)