From b4d06c565a2f01de7708809899ccc63cd395a207 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Wed, 12 Jun 2019 16:00:50 +0200 Subject: [PATCH] Rename fixture: NetworkWithNetMtuWriteStackFixture -> NetworkWithNetMtuWriteStackFixture Change-Id: Ia8d176cd70c9cfc38f17199f961650504e460147 --- tobiko/openstack/stacks/__init__.py | 3 ++- tobiko/openstack/stacks/_neutron.py | 4 ++-- tobiko/tests/functional/openstack/test_stacks.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tobiko/openstack/stacks/__init__.py b/tobiko/openstack/stacks/__init__.py index 20ffbd1e9..6344fdecc 100644 --- a/tobiko/openstack/stacks/__init__.py +++ b/tobiko/openstack/stacks/__init__.py @@ -21,6 +21,7 @@ from tobiko.openstack.stacks import _nova KeyPairStackFixture = _nova.KeyPairStackFixture NetworkStackFixture = _neutron.NetworkStackFixture -NetworkNetMtuWriteStackFixture = _neutron.NetworkNetMtuWriteStackFixture +NetworkWithNetMtuWriteStackFixture = ( + _neutron.NetworkWithNetMtuWriteStackFixture) FloatingIpServerStackFixture = _neutron.FloatingIpServerStackFixture SecurityGroupsFixture = _neutron.SecurityGroupsFixture diff --git a/tobiko/openstack/stacks/_neutron.py b/tobiko/openstack/stacks/_neutron.py index 000ed23f5..ca6a05dfa 100644 --- a/tobiko/openstack/stacks/_neutron.py +++ b/tobiko/openstack/stacks/_neutron.py @@ -87,7 +87,7 @@ class NetworkStackFixture(heat.HeatStackFixture): @neutron.skip_if_missing_networking_extensions('net-mtu-writable') -class NetworkNetMtuWriteStackFixture(heat.HeatStackFixture): +class NetworkWithNetMtuWriteStackFixture(NetworkStackFixture): # Whenever cat obtain network MTU value has_net_mtu = True @@ -97,7 +97,7 @@ class NetworkNetMtuWriteStackFixture(heat.HeatStackFixture): def setup_parameters(self): """Setup Heat template parameters""" - super(NetworkNetMtuWriteStackFixture, self).setup_parameters() + super(NetworkWithNetMtuWriteStackFixture, self).setup_parameters() if self.mtu: self.setup_net_mtu_writable() diff --git a/tobiko/tests/functional/openstack/test_stacks.py b/tobiko/tests/functional/openstack/test_stacks.py index 78314d0a2..cbbf4354e 100644 --- a/tobiko/tests/functional/openstack/test_stacks.py +++ b/tobiko/tests/functional/openstack/test_stacks.py @@ -58,11 +58,11 @@ class NetworkTestCase(testtools.TestCase): @neutron.skip_if_missing_networking_extensions('net-mtu-write') -class NetworkNetMtuWriteTestCase(NetworkTestCase): +class NetworkWithNetMtuWriteTestCase(NetworkTestCase): #: Stack of resources with a network with a gateway router stack = tobiko.required_setup_fixture( - stacks.NetworkNetMtuWriteStackFixture) + stacks.NetworkWithNetMtuWriteStackFixture) def test_net_mtu_write(self): self.assertEqual(self.stack.mtu, self.stack.outputs.mtu)