tests: Move remaining non-libvirt fixtures

Move these to the central place. There's a large amount of test damage
but it's pretty trivial.

Change-Id: If581eb7aa463c9dde13714f34f0f1b41549a7130
Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

nova/test.py

@@ -63,7 +63,6 @@
 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 @@ def setUp(self):
 
         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())
 

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

nova/tests/functional/api_paste_fixture.py renamed to nova/tests/fixtures/api_paste.py

@@ -11,14 +11,14 @@
 # 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
 
 import nova.conf
 from nova.conf import paths
 
-
 CONF = nova.conf.CONF
 
 

nova/tests/unit/cast_as_call.py renamed to nova/tests/fixtures/cast_as_call.py

@@ -18,7 +18,7 @@
 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 @@ def prepare(self, *args, **kwargs):
             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 @@ def prepare(self, *args, **kwargs):
                               messaging.RPCClient.call)
 
     def setUp(self):
-        super(CastAsCall, self).setUp()
+        super().setUp()
         self._stub_out(self.testcase)

nova/tests/unit/policy_fixture.py renamed to 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))
 
     """

nova/tests/functional/api_sample_tests/api_sample_base.py

@@ -18,7 +18,7 @@
 
 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

nova/tests/functional/integrated_helpers.py

@@ -40,9 +40,7 @@
 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 @@ def setUp(self):
         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

nova/tests/functional/libvirt/test_numa_live_migration.py

@@ -620,9 +620,8 @@ def test_insufficient_resources(self):
         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 @@ def test_different_page_sizes(self):
         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,

nova/tests/functional/libvirt/test_numa_servers.py

@@ -1193,8 +1193,8 @@ def test_attach_interface_with_network_affinity_violation(self):
         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))
 

nova/tests/functional/libvirt/test_pci_sriov_servers.py

@@ -322,8 +322,8 @@ def test_live_migrate_server_with_PF(self):
             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 @@ def test_live_migrate_server_with_VF(self):
             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 @@ def test_live_migrate_server_with_pci(self):
             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))
 

nova/tests/functional/regressions/test_bug_1522536.py

@@ -15,16 +15,14 @@
 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):
     REQUIRES_LOCKING = True
 
     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 @@ def setUp(self):
         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']

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(

nova/tests/functional/regressions/test_bug_1548980.py

@@ -17,19 +17,17 @@
 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):
     REQUIRES_LOCKING = True
 
     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.

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'))
 

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 @@ def test_forbidden_cinder_operation_returns_403(self, mock_cinder):
 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'))
 

nova/tests/functional/regressions/test_bug_1558866.py

@@ -17,14 +17,13 @@
 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(

nova/tests/functional/regressions/test_bug_1595962.py

@@ -21,8 +21,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.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 @@ def setUp(self):
         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']

nova/tests/functional/regressions/test_bug_1620248.py

@@ -12,16 +12,14 @@
 
 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):
     REQUIRES_LOCKING = True
 
     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 @@ def setUp(self):
 
         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']