diff --git a/nova/test.py b/nova/test.py index 25f3444e7269..8b3facbab73b 100644 --- a/nova/test.py +++ b/nova/test.py @@ -63,7 +63,6 @@ from nova.objects import base as objects_base from nova import quota from nova.tests import fixtures as nova_fixtures from nova.tests.unit import matchers -from nova.tests.unit import policy_fixture from nova import utils from nova.virt import images @@ -263,7 +262,7 @@ class TestCase(base.BaseTestCase): self.addCleanup(self._clear_attrs) self.useFixture(fixtures.EnvironmentVariable('http_proxy')) - self.policy = self.useFixture(policy_fixture.PolicyFixture()) + self.policy = self.useFixture(nova_fixtures.PolicyFixture()) self.useFixture(nova_fixtures.PoisonFunctions()) diff --git a/nova/tests/fixtures/__init__.py b/nova/tests/fixtures/__init__.py index 9fd1ded1650f..b3448171cc44 100644 --- a/nova/tests/fixtures/__init__.py +++ b/nova/tests/fixtures/__init__.py @@ -10,5 +10,12 @@ # License for the specific language governing permissions and limitations # under the License. -from .conf import * # noqa: F401, F403 +from .api_paste import ApiPasteNoProjectId # noqa: F401 +from .api_paste import ApiPasteV21Fixture # noqa: F401 +from .cast_as_call import CastAsCallFixture # noqa: F401 +from .conf import ConfFixture # noqa: F401 from .nova import * # noqa: F401, F403 +from .policy import OverridePolicyFixture # noqa: F401 +from .policy import PolicyFixture # noqa: F401 +from .policy import RealPolicyFixture # noqa: F401 +from .policy import RoleBasedPolicyFixture # noqa: F401 diff --git a/nova/tests/functional/api_paste_fixture.py b/nova/tests/fixtures/api_paste.py similarity index 100% rename from nova/tests/functional/api_paste_fixture.py rename to nova/tests/fixtures/api_paste.py index 598b00f75175..57bc897203b9 100644 --- a/nova/tests/functional/api_paste_fixture.py +++ b/nova/tests/fixtures/api_paste.py @@ -11,6 +11,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + import os import fixtures @@ -18,7 +19,6 @@ import fixtures import nova.conf from nova.conf import paths - CONF = nova.conf.CONF diff --git a/nova/tests/unit/cast_as_call.py b/nova/tests/fixtures/cast_as_call.py similarity index 92% rename from nova/tests/unit/cast_as_call.py rename to nova/tests/fixtures/cast_as_call.py index 067c00a38f56..f6e04f54189b 100644 --- a/nova/tests/unit/cast_as_call.py +++ b/nova/tests/fixtures/cast_as_call.py @@ -18,7 +18,7 @@ import fixtures import oslo_messaging as messaging -class CastAsCall(fixtures.Fixture): +class CastAsCallFixture(fixtures.Fixture): """Make RPC 'cast' behave like a 'call'. @@ -31,7 +31,7 @@ class CastAsCall(fixtures.Fixture): """ def __init__(self, testcase): - super(CastAsCall, self).__init__() + super().__init__() self.testcase = testcase @staticmethod @@ -47,7 +47,7 @@ class CastAsCall(fixtures.Fixture): if 'fanout' in kwargs: kwargs['fanout'] = False cctxt = orig_prepare(self, *args, **kwargs) - CastAsCall._stub_out(testcase, cctxt) # woo, recurse! + CastAsCallFixture._stub_out(testcase, cctxt) # woo, recurse! return cctxt if obj: @@ -65,5 +65,5 @@ class CastAsCall(fixtures.Fixture): messaging.RPCClient.call) def setUp(self): - super(CastAsCall, self).setUp() + super().setUp() self._stub_out(self.testcase) diff --git a/nova/tests/unit/policy_fixture.py b/nova/tests/fixtures/policy.py similarity index 98% rename from nova/tests/unit/policy_fixture.py rename to nova/tests/fixtures/policy.py index 70da6ac5d810..ccff76715005 100644 --- a/nova/tests/unit/policy_fixture.py +++ b/nova/tests/fixtures/policy.py @@ -152,7 +152,7 @@ class OverridePolicyFixture(RealPolicyFixture): # Oslo.policy will consider the overridden rules if: # 1. overridden checks are different than defaults # 2. new rules for deprecated rules are not present in policy file - self.policy = self.useFixture(policy_fixture.OverridePolicyFixture( + self.policy = self.useFixture(nova_fixtures.OverridePolicyFixture( rules_in_file=override_rules)) """ diff --git a/nova/tests/functional/api_sample_tests/api_sample_base.py b/nova/tests/functional/api_sample_tests/api_sample_base.py index b3adac076637..be8e07a94119 100644 --- a/nova/tests/functional/api_sample_tests/api_sample_base.py +++ b/nova/tests/functional/api_sample_tests/api_sample_base.py @@ -18,7 +18,7 @@ import testscenarios import nova.conf from nova.tests import fixtures -from nova.tests.functional import api_paste_fixture +from nova.tests.fixtures import api_paste as api_paste_fixture from nova.tests.functional import api_samples_test_base CONF = nova.conf.CONF diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py index 5e98d06271e8..f0b931185e31 100644 --- a/nova/tests/functional/integrated_helpers.py +++ b/nova/tests/functional/integrated_helpers.py @@ -40,9 +40,7 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client as api_client from nova.tests.functional import fixtures as func_fixtures -from nova.tests.unit import cast_as_call from nova.tests.unit import fake_notifier -from nova.tests.unit import policy_fixture from nova import utils @@ -1109,13 +1107,13 @@ class _IntegratedTestBase(test.TestCase, PlacementInstanceHelperMixin): def setUp(self): super(_IntegratedTestBase, self).setUp() - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.placement = self.useFixture(func_fixtures.PlacementFixture()).api self.neutron = self.useFixture(nova_fixtures.NeutronFixture(self)) self.cinder = self.useFixture(nova_fixtures.CinderFixture(self)) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) - self.policy = self.useFixture(policy_fixture.RealPolicyFixture()) + self.policy = self.useFixture(nova_fixtures.RealPolicyFixture()) fake_notifier.stub_notifier(self) self.addCleanup(fake_notifier.reset) @@ -1182,7 +1180,7 @@ class ProviderUsageBaseTestCase(test.TestCase, PlacementInstanceHelperMixin): self.flags(compute_driver=self.compute_driver) super(ProviderUsageBaseTestCase, self).setUp() - self.policy = self.useFixture(policy_fixture.RealPolicyFixture()) + self.policy = self.useFixture(nova_fixtures.RealPolicyFixture()) self.neutron = self.useFixture(nova_fixtures.NeutronFixture(self)) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) self.placement = self.useFixture(func_fixtures.PlacementFixture()).api diff --git a/nova/tests/functional/libvirt/test_numa_live_migration.py b/nova/tests/functional/libvirt/test_numa_live_migration.py index d20803f8216a..58902fe6c2e1 100644 --- a/nova/tests/functional/libvirt/test_numa_live_migration.py +++ b/nova/tests/functional/libvirt/test_numa_live_migration.py @@ -620,9 +620,8 @@ class NUMALiveMigrationNegativeTests(NUMALiveMigrationBase): server = self.api.post_server(post) self._wait_for_state_change(server, 'ACTIVE') self.assertEqual('host_a', self.get_host(server['id'])) - # NOTE(artom) Because we use the CastAsCall fixture, we expect the + # NOTE(artom) Because we use the CastAsCallFixture, we expect the # MigrationPreCheckError to be bubbled up to the API as an error 500. - # TODO(artom) Stop using CastAsCall to make it more realistic. self.api.api_post( '/servers/%s/action' % server['id'], {'os-migrateLive': {'host': 'host_b', @@ -666,9 +665,8 @@ class NUMALiveMigrationNegativeTests(NUMALiveMigrationBase): self._wait_for_state_change(server, 'ACTIVE') initial_host = self.get_host(server['id']) dest_host = 'host_a' if initial_host == 'host_b' else 'host_b' - # NOTE(artom) Because we use the CastAsCall fixture, we expect the + # NOTE(artom) Because we use the CastAsCallFixture, we expect the # MigrationPreCheckError to be bubbled up to the API as an error 500. - # TODO(artom) Stop using CastAsCall to make it more realistic. self.api.api_post( '/servers/%s/action' % server['id'], {'os-migrateLive': {'host': dest_host, diff --git a/nova/tests/functional/libvirt/test_numa_servers.py b/nova/tests/functional/libvirt/test_numa_servers.py index 65f07e9c8a8a..fd8e5a676ed2 100644 --- a/nova/tests/functional/libvirt/test_numa_servers.py +++ b/nova/tests/functional/libvirt/test_numa_servers.py @@ -1193,8 +1193,8 @@ class NUMAServersWithNetworksTest(NUMAServersTestBase): ex = self.assertRaises(client.OpenStackApiException, self.api.post_server_action, server['id'], post) # NOTE(danms): This wouldn't happen in a real deployment since rebuild - # is a cast, but since we are using CastAsCall this will bubble to the - # API. + # is a cast, but since we are using CastAsCallFixture this will bubble + # to the API. self.assertEqual(500, ex.response.status_code) self.assertIn('NoValidHost', str(ex)) diff --git a/nova/tests/functional/libvirt/test_pci_sriov_servers.py b/nova/tests/functional/libvirt/test_pci_sriov_servers.py index 94b6fb228c8c..7748e57af328 100644 --- a/nova/tests/functional/libvirt/test_pci_sriov_servers.py +++ b/nova/tests/functional/libvirt/test_pci_sriov_servers.py @@ -322,8 +322,8 @@ class SRIOVServersTest(_PCIServersTestBase): self._live_migrate, server, 'completed') # NOTE(stephenfin): this wouldn't happen in a real deployment since - # live migration is a cast, but since we are using CastAsCall this will - # bubble to the API + # live migration is a cast, but since we are using CastAsCallFixture + # this will bubble to the API self.assertEqual(500, ex.response.status_code) self.assertIn('NoValidHost', str(ex)) @@ -353,8 +353,8 @@ class SRIOVServersTest(_PCIServersTestBase): self._live_migrate, server, 'completed') # NOTE(stephenfin): this wouldn't happen in a real deployment since - # live migration is a cast, but since we are using CastAsCall this will - # bubble to the API + # live migration is a cast, but since we are using CastAsCallFixture + # this will bubble to the API self.assertEqual(500, ex.response.status_code) self.assertIn('NoValidHost', str(ex)) @@ -1089,8 +1089,8 @@ class PCIServersTest(_PCIServersTestBase): self._live_migrate, server, 'completed') # NOTE(stephenfin): this wouldn't happen in a real deployment since - # live migration is a cast, but since we are using CastAsCall this will - # bubble to the API + # live migration is a cast, but since we are using CastAsCallFixture + # this will bubble to the API self.assertEqual(500, ex.response.status_code) self.assertIn('NoValidHost', str(ex)) diff --git a/nova/tests/functional/regressions/test_bug_1522536.py b/nova/tests/functional/regressions/test_bug_1522536.py index 3d02469e0787..fc3f77342030 100644 --- a/nova/tests/functional/regressions/test_bug_1522536.py +++ b/nova/tests/functional/regressions/test_bug_1522536.py @@ -15,8 +15,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client -from nova.tests.unit import cast_as_call -from nova.tests.unit import policy_fixture class TestServerGet(test.TestCase): @@ -24,7 +22,7 @@ class TestServerGet(test.TestCase): def setUp(self): super(TestServerGet, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) api_fixture = self.useFixture(nova_fixtures.OSAPIFixture( @@ -36,7 +34,7 @@ class TestServerGet(test.TestCase): self.start_service('scheduler') self.compute = self.start_service('compute') - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.image_id = self.api.get_images()[0]['id'] self.flavor_id = self.api.get_flavors()[0]['id'] diff --git a/nova/tests/functional/regressions/test_bug_1541691.py b/nova/tests/functional/regressions/test_bug_1541691.py index f44b55b5a039..8ce7611e166b 100644 --- a/nova/tests/functional/regressions/test_bug_1541691.py +++ b/nova/tests/functional/regressions/test_bug_1541691.py @@ -15,7 +15,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client -from nova.tests.unit import policy_fixture class TestServerValidation(test.TestCase): @@ -24,7 +23,7 @@ class TestServerValidation(test.TestCase): def setUp(self): super(TestServerValidation, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) api_fixture = self.useFixture(nova_fixtures.OSAPIFixture( diff --git a/nova/tests/functional/regressions/test_bug_1548980.py b/nova/tests/functional/regressions/test_bug_1548980.py index 94828b90dcde..4aa9f7687fde 100644 --- a/nova/tests/functional/regressions/test_bug_1548980.py +++ b/nova/tests/functional/regressions/test_bug_1548980.py @@ -17,8 +17,6 @@ import time from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client -from nova.tests.unit import cast_as_call -from nova.tests.unit import policy_fixture class TestServerGet(test.TestCase): @@ -26,10 +24,10 @@ class TestServerGet(test.TestCase): def setUp(self): super(TestServerGet, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) # The non-admin API client is fine to stay at 2.1 since it just creates # and deletes the server. diff --git a/nova/tests/functional/regressions/test_bug_1552888.py b/nova/tests/functional/regressions/test_bug_1552888.py index 26b7e0f644e0..abfdcfbffe22 100644 --- a/nova/tests/functional/regressions/test_bug_1552888.py +++ b/nova/tests/functional/regressions/test_bug_1552888.py @@ -15,14 +15,13 @@ from nova import test from nova.tests import fixtures as nova_fixtures -from nova.tests.unit import policy_fixture class TestAggregateCreation(test.TestCase): def setUp(self): super(TestAggregateCreation, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) api_fixture = self.useFixture(nova_fixtures.OSAPIFixture( api_version='v2.1')) diff --git a/nova/tests/functional/regressions/test_bug_1554631.py b/nova/tests/functional/regressions/test_bug_1554631.py index 8263a3818cc9..2db5e37b91f7 100644 --- a/nova/tests/functional/regressions/test_bug_1554631.py +++ b/nova/tests/functional/regressions/test_bug_1554631.py @@ -11,19 +11,19 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + from cinderclient import exceptions as cinder_exceptions import mock from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client -from nova.tests.unit import policy_fixture class TestCinderForbidden(test.TestCase): def setUp(self): super(TestCinderForbidden, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) api_fixture = self.useFixture(nova_fixtures.OSAPIFixture( api_version='v2.1')) @@ -50,7 +50,7 @@ class TestCinderForbidden(test.TestCase): class TestCinderOverLimit(test.TestCase): def setUp(self): super(TestCinderOverLimit, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) api_fixture = self.useFixture(nova_fixtures.OSAPIFixture( api_version='v2.1')) diff --git a/nova/tests/functional/regressions/test_bug_1558866.py b/nova/tests/functional/regressions/test_bug_1558866.py index e7ef7b7dfd9f..868a3a8060b7 100644 --- a/nova/tests/functional/regressions/test_bug_1558866.py +++ b/nova/tests/functional/regressions/test_bug_1558866.py @@ -17,14 +17,13 @@ import datetime from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client as api_client -from nova.tests.unit import policy_fixture class TestServerGet(test.TestCase): def setUp(self): super(TestServerGet, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) api_fixture = self.useFixture(nova_fixtures.OSAPIFixture( diff --git a/nova/tests/functional/regressions/test_bug_1595962.py b/nova/tests/functional/regressions/test_bug_1595962.py index 8eef0d3b7a90..d97a1b6e53f8 100644 --- a/nova/tests/functional/regressions/test_bug_1595962.py +++ b/nova/tests/functional/regressions/test_bug_1595962.py @@ -21,8 +21,6 @@ import mock from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures -from nova.tests.unit import cast_as_call -from nova.tests.unit import policy_fixture from nova.tests.unit.virt.libvirt import fakelibvirt from nova.virt.libvirt import guest as libvirt_guest @@ -32,7 +30,7 @@ class TestSerialConsoleLiveMigrate(test.TestCase): def setUp(self): super(TestSerialConsoleLiveMigrate, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) @@ -62,7 +60,7 @@ class TestSerialConsoleLiveMigrate(test.TestCase): self.start_service('scheduler') self.compute = self.start_service('compute', host='test_compute1') - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.image_id = self.api.get_images()[0]['id'] self.flavor_id = self.api.get_flavors()[0]['id'] diff --git a/nova/tests/functional/regressions/test_bug_1620248.py b/nova/tests/functional/regressions/test_bug_1620248.py index ebc817ac0d3b..b658b8853132 100644 --- a/nova/tests/functional/regressions/test_bug_1620248.py +++ b/nova/tests/functional/regressions/test_bug_1620248.py @@ -12,8 +12,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures -from nova.tests.unit import cast_as_call -from nova.tests.unit import policy_fixture class TestServerUpdate(test.TestCase): @@ -21,7 +19,7 @@ class TestServerUpdate(test.TestCase): def setUp(self): super(TestServerUpdate, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) # Simulate requests coming in before the instance is scheduled by @@ -32,7 +30,7 @@ class TestServerUpdate(test.TestCase): self.api = api_fixture.api - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.image_id = self.api.get_images()[0]['id'] self.flavor_id = self.api.get_flavors()[0]['id'] diff --git a/nova/tests/functional/regressions/test_bug_1670627.py b/nova/tests/functional/regressions/test_bug_1670627.py index d0af5ed53b2d..ce88a893bc2a 100644 --- a/nova/tests/functional/regressions/test_bug_1670627.py +++ b/nova/tests/functional/regressions/test_bug_1670627.py @@ -17,8 +17,6 @@ import time from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client -from nova.tests.unit import cast_as_call -from nova.tests.unit import policy_fixture class TestDeleteFromCell0CheckQuota(test.TestCase): @@ -47,7 +45,7 @@ class TestDeleteFromCell0CheckQuota(test.TestCase): def setUp(self): super(TestDeleteFromCell0CheckQuota, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) @@ -62,7 +60,7 @@ class TestDeleteFromCell0CheckQuota(test.TestCase): # compute hosts to schedule the instance to and will go into error and # be put into cell0. - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.image_id = self.api.get_images()[0]['id'] self.flavor_id = self.api.get_flavors()[0]['id'] diff --git a/nova/tests/functional/regressions/test_bug_1671648.py b/nova/tests/functional/regressions/test_bug_1671648.py index 5166c713dcf1..f382fc9795e7 100644 --- a/nova/tests/functional/regressions/test_bug_1671648.py +++ b/nova/tests/functional/regressions/test_bug_1671648.py @@ -19,9 +19,7 @@ from nova import exception from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures -from nova.tests.unit import cast_as_call from nova.tests.unit import fake_network -from nova.tests.unit import policy_fixture class TestRetryBetweenComputeNodeBuilds(test.TestCase): @@ -39,7 +37,7 @@ class TestRetryBetweenComputeNodeBuilds(test.TestCase): def setUp(self): super(TestRetryBetweenComputeNodeBuilds, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to stub out validate_networks in API. self.useFixture(nova_fixtures.NeutronFixture(self)) @@ -69,7 +67,7 @@ class TestRetryBetweenComputeNodeBuilds(test.TestCase): self.scheduler_service = self.start_service('scheduler') - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.image_id = self.admin_api.get_images()[0]['id'] self.flavor_id = self.admin_api.get_flavors()[0]['id'] diff --git a/nova/tests/functional/regressions/test_bug_1675570.py b/nova/tests/functional/regressions/test_bug_1675570.py index 999c79271130..62244a1f6c83 100644 --- a/nova/tests/functional/regressions/test_bug_1675570.py +++ b/nova/tests/functional/regressions/test_bug_1675570.py @@ -20,8 +20,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client from nova.tests.functional import fixtures as func_fixtures -from nova.tests.unit import cast_as_call -from nova.tests.unit import policy_fixture LOG = logging.getLogger(__name__) @@ -42,7 +40,7 @@ class TestLocalDeleteAttachedVolumes(test.TestCase): def setUp(self): super(TestLocalDeleteAttachedVolumes, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # We need the CinderFixture to stub out the volume API. self.cinder = self.useFixture( nova_fixtures.CinderFixture(self)) @@ -65,7 +63,7 @@ class TestLocalDeleteAttachedVolumes(test.TestCase): self.start_service('scheduler') self.start_service('compute') - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.flavor_id = self.api.get_flavors()[0]['id'] diff --git a/nova/tests/functional/regressions/test_bug_1679750.py b/nova/tests/functional/regressions/test_bug_1679750.py index dc579b082722..a77e4c7bbea5 100644 --- a/nova/tests/functional/regressions/test_bug_1679750.py +++ b/nova/tests/functional/regressions/test_bug_1679750.py @@ -19,14 +19,13 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class TestLocalDeleteAllocations(test.TestCase, integrated_helpers.InstanceHelperMixin): def setUp(self): super(TestLocalDeleteAllocations, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to show security groups for a server. self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) diff --git a/nova/tests/functional/regressions/test_bug_1682693.py b/nova/tests/functional/regressions/test_bug_1682693.py index 7de224604c65..211e4a6e0d47 100644 --- a/nova/tests/functional/regressions/test_bug_1682693.py +++ b/nova/tests/functional/regressions/test_bug_1682693.py @@ -16,7 +16,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class ServerTagsFilteringTest(test.TestCase, @@ -30,7 +29,7 @@ class ServerTagsFilteringTest(test.TestCase, def setUp(self): super(ServerTagsFilteringTest, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to stub out validate_networks in API. self.useFixture(nova_fixtures.NeutronFixture(self)) # Use the PlacementFixture to avoid annoying warnings in the logs. diff --git a/nova/tests/functional/regressions/test_bug_1689692.py b/nova/tests/functional/regressions/test_bug_1689692.py index 9ff0336fd891..1cea3bcb2260 100644 --- a/nova/tests/functional/regressions/test_bug_1689692.py +++ b/nova/tests/functional/regressions/test_bug_1689692.py @@ -15,12 +15,11 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import cast_as_call -from nova.tests.unit import policy_fixture -class ServerListLimitMarkerCell0Test(test.TestCase, - integrated_helpers.InstanceHelperMixin): +class ServerListLimitMarkerCell0Test( + test.TestCase, integrated_helpers.InstanceHelperMixin, +): """Regression test for bug 1689692 introduced in Ocata. The user specifies a limit which is greater than the number of instances @@ -33,7 +32,7 @@ class ServerListLimitMarkerCell0Test(test.TestCase, def setUp(self): super(ServerListLimitMarkerCell0Test, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to stub out validate_networks in API. self.useFixture(nova_fixtures.NeutronFixture(self)) api_fixture = self.useFixture(nova_fixtures.OSAPIFixture( @@ -51,7 +50,7 @@ class ServerListLimitMarkerCell0Test(test.TestCase, self.start_service('scheduler') # We don't start the compute service because we want NoValidHost so # all of the instances go into ERROR state and get put into cell0. - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) def test_list_servers_marker_in_cell0_more_limit(self): """Creates three servers, then lists them with a marker on the first diff --git a/nova/tests/functional/regressions/test_bug_1702454.py b/nova/tests/functional/regressions/test_bug_1702454.py index 808665b24c3d..7e1ef61c819a 100644 --- a/nova/tests/functional/regressions/test_bug_1702454.py +++ b/nova/tests/functional/regressions/test_bug_1702454.py @@ -14,12 +14,11 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import cast_as_call -from nova.tests.unit import policy_fixture -class SchedulerOnlyChecksTargetTest(test.TestCase, - integrated_helpers.InstanceHelperMixin): +class SchedulerOnlyChecksTargetTest( + test.TestCase, integrated_helpers.InstanceHelperMixin, +): """Regression test for bug 1702454 introduced in Newton. That test is for verifying that if we evacuate by providing a target, the @@ -41,7 +40,7 @@ class SchedulerOnlyChecksTargetTest(test.TestCase, def setUp(self): super(SchedulerOnlyChecksTargetTest, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to stub out validate_networks in API. self.useFixture(nova_fixtures.NeutronFixture(self)) @@ -83,7 +82,7 @@ class SchedulerOnlyChecksTargetTest(test.TestCase, self.start_service('compute', host='host1') self.start_service('compute', host='host2') self.start_service('compute', host='host3') - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) def test_evacuate_server(self): # We first create the instance diff --git a/nova/tests/functional/regressions/test_bug_1713783.py b/nova/tests/functional/regressions/test_bug_1713783.py index 86e9ae919c55..69a1671db5d8 100644 --- a/nova/tests/functional/regressions/test_bug_1713783.py +++ b/nova/tests/functional/regressions/test_bug_1713783.py @@ -22,7 +22,6 @@ from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers from nova.tests.unit import fake_network from nova.tests.unit import fake_notifier -from nova.tests.unit import policy_fixture LOG = logging.getLogger(__name__) @@ -44,7 +43,7 @@ class FailedEvacuateStateTests(test.TestCase, def setUp(self): super(FailedEvacuateStateTests, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/regressions/test_bug_1718455.py b/nova/tests/functional/regressions/test_bug_1718455.py index 5ef576097615..a99c681b0246 100644 --- a/nova/tests/functional/regressions/test_bug_1718455.py +++ b/nova/tests/functional/regressions/test_bug_1718455.py @@ -17,7 +17,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers from nova.tests.unit import fake_network -from nova.tests.unit import policy_fixture class TestLiveMigrateOneOfConcurrentlyCreatedInstances( @@ -43,7 +42,7 @@ class TestLiveMigrateOneOfConcurrentlyCreatedInstances( def setUp(self): super(TestLiveMigrateOneOfConcurrentlyCreatedInstances, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/regressions/test_bug_1718512.py b/nova/tests/functional/regressions/test_bug_1718512.py index 0c96a934e76b..b2ef7faf3220 100644 --- a/nova/tests/functional/regressions/test_bug_1718512.py +++ b/nova/tests/functional/regressions/test_bug_1718512.py @@ -17,7 +17,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class TestRequestSpecRetryReschedule(test.TestCase, @@ -34,7 +33,7 @@ class TestRequestSpecRetryReschedule(test.TestCase, """ def setUp(self): super(TestRequestSpecRetryReschedule, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to stub out validate_networks in API. self.useFixture(nova_fixtures.NeutronFixture(self)) diff --git a/nova/tests/functional/regressions/test_bug_1719730.py b/nova/tests/functional/regressions/test_bug_1719730.py index 18093bc8e674..a63c77452dfc 100644 --- a/nova/tests/functional/regressions/test_bug_1719730.py +++ b/nova/tests/functional/regressions/test_bug_1719730.py @@ -16,7 +16,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers from nova.tests.unit import fake_network -from nova.tests.unit import policy_fixture class TestRescheduleWithServerGroup(test.TestCase, @@ -35,7 +34,7 @@ class TestRescheduleWithServerGroup(test.TestCase, def setUp(self): super(TestRescheduleWithServerGroup, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to stub out validate_networks in API. self.useFixture(nova_fixtures.NeutronFixture(self)) diff --git a/nova/tests/functional/regressions/test_bug_1735407.py b/nova/tests/functional/regressions/test_bug_1735407.py index 68d219526d43..e53dba9321e5 100644 --- a/nova/tests/functional/regressions/test_bug_1735407.py +++ b/nova/tests/functional/regressions/test_bug_1735407.py @@ -17,7 +17,6 @@ from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers from nova.tests.unit import fake_network from nova.tests.unit import fake_notifier -from nova.tests.unit import policy_fixture class TestParallelEvacuationWithServerGroup( @@ -29,7 +28,7 @@ class TestParallelEvacuationWithServerGroup( def setUp(self): super(TestParallelEvacuationWithServerGroup, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to stub out validate_networks in API. self.useFixture(nova_fixtures.NeutronFixture(self)) diff --git a/nova/tests/functional/regressions/test_bug_1741307.py b/nova/tests/functional/regressions/test_bug_1741307.py index 5ed9d698b300..a23f6cc1852d 100644 --- a/nova/tests/functional/regressions/test_bug_1741307.py +++ b/nova/tests/functional/regressions/test_bug_1741307.py @@ -14,7 +14,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class TestResizeWithNoAllocationScheduler( @@ -45,7 +44,7 @@ class TestResizeWithNoAllocationScheduler( def setUp(self): super(TestResizeWithNoAllocationScheduler, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/regressions/test_bug_1746483.py b/nova/tests/functional/regressions/test_bug_1746483.py index e0b48cb07097..3613694bafa2 100644 --- a/nova/tests/functional/regressions/test_bug_1746483.py +++ b/nova/tests/functional/regressions/test_bug_1746483.py @@ -15,7 +15,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture from nova import utils CONF = config.CONF @@ -36,7 +35,7 @@ class TestBootFromVolumeIsolatedHostsFilter( def setUp(self): super(TestBootFromVolumeIsolatedHostsFilter, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.CinderFixture(self)) diff --git a/nova/tests/functional/regressions/test_bug_1764556.py b/nova/tests/functional/regressions/test_bug_1764556.py index 9913b9731dbc..6579c88b981c 100644 --- a/nova/tests/functional/regressions/test_bug_1764556.py +++ b/nova/tests/functional/regressions/test_bug_1764556.py @@ -16,7 +16,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture from nova import utils @@ -32,7 +31,7 @@ class InstanceListWithDeletedServicesTestCase( """ def setUp(self): super(InstanceListWithDeletedServicesTestCase, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to stub out validate_networks in API. self.useFixture(nova_fixtures.NeutronFixture(self)) diff --git a/nova/tests/functional/regressions/test_bug_1764883.py b/nova/tests/functional/regressions/test_bug_1764883.py index 431af81d8668..6d07b7c53e2a 100644 --- a/nova/tests/functional/regressions/test_bug_1764883.py +++ b/nova/tests/functional/regressions/test_bug_1764883.py @@ -17,7 +17,6 @@ from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers from nova.tests.unit import fake_network from nova.tests.unit import fake_notifier -from nova.tests.unit import policy_fixture class TestEvacuationWithSourceReturningDuringRebuild( @@ -32,7 +31,7 @@ class TestEvacuationWithSourceReturningDuringRebuild( def setUp(self): super(TestEvacuationWithSourceReturningDuringRebuild, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # The NeutronFixture is needed to stub out validate_networks in API. self.useFixture(nova_fixtures.NeutronFixture(self)) diff --git a/nova/tests/functional/regressions/test_bug_1780373.py b/nova/tests/functional/regressions/test_bug_1780373.py index 3ba0a96b84cd..20c58aa58e1f 100644 --- a/nova/tests/functional/regressions/test_bug_1780373.py +++ b/nova/tests/functional/regressions/test_bug_1780373.py @@ -14,7 +14,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class TestMultiCreateServerGroupMemberOverQuota( @@ -38,7 +37,7 @@ class TestMultiCreateServerGroupMemberOverQuota( def setUp(self): super(TestMultiCreateServerGroupMemberOverQuota, self).setUp() self.flags(server_group_members=2, group='quota') - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/regressions/test_bug_1781286.py b/nova/tests/functional/regressions/test_bug_1781286.py index 04b1112121f2..eeed95576eb3 100644 --- a/nova/tests/functional/regressions/test_bug_1781286.py +++ b/nova/tests/functional/regressions/test_bug_1781286.py @@ -21,7 +21,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers from nova.tests.unit import fake_notifier -from nova.tests.unit import policy_fixture class RescheduleBuildAvailabilityZoneUpCall( @@ -37,7 +36,7 @@ class RescheduleBuildAvailabilityZoneUpCall( def setUp(self): super(RescheduleBuildAvailabilityZoneUpCall, self).setUp() # Use the standard fixtures. - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) @@ -101,7 +100,7 @@ class RescheduleMigrateAvailabilityZoneUpCall( def setUp(self): super(RescheduleMigrateAvailabilityZoneUpCall, self).setUp() # Use the standard fixtures. - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/regressions/test_bug_1781710.py b/nova/tests/functional/regressions/test_bug_1781710.py index 69cda308e305..cb6dda7332a3 100644 --- a/nova/tests/functional/regressions/test_bug_1781710.py +++ b/nova/tests/functional/regressions/test_bug_1781710.py @@ -15,7 +15,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class AntiAffinityMultiCreateRequest(test.TestCase, @@ -38,7 +37,7 @@ class AntiAffinityMultiCreateRequest(test.TestCase, def setUp(self): super(AntiAffinityMultiCreateRequest, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/regressions/test_bug_1784353.py b/nova/tests/functional/regressions/test_bug_1784353.py index 21ced73e6599..b37677a855ac 100644 --- a/nova/tests/functional/regressions/test_bug_1784353.py +++ b/nova/tests/functional/regressions/test_bug_1784353.py @@ -15,7 +15,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers from nova.tests.unit import fake_network -from nova.tests.unit import policy_fixture class TestRescheduleWithVolumesAttached( @@ -32,7 +31,7 @@ class TestRescheduleWithVolumesAttached( # Use the new attach flow fixture for cinder self.cinder = self.useFixture(nova_fixtures.CinderFixture(self)) - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) diff --git a/nova/tests/functional/regressions/test_bug_1797580.py b/nova/tests/functional/regressions/test_bug_1797580.py index c92b56093a3e..653b847ee5f9 100644 --- a/nova/tests/functional/regressions/test_bug_1797580.py +++ b/nova/tests/functional/regressions/test_bug_1797580.py @@ -14,7 +14,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class ColdMigrateTargetHostThenLiveMigrateTest( @@ -37,7 +36,7 @@ class ColdMigrateTargetHostThenLiveMigrateTest( def setUp(self): super(ColdMigrateTargetHostThenLiveMigrateTest, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/regressions/test_bug_1806064.py b/nova/tests/functional/regressions/test_bug_1806064.py index ff4a155e1e7b..93696f3c4fe2 100644 --- a/nova/tests/functional/regressions/test_bug_1806064.py +++ b/nova/tests/functional/regressions/test_bug_1806064.py @@ -18,7 +18,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class BootFromVolumeOverQuotaRaceDeleteTest( @@ -49,7 +48,7 @@ class BootFromVolumeOverQuotaRaceDeleteTest( self.cinder_fixture = self.useFixture( nova_fixtures.CinderFixture(self)) # Use the standard fixtures. - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) self.api = self.useFixture(nova_fixtures.OSAPIFixture( diff --git a/nova/tests/functional/regressions/test_bug_1815153.py b/nova/tests/functional/regressions/test_bug_1815153.py index 5860187e7103..e8d9739fa39f 100644 --- a/nova/tests/functional/regressions/test_bug_1815153.py +++ b/nova/tests/functional/regressions/test_bug_1815153.py @@ -19,7 +19,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class NonPersistentFieldNotResetTest( @@ -46,7 +45,7 @@ class NonPersistentFieldNotResetTest( def setUp(self): super(NonPersistentFieldNotResetTest, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/regressions/test_bug_1835822.py b/nova/tests/functional/regressions/test_bug_1835822.py index 581410d4579e..751f06064770 100644 --- a/nova/tests/functional/regressions/test_bug_1835822.py +++ b/nova/tests/functional/regressions/test_bug_1835822.py @@ -15,7 +15,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers from nova.tests.unit import fake_notifier -from nova.tests.unit import policy_fixture class RegressionTest1835822( @@ -25,7 +24,7 @@ class RegressionTest1835822( def setUp(self): super(RegressionTest1835822, self).setUp() # Use the standard fixtures. - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/regressions/test_bug_1852458.py b/nova/tests/functional/regressions/test_bug_1852458.py index a529b7a2244d..f7513f85e878 100644 --- a/nova/tests/functional/regressions/test_bug_1852458.py +++ b/nova/tests/functional/regressions/test_bug_1852458.py @@ -15,7 +15,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture from nova import utils @@ -31,7 +30,7 @@ class TestInstanceActionBuryInCell0(test.TestCase, self.useFixture(func_fixtures.PlacementFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) - policy = self.useFixture(policy_fixture.RealPolicyFixture()) + policy = self.useFixture(nova_fixtures.RealPolicyFixture()) # Allow non-admins to see instance action events. policy.set_rules({ 'os_compute_api:os-instance-actions:events': 'rule:admin_or_owner' diff --git a/nova/tests/functional/regressions/test_bug_1893284.py b/nova/tests/functional/regressions/test_bug_1893284.py index 059bb48a1370..8e6c88981da5 100644 --- a/nova/tests/functional/regressions/test_bug_1893284.py +++ b/nova/tests/functional/regressions/test_bug_1893284.py @@ -15,7 +15,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client as api_client from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class TestServersPerUserQuota(test.TestCase, @@ -41,7 +40,7 @@ class TestServersPerUserQuota(test.TestCase, """ def setUp(self): super(TestServersPerUserQuota, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) diff --git a/nova/tests/functional/regressions/test_bug_1902925.py b/nova/tests/functional/regressions/test_bug_1902925.py index fb5f5251e54a..f0e823e2a4d0 100644 --- a/nova/tests/functional/regressions/test_bug_1902925.py +++ b/nova/tests/functional/regressions/test_bug_1902925.py @@ -9,8 +9,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + +from nova.tests import fixtures as nova_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import cast_as_call class ComputeVersion5xPinnedRpcTests(integrated_helpers._IntegratedTestBase): @@ -22,7 +23,7 @@ class ComputeVersion5xPinnedRpcTests(integrated_helpers._IntegratedTestBase): def setUp(self): super(ComputeVersion5xPinnedRpcTests, self).setUp() - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.compute1 = self._start_compute(host='host1') diff --git a/nova/tests/functional/regressions/test_bug_1914777.py b/nova/tests/functional/regressions/test_bug_1914777.py index 651ddfeb3d8b..bd2a265ab6a0 100644 --- a/nova/tests/functional/regressions/test_bug_1914777.py +++ b/nova/tests/functional/regressions/test_bug_1914777.py @@ -18,7 +18,6 @@ from nova import objects from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class TestDeleteWhileBooting(test.TestCase, @@ -43,7 +42,7 @@ class TestDeleteWhileBooting(test.TestCase, """ def setUp(self): super(TestDeleteWhileBooting, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) diff --git a/nova/tests/functional/test_aggregates.py b/nova/tests/functional/test_aggregates.py index a67d20314ea7..60c2d20a14b2 100644 --- a/nova/tests/functional/test_aggregates.py +++ b/nova/tests/functional/test_aggregates.py @@ -18,7 +18,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture from nova.tests.unit import utils as test_utils from nova import utils @@ -933,7 +932,7 @@ class AggregateMultiTenancyIsolationColdMigrateTest( def setUp(self): super(AggregateMultiTenancyIsolationColdMigrateTest, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/test_availability_zones.py b/nova/tests/functional/test_availability_zones.py index 375b7dc9d9bf..991f86148d8f 100644 --- a/nova/tests/functional/test_availability_zones.py +++ b/nova/tests/functional/test_availability_zones.py @@ -16,16 +16,16 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class TestAvailabilityZoneScheduling( - test.TestCase, integrated_helpers.InstanceHelperMixin): + test.TestCase, integrated_helpers.InstanceHelperMixin, +): def setUp(self): super(TestAvailabilityZoneScheduling, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/test_boot_from_volume.py b/nova/tests/functional/test_boot_from_volume.py index 8815e6c7c115..45555b002d69 100644 --- a/nova/tests/functional/test_boot_from_volume.py +++ b/nova/tests/functional/test_boot_from_volume.py @@ -19,7 +19,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client as api_client from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class BootFromVolumeTest(integrated_helpers._IntegratedTestBase): @@ -167,7 +166,7 @@ class BootFromVolumeLargeRequestTest(test.TestCase, def setUp(self): super(BootFromVolumeLargeRequestTest, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.CinderFixture(self)) diff --git a/nova/tests/functional/test_compute_mgr.py b/nova/tests/functional/test_compute_mgr.py index 0203f95e5612..38b7f9d7a682 100644 --- a/nova/tests/functional/test_compute_mgr.py +++ b/nova/tests/functional/test_compute_mgr.py @@ -18,7 +18,6 @@ from nova.network import model as network_model from nova import objects from nova import test from nova.tests import fixtures as nova_fixtures -from nova.tests.unit import cast_as_call from nova.tests.unit import fake_network from nova.tests.unit import fake_server_actions @@ -27,7 +26,7 @@ class ComputeManagerTestCase(test.TestCase): def setUp(self): super(ComputeManagerTestCase, self).setUp() self.useFixture(nova_fixtures.SpawnIsSynchronousFixture()) - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.conductor = self.start_service('conductor') self.start_service('scheduler') self.compute = self.start_service('compute') diff --git a/nova/tests/functional/test_cross_az_attach.py b/nova/tests/functional/test_cross_az_attach.py index 3fdcaf6f265c..a39ad593d378 100644 --- a/nova/tests/functional/test_cross_az_attach.py +++ b/nova/tests/functional/test_cross_az_attach.py @@ -15,7 +15,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client as api_client from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class CrossAZAttachTestCase(test.TestCase, @@ -29,7 +28,7 @@ class CrossAZAttachTestCase(test.TestCase, def setUp(self): super(CrossAZAttachTestCase, self).setUp() # Use the standard fixtures. - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.CinderFixture(self, az=self.az)) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) diff --git a/nova/tests/functional/test_cross_cell_migrate.py b/nova/tests/functional/test_cross_cell_migrate.py index 268c9e74eec5..0b9b94dbc3df 100644 --- a/nova/tests/functional/test_cross_cell_migrate.py +++ b/nova/tests/functional/test_cross_cell_migrate.py @@ -31,7 +31,6 @@ from nova.scheduler import weights from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import cast_as_call from nova.tests.unit import fake_notifier from nova import utils @@ -1022,11 +1021,11 @@ class TestMultiCellMigrate(integrated_helpers.ProviderUsageBaseTestCase): cell = self.cell_mappings[self.host_to_cell_mappings[target_host]] nova_context.set_target_cell(ctxt, cell) # Simulate not being able to query the API DB by poisoning calls to - # the instance_mappings table. Use the CastAsCall fixture so we can + # the instance_mappings table. Use CastAsCallFixture so we can # trap and log errors for assertions in the test. with test.nested( osloutils_fixture.TimeFixture(future), - cast_as_call.CastAsCall(self), + nova_fixtures.CastAsCallFixture(self), mock.patch('nova.objects.InstanceMapping.get_by_instance_uuid', side_effect=oslo_db_exc.CantStartEngineError) ) as ( diff --git a/nova/tests/functional/test_external_networks.py b/nova/tests/functional/test_external_networks.py index 2dccc70aa8c7..82c54a6732d5 100644 --- a/nova/tests/functional/test_external_networks.py +++ b/nova/tests/functional/test_external_networks.py @@ -18,7 +18,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class TestNeutronExternalNetworks(test.TestCase, @@ -29,7 +28,7 @@ class TestNeutronExternalNetworks(test.TestCase, def setUp(self): super(TestNeutronExternalNetworks, self).setUp() # Use the standard fixtures. - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(func_fixtures.PlacementFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) neutron = self.useFixture(nova_fixtures.NeutronFixture(self)) diff --git a/nova/tests/functional/test_instance_actions.py b/nova/tests/functional/test_instance_actions.py index b8abbff34808..054def51833d 100644 --- a/nova/tests/functional/test_instance_actions.py +++ b/nova/tests/functional/test_instance_actions.py @@ -22,7 +22,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class InstanceActionsTestV2(integrated_helpers._IntegratedTestBase): @@ -75,7 +74,7 @@ class InstanceActionEventFaultsTestCase( self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # Start the compute services. self.start_service('conductor') diff --git a/nova/tests/functional/test_list_servers_ip_filter.py b/nova/tests/functional/test_list_servers_ip_filter.py index 948433e72a7d..0a7fa8747525 100644 --- a/nova/tests/functional/test_list_servers_ip_filter.py +++ b/nova/tests/functional/test_list_servers_ip_filter.py @@ -17,15 +17,13 @@ import time from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures -from nova.tests.unit import cast_as_call -from nova.tests.unit import policy_fixture class TestListServersIpFilter(test.TestCase): def setUp(self): super(TestListServersIpFilter, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) self.neutron = self.useFixture(nova_fixtures.NeutronFixture(self)) # Add a 2nd port to the neutron fixture to have multiple ports @@ -42,7 +40,7 @@ class TestListServersIpFilter(test.TestCase): self.start_service('scheduler') self.start_service('compute') - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(nova_fixtures.CastAsCallFixture(self)) self.image_id = self.api.get_images()[0]['id'] self.flavor_id = self.api.get_flavors()[0]['id'] diff --git a/nova/tests/functional/test_nova_manage.py b/nova/tests/functional/test_nova_manage.py index 96d0b6f11e21..e3d924d8d9ff 100644 --- a/nova/tests/functional/test_nova_manage.py +++ b/nova/tests/functional/test_nova_manage.py @@ -1664,7 +1664,7 @@ class TestDBArchiveDeletedRows(integrated_helpers._IntegratedTestBase): server_req = { 'server': server, 'os:scheduler_hints': {'group': group['id']}} # Since we don't pass return_reservation_id=True we get the first - # server back in the response. We're also using the CastAsCall fixture + # server back in the response. We're also using the CastAsCallFixture # (from the base class) fixture so we don't have to worry about the # server being ACTIVE. server = self.api.post_server(server_req) diff --git a/nova/tests/functional/test_policy.py b/nova/tests/functional/test_policy.py index 4d6344c318ad..28339bdd0f5c 100644 --- a/nova/tests/functional/test_policy.py +++ b/nova/tests/functional/test_policy.py @@ -19,7 +19,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture from nova import utils @@ -37,7 +36,7 @@ class HostStatusPolicyTestCase(test.TestCase, self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # Start the services. self.start_service('conductor') diff --git a/nova/tests/functional/test_scheduler.py b/nova/tests/functional/test_scheduler.py index fd0363a839b1..77cf5f9c2955 100644 --- a/nova/tests/functional/test_scheduler.py +++ b/nova/tests/functional/test_scheduler.py @@ -16,7 +16,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers from nova.tests.unit import fake_network -from nova.tests.unit import policy_fixture CELL1_NAME = 'cell1' CELL2_NAME = 'cell2' @@ -29,7 +28,7 @@ class MultiCellSchedulerTestCase(test.TestCase, def setUp(self): super(MultiCellSchedulerTestCase, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.AllServicesCurrent()) diff --git a/nova/tests/functional/test_server_faults.py b/nova/tests/functional/test_server_faults.py index 237fb10c3dc2..91f813f0704e 100644 --- a/nova/tests/functional/test_server_faults.py +++ b/nova/tests/functional/test_server_faults.py @@ -16,7 +16,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class HypervisorError(Exception): @@ -33,7 +32,7 @@ class ServerFaultTestCase(test.TestCase, self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) # Start the compute services. self.start_service('conductor') diff --git a/nova/tests/functional/test_server_group.py b/nova/tests/functional/test_server_group.py index 8a29d31dba25..72d9b03440bf 100644 --- a/nova/tests/functional/test_server_group.py +++ b/nova/tests/functional/test_server_group.py @@ -25,7 +25,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture from nova import utils from nova.virt import fake @@ -61,7 +60,7 @@ class ServerGroupTestBase(test.TestCase, self.flags(weight_classes=self._get_weight_classes(), group='filter_scheduler') - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) @@ -951,7 +950,7 @@ class TestAntiAffinityLiveMigration(test.TestCase, def setUp(self): super(TestAntiAffinityLiveMigration, self).setUp() # Setup common fixtures. - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/test_servers.py b/nova/tests/functional/test_servers.py index e189d86a7107..710597add376 100644 --- a/nova/tests/functional/test_servers.py +++ b/nova/tests/functional/test_servers.py @@ -1354,7 +1354,7 @@ class ServerRebuildTestCase(integrated_helpers._IntegratedTestBase): 'imageRef': rebuild_image_ref } } - # Since we're using the CastAsCall fixture, the NoValidHost error + # Since we're using CastAsCallFixture, the NoValidHost error # should actually come back to the API and result in a 500 error. # Normally the user would get a 202 response because nova-api RPC casts # to nova-conductor which RPC calls the scheduler which raises the @@ -1374,9 +1374,9 @@ class ServerRebuildTestCase(integrated_helpers._IntegratedTestBase): self.assertIn('No valid host', server['fault']['message']) # Rebuild it again with the same bad image to make sure it's rejected - # again. Since we're using CastAsCall here, there is no 202 from the - # API, and the exception from conductor gets passed back through the - # API. + # again. Since we're using CastAsCallFixture here, there is no 202 from + # the API, and the exception from conductor gets passed back through + # the API. ex = self.assertRaises( client.OpenStackApiException, self.api.api_post, '/servers/%s/action' % server['id'], rebuild_req_body) diff --git a/nova/tests/functional/test_service.py b/nova/tests/functional/test_service.py index 5e6a649d4092..65b41594bdbb 100644 --- a/nova/tests/functional/test_service.py +++ b/nova/tests/functional/test_service.py @@ -19,7 +19,6 @@ from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class ServiceTestCase(test.TestCase, @@ -30,7 +29,7 @@ class ServiceTestCase(test.TestCase, def setUp(self): super(ServiceTestCase, self).setUp() # Use the standard fixtures. - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(func_fixtures.PlacementFixture()) diff --git a/nova/tests/functional/wsgi/test_flavor_manage.py b/nova/tests/functional/wsgi/test_flavor_manage.py index ad581ee9c09d..ae2607c8034a 100644 --- a/nova/tests/functional/wsgi/test_flavor_manage.py +++ b/nova/tests/functional/wsgi/test_flavor_manage.py @@ -22,7 +22,6 @@ from nova import objects from nova import test from nova.tests import fixtures as nova_fixtures from nova.tests.functional import integrated_helpers as helper -from nova.tests.unit import policy_fixture def rand_flavor(**kwargs): @@ -89,7 +88,7 @@ class FlavorManageFullstack(testscenarios.WithScenarios, test.TestCase): for fix in self._additional_fixtures: self.useFixture(fix()) - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) api_fixture = self.useFixture( nova_fixtures.OSAPIFixture( api_version=self.api_major_version)) diff --git a/nova/tests/functional/wsgi/test_secgroup.py b/nova/tests/functional/wsgi/test_secgroup.py index 24c92507acb6..02b22eab03c9 100644 --- a/nova/tests/functional/wsgi/test_secgroup.py +++ b/nova/tests/functional/wsgi/test_secgroup.py @@ -17,7 +17,6 @@ import testscenarios from nova import test from nova.tests import fixtures as nova_fixtures -from nova.tests.unit import policy_fixture LOG = logging.getLogger(__name__) @@ -44,7 +43,7 @@ class SecgroupsFullstack(testscenarios.WithScenarios, test.TestCase): def setUp(self): super(SecgroupsFullstack, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.GlanceFixture(self)) api_fixture = self.useFixture(nova_fixtures.OSAPIFixture()) diff --git a/nova/tests/functional/wsgi/test_servers.py b/nova/tests/functional/wsgi/test_servers.py index de0d982bb005..5ae088798b12 100644 --- a/nova/tests/functional/wsgi/test_servers.py +++ b/nova/tests/functional/wsgi/test_servers.py @@ -17,7 +17,6 @@ from nova.tests import fixtures as nova_fixtures from nova.tests.functional.api import client as api_client from nova.tests.functional import fixtures as func_fixtures from nova.tests.functional import integrated_helpers -from nova.tests.unit import policy_fixture class ServersPreSchedulingTestCase(test.TestCase, @@ -40,7 +39,7 @@ class ServersPreSchedulingTestCase(test.TestCase, def setUp(self): super(ServersPreSchedulingTestCase, self).setUp() - self.useFixture(policy_fixture.RealPolicyFixture()) + self.useFixture(nova_fixtures.RealPolicyFixture()) self.useFixture(nova_fixtures.NoopConductorFixture()) self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) @@ -267,8 +266,8 @@ class ServersPreSchedulingTestCase(test.TestCase, } }) - # Since _IntegratedTestBase uses the CastAsCall fixture, when we - # get the server back we know all of the volume stuff should be done. + # Since _IntegratedTestBase uses the CastAsCallFixture, when we get the + # server back we know all of the volume stuff should be done. self.assertIn(volume_id, cinder.volume_ids_for_instance(server['id'])) @@ -324,7 +323,7 @@ class EnforceVolumeBackedForZeroDiskFlavorTestCase( self.glance = self.useFixture(nova_fixtures.GlanceFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self)) self.policy_fixture = ( - self.useFixture(policy_fixture.RealPolicyFixture())) + self.useFixture(nova_fixtures.RealPolicyFixture())) api_fixture = self.useFixture(nova_fixtures.OSAPIFixture( api_version='v2.1')) diff --git a/nova/tests/unit/api/openstack/compute/test_server_groups.py b/nova/tests/unit/api/openstack/compute/test_server_groups.py index e7626ee73315..e33ca8a87605 100644 --- a/nova/tests/unit/api/openstack/compute/test_server_groups.py +++ b/nova/tests/unit/api/openstack/compute/test_server_groups.py @@ -28,7 +28,6 @@ from nova.policies import server_groups as sg_policies from nova import test from nova.tests import fixtures from nova.tests.unit.api.openstack import fakes -from nova.tests.unit import policy_fixture class AttrDict(dict): @@ -91,7 +90,7 @@ class ServerGroupTestV21(test.NoDBTestCase): self.req = fakes.HTTPRequest.blank('') self.admin_req = fakes.HTTPRequest.blank('', use_admin_context=True) self.foo_req = fakes.HTTPRequest.blank('', project_id='foo') - self.policy = self.useFixture(policy_fixture.RealPolicyFixture()) + self.policy = self.useFixture(fixtures.RealPolicyFixture()) self.useFixture(fixtures.Database(database='api')) cells = fixtures.CellDatabases() diff --git a/nova/tests/unit/cmd/test_policy.py b/nova/tests/unit/cmd/test_policy.py index a84aef362d00..4f44c9fffcf5 100644 --- a/nova/tests/unit/cmd/test_policy.py +++ b/nova/tests/unit/cmd/test_policy.py @@ -30,8 +30,8 @@ from nova import exception from nova.policies import base as base_policies from nova.policies import instance_actions as ia_policies from nova import test +from nova.tests import fixtures as nova_fixtures from nova.tests.unit import fake_instance -from nova.tests.unit import policy_fixture CONF = nova.conf.CONF @@ -42,7 +42,7 @@ class TestPolicyCheck(test.NoDBTestCase): super(TestPolicyCheck, self).setUp() self.output = StringIO() self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.output)) - self.policy = self.useFixture(policy_fixture.RealPolicyFixture()) + self.policy = self.useFixture(nova_fixtures.RealPolicyFixture()) self.cmd = policy.PolicyCommands() @mock.patch.object(policy.PolicyCommands, '_filter_rules') diff --git a/nova/tests/unit/cmd/test_status.py b/nova/tests/unit/cmd/test_status.py index f27e7ce88dfe..d0343212f256 100644 --- a/nova/tests/unit/cmd/test_status.py +++ b/nova/tests/unit/cmd/test_status.py @@ -43,7 +43,6 @@ from nova.objects import service from nova import policy from nova import test from nova.tests import fixtures as nova_fixtures -from nova.tests.unit import policy_fixture CONF = nova.conf.CONF @@ -433,7 +432,7 @@ class TestUpgradeCheckPolicy(test.NoDBTestCase): self.cmd._check_policy().code) def test_policy_checks_with_fresh_init_and_no_policy_override(self): - self.policy = self.useFixture(policy_fixture.OverridePolicyFixture( + self.policy = self.useFixture(nova_fixtures.OverridePolicyFixture( rules_in_file={})) policy.reset() self.assertEqual(upgradecheck.Code.SUCCESS, diff --git a/nova/tests/unit/conductor/test_conductor.py b/nova/tests/unit/conductor/test_conductor.py index 30c1f9861d2a..3d5cdc290569 100644 --- a/nova/tests/unit/conductor/test_conductor.py +++ b/nova/tests/unit/conductor/test_conductor.py @@ -54,7 +54,6 @@ from nova.scheduler import utils as scheduler_utils from nova import test from nova.tests import fixtures from nova.tests.unit.api.openstack import fakes -from nova.tests.unit import cast_as_call from nova.tests.unit.compute import test_compute from nova.tests.unit import fake_build_request from nova.tests.unit import fake_instance @@ -486,7 +485,7 @@ class _BaseTaskTestCase(object): 'hosts': [['host2', 'node2']]}} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) mock_getaz.return_value = 'myaz' mock_create_bind_arqs.return_value = mock.sentinel @@ -581,7 +580,7 @@ class _BaseTaskTestCase(object): mock_schedule.return_value = sched_return # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) mock_getaz.return_value = 'myaz' mock_create_bind_arqs.side_effect = ( @@ -645,7 +644,7 @@ class _BaseTaskTestCase(object): updates = {'vm_state': vm_states.ERROR, 'task_state': None} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) self.conductor.build_instances( self.context, @@ -689,7 +688,7 @@ class _BaseTaskTestCase(object): set_vm_state_and_notify, cleanup_mock): # build_instances() is a cast, we need to wait for it to # complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) populate_retry.side_effect = exc.MaxRetriesExceeded( reason="Too many try") @@ -736,7 +735,7 @@ class _BaseTaskTestCase(object): updates = {'vm_state': vm_states.ERROR, 'task_state': None} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) self.conductor.build_instances( context=self.context, @@ -779,7 +778,7 @@ class _BaseTaskTestCase(object): image = {'fake-data': 'should_pass_silently'} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) with mock.patch.object(self.conductor_manager.compute_rpcapi, 'build_and_run_instance'): @@ -808,7 +807,7 @@ class _BaseTaskTestCase(object): image = {'fake-data': 'should_pass_silently'} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) self.conductor.build_instances( context=self.context, @@ -845,7 +844,7 @@ class _BaseTaskTestCase(object): image = {'fake-data': 'should_pass_silently'} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) with mock.patch.object(self.conductor_manager.compute_rpcapi, 'build_and_run_instance'): self.conductor.build_instances(context=self.context, @@ -884,7 +883,7 @@ class _BaseTaskTestCase(object): image = {'fake-data': 'should_pass_silently'} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) with mock.patch.object(self.conductor_manager.compute_rpcapi, 'build_and_run_instance'): @@ -933,7 +932,7 @@ class _BaseTaskTestCase(object): image = {'fake-data': 'should_pass_silently'} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) with mock.patch.object(self.conductor_manager.compute_rpcapi, 'build_and_run_instance'): @@ -977,7 +976,7 @@ class _BaseTaskTestCase(object): image = {'fake-data': 'should_pass_silently'} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) @mock.patch.object(self.conductor_manager.compute_rpcapi, 'build_and_run_instance', new=mock.MagicMock()) @@ -1018,7 +1017,7 @@ class _BaseTaskTestCase(object): image = {'fake-data': 'should_pass_silently'} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) @mock.patch.object(self.conductor_manager.compute_rpcapi, 'build_and_run_instance') @@ -1082,7 +1081,7 @@ class _BaseTaskTestCase(object): image = {'fake-data': 'should_pass_silently'} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) @mock.patch('nova.scheduler.utils.' 'fill_provider_mapping') @@ -1159,7 +1158,7 @@ class _BaseTaskTestCase(object): image = {'fake-data': 'should_pass_silently'} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) @mock.patch('nova.scheduler.utils.' 'fill_provider_mapping') @@ -1356,7 +1355,7 @@ class _BaseTaskTestCase(object): host = {'host': 'host1', 'nodename': 'node1', 'limits': {}} # unshelve_instance() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) @mock.patch.object(objects.InstanceMapping, 'get_by_instance_uuid') @mock.patch.object(self.conductor_manager.compute_rpcapi, @@ -1889,7 +1888,7 @@ class _BaseTaskTestCase(object): sig_mock.side_effect = exception # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) # Create the migration record (normally created by the compute API). migration = objects.Migration(self.context, @@ -3665,7 +3664,7 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase): 'hosts': [['host2', 'node2']]}} # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) self.conductor.build_instances(self.context, instances=instances, @@ -3729,7 +3728,7 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase): build_and_run_instance, get_buildreq): # build_instances() is a cast, we need to wait for it to complete - self.useFixture(cast_as_call.CastAsCall(self)) + self.useFixture(fixtures.CastAsCallFixture(self)) self.conductor.build_instances(self.context, instances=instances, diff --git a/nova/tests/unit/policies/base.py b/nova/tests/unit/policies/base.py index 77c390c3a780..59fb6f6dd9d3 100644 --- a/nova/tests/unit/policies/base.py +++ b/nova/tests/unit/policies/base.py @@ -9,6 +9,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + import copy from oslo_log import log as logging @@ -17,7 +18,7 @@ from oslo_utils.fixture import uuidsentinel as uuids from nova import context as nova_context from nova import exception from nova import test -from nova.tests.unit import policy_fixture +from nova.tests import fixtures LOG = logging.getLogger(__name__) @@ -40,7 +41,7 @@ class BasePolicyTest(test.TestCase): def setUp(self): super(BasePolicyTest, self).setUp() - self.policy = self.useFixture(policy_fixture.RealPolicyFixture()) + self.policy = self.useFixture(fixtures.RealPolicyFixture()) self.admin_project_id = uuids.admin_project_id self.project_id = uuids.project_id diff --git a/nova/tests/unit/policies/test_attach_interfaces.py b/nova/tests/unit/policies/test_attach_interfaces.py index 87da6d3fe097..05f62d5cf06f 100644 --- a/nova/tests/unit/policies/test_attach_interfaces.py +++ b/nova/tests/unit/policies/test_attach_interfaces.py @@ -20,10 +20,10 @@ from nova.compute import vm_states from nova import exception from nova.policies import attach_interfaces as ai_policies from nova.policies import base as base_policy +from nova.tests import fixtures as nova_fixtures from nova.tests.unit.api.openstack import fakes from nova.tests.unit import fake_instance from nova.tests.unit.policies import base -from nova.tests.unit import policy_fixture class AttachInterfacesPolicyTest(base.BasePolicyTest): @@ -166,7 +166,7 @@ class AttachInterfacesDeprecatedPolicyTest(base.BasePolicyTest): # Oslo.policy will consider the overridden rules if: # 1. overridden deprecated rule's checks are different than defaults # 2. new rules are not present in policy file - self.policy = self.useFixture(policy_fixture.OverridePolicyFixture( + self.policy = self.useFixture(nova_fixtures.OverridePolicyFixture( rules_in_file=override_rules)) @mock.patch('nova.compute.api.API.get') diff --git a/nova/tests/unit/policies/test_instance_actions.py b/nova/tests/unit/policies/test_instance_actions.py index 7f84c02178b2..b3e43b3498d9 100644 --- a/nova/tests/unit/policies/test_instance_actions.py +++ b/nova/tests/unit/policies/test_instance_actions.py @@ -25,12 +25,12 @@ from nova import exception from nova.policies import base as base_policy from nova.policies import instance_actions as ia_policies from nova import policy +from nova.tests import fixtures as nova_fixtures from nova.tests.unit.api.openstack.compute import test_instance_actions from nova.tests.unit.api.openstack import fakes from nova.tests.unit import fake_instance from nova.tests.unit import fake_server_actions from nova.tests.unit.policies import base -from nova.tests.unit import policy_fixture FAKE_UUID = fake_server_actions.FAKE_UUID FAKE_REQUEST_ID = fake_server_actions.FAKE_REQUEST_ID1 @@ -178,7 +178,7 @@ class InstanceActionsDeprecatedPolicyTest(base.BasePolicyTest): # Oslo.policy will consider the overridden rules if: # 1. overridden deprecated rule's checks are different than defaults # 2. new rules are not present in policy file - self.policy = self.useFixture(policy_fixture.OverridePolicyFixture( + self.policy = self.useFixture(nova_fixtures.OverridePolicyFixture( rules_in_file=override_rules)) @mock.patch('nova.compute.api.InstanceActionAPI.actions_get') diff --git a/nova/tests/unit/policies/test_services.py b/nova/tests/unit/policies/test_services.py index 7975ee19dd86..cdca5ebc7f77 100644 --- a/nova/tests/unit/policies/test_services.py +++ b/nova/tests/unit/policies/test_services.py @@ -16,9 +16,9 @@ import mock from nova.api.openstack.compute import services as services_v21 from nova import exception from nova.policies import base as base_policy +from nova.tests import fixtures from nova.tests.unit.api.openstack import fakes from nova.tests.unit.policies import base -from nova.tests.unit import policy_fixture class ServicesPolicyTest(base.BasePolicyTest): @@ -178,7 +178,7 @@ class ServicesDeprecatedPolicyTest(base.BasePolicyTest): # Oslo.policy will consider the overridden rules if: # 1. overridden deprecated rule's checks are different than defaults # 2. new rules are not present in policy file - self.policy = self.useFixture(policy_fixture.OverridePolicyFixture( + self.policy = self.useFixture(fixtures.OverridePolicyFixture( rules_in_file=override_rules)) def test_deprecated_policy_overridden_rule_is_checked(self): diff --git a/nova/tests/unit/test_policy.py b/nova/tests/unit/test_policy.py index 8239b62e0082..f6f5c3e64b34 100644 --- a/nova/tests/unit/test_policy.py +++ b/nova/tests/unit/test_policy.py @@ -27,8 +27,8 @@ from nova import exception from nova.policies import servers as servers_policy from nova import policy from nova import test +from nova.tests import fixtures as nova_fixtures from nova.tests.unit import fake_policy -from nova.tests.unit import policy_fixture from nova import utils @@ -285,7 +285,7 @@ class IsAdminCheckTestCase(test.NoDBTestCase): class AdminRolePolicyTestCase(test.NoDBTestCase): def setUp(self): super(AdminRolePolicyTestCase, self).setUp() - self.policy = self.useFixture(policy_fixture.RoleBasedPolicyFixture()) + self.policy = self.useFixture(nova_fixtures.RoleBasedPolicyFixture()) self.context = context.RequestContext('fake', 'fake', roles=['member']) self.actions = policy.get_rules().keys() self.target = {} @@ -302,7 +302,7 @@ class AdminRolePolicyTestCase(test.NoDBTestCase): class RealRolePolicyTestCase(test.NoDBTestCase): def setUp(self): super(RealRolePolicyTestCase, self).setUp() - self.policy = self.useFixture(policy_fixture.RealPolicyFixture()) + self.policy = self.useFixture(nova_fixtures.RealPolicyFixture()) self.non_admin_context = context.RequestContext('fake', 'fake', roles=['member']) self.admin_context = context.RequestContext('fake', 'fake', True,