Remove CentOS and CirrOS external network servers
Change-Id: I0bdd3a82a1fa5b8080757712972ff1906238648f
This commit is contained in:
parent
a560d4a4e7
commit
40f1b27a60
|
@ -28,12 +28,10 @@ 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
|
||||||
CirrosServerStackFixture = _cirros.CirrosServerStackFixture
|
CirrosServerStackFixture = _cirros.CirrosServerStackFixture
|
||||||
CirrosExternalServerStackFixture = _cirros.CirrosExternalServerStackFixture
|
|
||||||
CirrosPeerServerStackFixture = _cirros.CirrosPeerServerStackFixture
|
CirrosPeerServerStackFixture = _cirros.CirrosPeerServerStackFixture
|
||||||
CirrosDifferentHostServerStackFixture = (
|
CirrosDifferentHostServerStackFixture = (
|
||||||
_cirros.CirrosDifferentHostServerStackFixture)
|
_cirros.CirrosDifferentHostServerStackFixture)
|
||||||
|
|
|
@ -52,8 +52,3 @@ class CentosServerStackFixture(_nova.CloudInitServerStackFixture):
|
||||||
|
|
||||||
#: 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
|
|
||||||
|
|
|
@ -93,11 +93,6 @@ class EvacuableServerStackFixture(CirrosServerStackFixture):
|
||||||
image_fixture = tobiko.required_setup_fixture(EvacuableCirrosImageFixture)
|
image_fixture = tobiko.required_setup_fixture(EvacuableCirrosImageFixture)
|
||||||
|
|
||||||
|
|
||||||
class CirrosExternalServerStackFixture(CirrosServerStackFixture,
|
|
||||||
_nova.ExternalServerStackFixture):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class CirrosHttpServerStackFixture(CirrosPeerServerStackFixture,
|
class CirrosHttpServerStackFixture(CirrosPeerServerStackFixture,
|
||||||
_nova.HttpServerStackFixture):
|
_nova.HttpServerStackFixture):
|
||||||
|
|
||||||
|
|
|
@ -112,24 +112,6 @@ class PortTest(testtools.TestCase):
|
||||||
|
|
||||||
# --- Test opening ports on external network ----------------------------------
|
# --- Test opening ports on external network ----------------------------------
|
||||||
|
|
||||||
@stacks.skip_unless_has_external_network
|
|
||||||
class CirrosExternalPortTest(PortTest):
|
|
||||||
"""Test Neutron ports"""
|
|
||||||
|
|
||||||
#: Resources stack with Nova server to send messages to
|
|
||||||
stack = tobiko.required_setup_fixture(
|
|
||||||
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)
|
|
||||||
|
|
||||||
|
|
||||||
@stacks.skip_unless_has_external_network
|
@stacks.skip_unless_has_external_network
|
||||||
class UbuntuExternalPortTest(PortTest):
|
class UbuntuExternalPortTest(PortTest):
|
||||||
"""Test Neutron ports"""
|
"""Test Neutron ports"""
|
||||||
|
|
|
@ -141,7 +141,7 @@ class DVRTest(testtools.TestCase):
|
||||||
|
|
||||||
router_stack = tobiko.required_setup_fixture(NetworkWithNoServersStack)
|
router_stack = tobiko.required_setup_fixture(NetworkWithNoServersStack)
|
||||||
server_stack = tobiko.required_setup_fixture(
|
server_stack = tobiko.required_setup_fixture(
|
||||||
stacks.CirrosExternalServerStackFixture)
|
stacks.CirrosServerStackFixture)
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(DVRTest, self).setUp()
|
super(DVRTest, self).setUp()
|
||||||
|
|
Loading…
Reference in New Issue