x
/
tobiko
Code Issues Proposed changes

Remove CentOS and CirrOS external network servers 

Change-Id: I0bdd3a82a1fa5b8080757712972ff1906238648f
This commit is contained in:
Federico Ressi 2021-06-22 11:51:06 +02:00
parent a560d4a4e7
commit 40f1b27a60
5 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tobiko/openstack/stacks/__init__.py
View File

@ -28,12 +28,10 @@ from tobiko.openstack.stacks import _ubuntu
CentosFlavorStackFixture = _centos.CentosFlavorStackFixture
CentosImageFixture = _centos.CentosImageFixture
CentosServerStackFixture = _centos.CentosServerStackFixture
CentosExternalServerStackFixture = _centos.CentosExternalServerStackFixture
CirrosFlavorStackFixture = _cirros.CirrosFlavorStackFixture
CirrosImageFixture = _cirros.CirrosImageFixture
CirrosServerStackFixture = _cirros.CirrosServerStackFixture
CirrosExternalServerStackFixture = _cirros.CirrosExternalServerStackFixture
CirrosPeerServerStackFixture = _cirros.CirrosPeerServerStackFixture
CirrosDifferentHostServerStackFixture = (
_cirros.CirrosDifferentHostServerStackFixture)

5
tobiko/openstack/stacks/_centos.py
View File

@ -52,8 +52,3 @@ class CentosServerStackFixture(_nova.CloudInitServerStackFixture):
#: Setup SWAP file in bytes
swap_maxsize = 1 * 1024 * 1024 * 1024 # 1 GB
class CentosExternalServerStackFixture(CentosServerStackFixture,
_nova.ExternalServerStackFixture):
pass

5
tobiko/openstack/stacks/_cirros.py
View File

@ -93,11 +93,6 @@ class EvacuableServerStackFixture(CirrosServerStackFixture):
image_fixture = tobiko.required_setup_fixture(EvacuableCirrosImageFixture)
class CirrosExternalServerStackFixture(CirrosServerStackFixture,
_nova.ExternalServerStackFixture):
pass
class CirrosHttpServerStackFixture(CirrosPeerServerStackFixture,
_nova.HttpServerStackFixture):

18
tobiko/tests/scenario/neutron/test_port.py
View File

@ -112,24 +112,6 @@ class PortTest(testtools.TestCase):
# --- 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
class UbuntuExternalPortTest(PortTest):
"""Test Neutron ports"""

2
tobiko/tests/scenario/neutron/test_router.py
View File

@ -141,7 +141,7 @@ class DVRTest(testtools.TestCase):
router_stack = tobiko.required_setup_fixture(NetworkWithNoServersStack)
server_stack = tobiko.required_setup_fixture(
stacks.CirrosExternalServerStackFixture)
stacks.CirrosServerStackFixture)
def setUp(self):
super(DVRTest, self).setUp()