Merge "Test CentOS Nova server with external network"
This commit is contained in:
commit
f08ff705a4
@ -27,6 +27,7 @@ from tobiko.openstack.stacks import _ubuntu
|
|||||||
CentosFlavorStackFixture = _centos.CentosFlavorStackFixture
|
CentosFlavorStackFixture = _centos.CentosFlavorStackFixture
|
||||||
CentosImageFixture = _centos.CentosImageFixture
|
CentosImageFixture = _centos.CentosImageFixture
|
||||||
CentosServerStackFixture = _centos.CentosServerStackFixture
|
CentosServerStackFixture = _centos.CentosServerStackFixture
|
||||||
|
CentosExternalServerStackFixture = _centos.CentosExternalServerStackFixture
|
||||||
|
|
||||||
CirrosFlavorStackFixture = _cirros.CirrosFlavorStackFixture
|
CirrosFlavorStackFixture = _cirros.CirrosFlavorStackFixture
|
||||||
CirrosImageFixture = _cirros.CirrosImageFixture
|
CirrosImageFixture = _cirros.CirrosImageFixture
|
||||||
|
@ -52,3 +52,8 @@ class CentosServerStackFixture(_nova.ServerStackFixture):
|
|||||||
|
|
||||||
#: Setup SWAP file in bytes
|
#: Setup SWAP file in bytes
|
||||||
swap_maxsize = 1 * 1024 * 1024 * 1024 # 1 GB
|
swap_maxsize = 1 * 1024 * 1024 * 1024 # 1 GB
|
||||||
|
|
||||||
|
|
||||||
|
class CentosExternalServerStackFixture(CentosServerStackFixture,
|
||||||
|
_nova.ExternalServerStackFixture):
|
||||||
|
pass
|
||||||
|
@ -113,7 +113,7 @@ class PortTest(testtools.TestCase):
|
|||||||
# --- Test opening ports on external network ----------------------------------
|
# --- Test opening ports on external network ----------------------------------
|
||||||
|
|
||||||
@stacks.skip_unless_has_external_network
|
@stacks.skip_unless_has_external_network
|
||||||
class ExternalPortTest(PortTest):
|
class CirrosExternalPortTest(PortTest):
|
||||||
"""Test Neutron ports"""
|
"""Test Neutron ports"""
|
||||||
|
|
||||||
#: Resources stack with Nova server to send messages to
|
#: Resources stack with Nova server to send messages to
|
||||||
@ -121,6 +121,15 @@ class ExternalPortTest(PortTest):
|
|||||||
stacks.CirrosExternalServerStackFixture)
|
stacks.CirrosExternalServerStackFixture)
|
||||||
|
|
||||||
|
|
||||||
|
@stacks.skip_unless_has_external_network
|
||||||
|
class CentosExternalPortTest(PortTest):
|
||||||
|
"""Test Neutron ports"""
|
||||||
|
|
||||||
|
#: Resources stack with Nova server to send messages to
|
||||||
|
stack = tobiko.required_setup_fixture(
|
||||||
|
stacks.CentosExternalServerStackFixture)
|
||||||
|
|
||||||
|
|
||||||
# --- Test la-h3 extension ----------------------------------------------------
|
# --- Test la-h3 extension ----------------------------------------------------
|
||||||
|
|
||||||
@neutron.skip_if_missing_networking_extensions('l3-ha')
|
@neutron.skip_if_missing_networking_extensions('l3-ha')
|
||||||
|
Loading…
Reference in New Issue
Block a user