move all tests to nova/tests/unit

As part of the split of functional and unit tests we need to isolate
the unit tests into a separate directory for having multiple test
targets in a sane way.

Part of bp:functional-tests-for-nova

Change-Id: Id42ba373c1bda6a312b673ab2b489ca56da8c628

nova/test.py

@@ -54,8 +54,8 @@ from nova.openstack.common import log as nova_logging
 from nova import paths
 from nova import rpc
 from nova import service
-from nova.tests import conf_fixture
-from nova.tests import policy_fixture
+from nova.tests.unit import conf_fixture
+from nova.tests.unit import policy_fixture
 from nova import utils
 
 

nova/tests/__init__.py

@@ -1,49 +0,0 @@
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-:mod:`nova.tests` -- Nova Unittests
-=====================================================
-
-.. automodule:: nova.tests
-   :platform: Unix
-"""
-
-# TODO(mikal): move eventlet imports to nova.__init__ once we move to PBR
-import os
-import sys
-import traceback
-
-
-# NOTE(mikal): All of this is because if dnspython is present in your
-# environment then eventlet monkeypatches socket.getaddrinfo() with an
-# implementation which doesn't work for IPv6. What we're checking here is
-# that the magic environment variable was set when the import happened.
-# NOTE(dims): Prevent this code from kicking in under docs generation
-# as it leads to spurious errors/warning.
-stack = traceback.extract_stack()
-if ('eventlet' in sys.modules and
-    os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes' and
-    (len(stack) < 2 or 'sphinx' not in stack[-2][0])):
-    raise ImportError('eventlet imported before nova/cmd/__init__ '
-                      '(env var set to %s)'
-                      % os.environ.get('EVENTLET_NO_GREENDNS'))
-
-os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
-
-import eventlet
-
-eventlet.monkey_patch(os=False)

nova/tests/unit/__init__.py

@@ -0,0 +1,49 @@
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+:mod:`nova.tests.unit` -- Nova Unittests
+=====================================================
+
+.. automodule:: nova.tests.unit
+   :platform: Unix
+"""
+
+# TODO(mikal): move eventlet imports to nova.__init__ once we move to PBR
+import os
+import sys
+import traceback
+
+
+# NOTE(mikal): All of this is because if dnspython is present in your
+# environment then eventlet monkeypatches socket.getaddrinfo() with an
+# implementation which doesn't work for IPv6. What we're checking here is
+# that the magic environment variable was set when the import happened.
+# NOTE(dims): Prevent this code from kicking in under docs generation
+# as it leads to spurious errors/warning.
+stack = traceback.extract_stack()
+if ('eventlet' in sys.modules and
+    os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes' and
+    (len(stack) < 2 or 'sphinx' not in stack[-2][0])):
+    raise ImportError('eventlet imported before nova/cmd/__init__ '
+                      '(env var set to %s)'
+                      % os.environ.get('EVENTLET_NO_GREENDNS'))
+
+os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
+
+import eventlet
+
+eventlet.monkey_patch(os=False)

nova/tests/unit/api/ec2/test_api.py

@@ -40,7 +40,7 @@ from nova import context
 from nova import exception
 from nova.openstack.common import versionutils
 from nova import test
-from nova.tests import matchers
+from nova.tests.unit import matchers
 
 
 class FakeHttplibSocket(object):

nova/tests/unit/api/ec2/test_cinder_cloud.py

@@ -32,12 +32,12 @@ from nova import db
 from nova import exception
 from nova import objects
 from nova import test
-from nova.tests import cast_as_call
-from nova.tests import fake_network
-from nova.tests import fake_notifier
-from nova.tests import fake_utils
-from nova.tests.image import fake
-from nova.tests import matchers
+from nova.tests.unit import cast_as_call
+from nova.tests.unit import fake_network
+from nova.tests.unit import fake_notifier
+from nova.tests.unit import fake_utils
+from nova.tests.unit.image import fake
+from nova.tests.unit import matchers
 from nova import volume
 
 CONF = cfg.CONF
@@ -95,7 +95,7 @@ class CinderCloudTestCase(test.TestCase):
         self.useFixture(fixtures.TempDir()).path
         fake_utils.stub_out_utils_spawn_n(self.stubs)
         self.flags(compute_driver='nova.virt.fake.FakeDriver',
-                   volume_api_class='nova.tests.fake_volume.API')
+                   volume_api_class='nova.tests.unit.fake_volume.API')
 
         def fake_show(meh, context, id, **kwargs):
             return {'id': id,

nova/tests/unit/api/ec2/test_cloud.py

@@ -55,15 +55,15 @@ from nova.openstack.common import policy as common_policy
 from nova.openstack.common import uuidutils
 from nova import policy
 from nova import test
-from nova.tests.api.openstack.compute.contrib import (
+from nova.tests.unit.api.openstack.compute.contrib import (
     test_neutron_security_groups as test_neutron)
-from nova.tests import cast_as_call
-from nova.tests import fake_block_device
-from nova.tests import fake_network
-from nova.tests import fake_notifier
-from nova.tests import fake_utils
-from nova.tests.image import fake
-from nova.tests import matchers
+from nova.tests.unit import cast_as_call
+from nova.tests.unit import fake_block_device
+from nova.tests.unit import fake_network
+from nova.tests.unit import fake_notifier
+from nova.tests.unit import fake_utils
+from nova.tests.unit.image import fake
+from nova.tests.unit import matchers
 from nova import utils
 from nova.virt import fake as fake_virt
 from nova import volume
@@ -141,7 +141,7 @@ class CloudTestCase(test.TestCase):
         self.useFixture(test.SampleNetworks())
         ec2utils.reset_cache()
         self.flags(compute_driver='nova.virt.fake.FakeDriver',
-                   volume_api_class='nova.tests.fake_volume.API')
+                   volume_api_class='nova.tests.unit.fake_volume.API')
         self.useFixture(fixtures.FakeLogger('boto'))
         fake_utils.stub_out_utils_spawn_n(self.stubs)
 

nova/tests/unit/api/ec2/test_ec2_validate.py

@@ -26,10 +26,10 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests import cast_as_call
-from nova.tests import fake_network
-from nova.tests import fake_notifier
-from nova.tests.image import fake
+from nova.tests.unit import cast_as_call
+from nova.tests.unit import fake_network
+from nova.tests.unit import fake_notifier
+from nova.tests.unit.image import fake
 
 CONF = cfg.CONF
 CONF.import_opt('compute_driver', 'nova.virt.driver')

nova/tests/unit/api/openstack/compute/contrib/test_admin_actions.py

@@ -27,8 +27,8 @@ from nova import exception
 from nova import objects
 from nova.openstack.common import uuidutils
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 
 class CommonMixin(object):

nova/tests/unit/api/openstack/compute/contrib/test_admin_password.py

@@ -21,7 +21,7 @@ from nova.api.openstack.compute.plugins.v3 import admin_password \
 from nova.compute import api as compute_api
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 def fake_get(self, context, id, expected_attrs=None, want_objects=False):

nova/tests/unit/api/openstack/compute/contrib/test_aggregates.py

@@ -23,8 +23,8 @@ from nova.api.openstack.compute.plugins.v3 import aggregates as aggregates_v21
 from nova import context
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import matchers
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import matchers
 
 AGGREGATE_LIST = [
         {"name": "aggregate1", "id": "1", "availability_zone": "nova1"},

nova/tests/unit/api/openstack/compute/contrib/test_attach_interfaces.py

@@ -27,7 +27,7 @@ from nova import exception
 from nova.network import api as network_api
 from nova import objects
 from nova import test
-from nova.tests import fake_network_cache_model
+from nova.tests.unit import fake_network_cache_model
 
 import webob
 from webob import exc

nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py

@@ -33,11 +33,11 @@ from nova import db
 from nova import exception
 from nova import servicegroup
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
-from nova.tests.image import fake
-from nova.tests import matchers
-from nova.tests.objects import test_service
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
+from nova.tests.unit.image import fake
+from nova.tests.unit import matchers
+from nova.tests.unit.objects import test_service
 
 FAKE_UUID = fakes.FAKE_UUID
 

nova/tests/unit/api/openstack/compute/contrib/test_baremetal_nodes.py

@@ -22,7 +22,7 @@ from nova.api.openstack.compute.plugins.v3 import baremetal_nodes \
 from nova.api.openstack import extensions
 from nova import context
 from nova import test
-from nova.tests.virt.ironic import utils as ironic_utils
+from nova.tests.unit.virt.ironic import utils as ironic_utils
 
 
 class FakeRequest(object):

nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping.py

@@ -29,9 +29,9 @@ from nova.compute import api as compute_api
 from nova import exception
 from nova import objects
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests.image import fake
-from nova.tests import matchers
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit.image import fake
+from nova.tests.unit import matchers
 
 CONF = cfg.CONF
 

nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py

@@ -28,8 +28,8 @@ from nova.api.openstack.compute import servers as servers_v2
 from nova.compute import api as compute_api
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests.image import fake
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit.image import fake
 
 CONF = cfg.CONF
 

nova/tests/unit/api/openstack/compute/contrib/test_cells.py

@@ -28,8 +28,8 @@ from nova import context
 from nova import exception
 from nova import rpc
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import utils
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import utils
 
 
 class BaseCellsTest(test.NoDBTestCase):

nova/tests/unit/api/openstack/compute/contrib/test_certificates.py

@@ -28,7 +28,7 @@ from nova import exception
 from nova.openstack.common import policy as common_policy
 from nova import policy
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 class CertificatesTestV21(test.NoDBTestCase):

nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py

@@ -26,9 +26,9 @@ from nova.api.openstack import wsgi
 from nova.compute import utils as compute_utils
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_network
-from nova.tests import matchers
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_network
+from nova.tests.unit import matchers
 from nova import utils
 
 CONF = cfg.CONF

nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe_update.py

@@ -19,8 +19,8 @@ from nova.api.openstack.compute.plugins.v3 import cloudpipe as clup_v21
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_network
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_network
 
 
 fake_networks = [fake_network.fake_network(1),

nova/tests/unit/api/openstack/compute/contrib/test_config_drive.py

@@ -31,9 +31,9 @@ from nova.compute import flavors
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
-from nova.tests.image import fake
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
+from nova.tests.unit.image import fake
 
 
 CONF = cfg.CONF

nova/tests/unit/api/openstack/compute/contrib/test_console_auth_tokens.py

@@ -20,7 +20,7 @@ import webob
 from nova.consoleauth import rpcapi as consoleauth_rpcapi
 from nova import context
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 CONF = cfg.CONF
 CONF.import_opt('osapi_compute_ext_list', 'nova.api.openstack.compute.contrib')

nova/tests/unit/api/openstack/compute/contrib/test_console_output.py

@@ -20,8 +20,8 @@ from oslo.serialization import jsonutils
 from nova.compute import api as compute_api
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 
 def fake_get_console_output(self, _context, _instance, tail_length):

nova/tests/unit/api/openstack/compute/contrib/test_consoles.py

@@ -20,7 +20,7 @@ import webob
 from nova.compute import api as compute_api
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 def fake_get_vnc_console(self, _context, _instance, _console_type):

nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py

@@ -23,7 +23,7 @@ from nova.compute import api as compute_api
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 FAKE_UUID = fakes.FAKE_UUID
 

nova/tests/unit/api/openstack/compute/contrib/test_deferred_delete.py

@@ -22,7 +22,7 @@ from nova.compute import api as compute_api
 from nova import context
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 class FakeRequest(object):

nova/tests/unit/api/openstack/compute/contrib/test_disk_config.py

@@ -22,9 +22,9 @@ from nova.compute import api as compute_api
 from nova import db
 from nova import objects
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
-import nova.tests.image.fake
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
+import nova.tests.unit.image.fake
 
 
 MANUAL_INSTANCE_UUID = fakes.FAKE_UUID
@@ -137,7 +137,7 @@ class DiskConfigTestCaseV21(test.TestCase):
                 ' not one of [\'AUTO\', \'MANUAL\']", "code": 400}}}}')
 
     def _setup_fake_image_service(self):
-        self.image_service = nova.tests.image.fake.stub_out_image_service(
+        self.image_service = nova.tests.unit.image.fake.stub_out_image_service(
                 self.stubs)
         timestamp = datetime.datetime(2011, 1, 1, 1, 2, 3)
         image = {'id': '88580842-f50a-11e2-8d3a-f23c91aec05e',
@@ -156,7 +156,7 @@ class DiskConfigTestCaseV21(test.TestCase):
 
     def tearDown(self):
         super(DiskConfigTestCaseV21, self).tearDown()
-        nova.tests.image.fake.FakeImageService_reset()
+        nova.tests.unit.image.fake.FakeImageService_reset()
 
     def assertDiskConfig(self, dict_, value):
         self.assertIn(API_DISK_CONFIG, dict_)

nova/tests/unit/api/openstack/compute/contrib/test_evacuate.py

@@ -23,8 +23,8 @@ from nova.compute import vm_states
 from nova import context
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 
 CONF = cfg.CONF

nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py

@@ -26,8 +26,8 @@ from nova import exception
 from nova import objects
 from nova.objects import instance as instance_obj
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 UUID1 = '00000000-0000-0000-0000-000000000001'
 UUID2 = '00000000-0000-0000-0000-000000000002'

nova/tests/unit/api/openstack/compute/contrib/test_extended_evacuate_find_host.py

@@ -22,8 +22,8 @@ from nova.compute import vm_states
 from nova import context
 from nova.objects import instance as instance_obj
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 
 class ExtendedEvacuateFindHostTest(test.NoDBTestCase):

nova/tests/unit/api/openstack/compute/contrib/test_extended_hypervisors.py

@@ -23,8 +23,8 @@ from nova.api.openstack import extensions
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests.api.openstack.compute.contrib import test_hypervisors
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack.compute.contrib import test_hypervisors
+from nova.tests.unit.api.openstack import fakes
 
 
 def fake_compute_node_get(context, compute_id):

nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py

@@ -23,8 +23,8 @@ from nova import compute
 from nova import objects
 from nova.objects import instance as instance_obj
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 UUID1 = '00000000-0000-0000-0000-000000000001'
 UUID2 = '00000000-0000-0000-0000-000000000002'

nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py

@@ -23,8 +23,8 @@ from nova import compute
 from nova import objects
 from nova.objects import instance as instance_obj
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 UUID1 = '00000000-0000-0000-0000-000000000001'
 UUID2 = '00000000-0000-0000-0000-000000000002'

nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py

@@ -24,7 +24,7 @@ from nova import exception
 from nova import objects
 from nova.objects import instance as instance_obj
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 from oslo.config import cfg
 

nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py

@@ -24,8 +24,8 @@ from nova import exception
 from nova import objects
 from nova.objects import instance as instance_obj
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 UUID1 = '00000000-0000-0000-0000-000000000001'
 UUID2 = '00000000-0000-0000-0000-000000000002'

nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py

@@ -22,7 +22,7 @@ from nova.api.openstack import wsgi
 from nova import compute
 from nova import network
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'

nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py

@@ -23,9 +23,9 @@ from nova import db
 from nova import objects
 from nova.objects import instance as instance_obj
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_block_device
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_block_device
+from nova.tests.unit import fake_instance
 
 UUID1 = '00000000-0000-0000-0000-000000000001'
 UUID2 = '00000000-0000-0000-0000-000000000002'

nova/tests/unit/api/openstack/compute/contrib/test_fixed_ips.py

@@ -21,8 +21,8 @@ from nova import db
 from nova import exception
 from nova.i18n import _
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests.objects import test_network
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit.objects import test_network
 
 
 fake_fixed_ips = [{'id': 1,

nova/tests/unit/api/openstack/compute/contrib/test_flavor_access.py

@@ -27,7 +27,7 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 def generate_flavor(flavorid, ispublic):

nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py

@@ -19,7 +19,7 @@ import webob
 from nova.api.openstack.compute.contrib import flavor_disabled
 from nova.compute import flavors
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 FAKE_FLAVORS = {
     'flavor 1': {

nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py

@@ -28,7 +28,7 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 def fake_db_flavor(**updates):

nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py

@@ -18,7 +18,7 @@ import webob
 
 from nova.compute import flavors
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 FAKE_FLAVORS = {
     'flavor 1': {

nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py

@@ -18,7 +18,7 @@ import webob
 
 from nova.compute import flavors
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 FAKE_FLAVORS = {
     'flavor 1': {

nova/tests/unit/api/openstack/compute/contrib/test_flavorextradata.py

@@ -20,7 +20,7 @@ import webob
 
 from nova.compute import flavors
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 def fake_get_flavor_by_flavor_id(flavorid, ctxt=None):

nova/tests/unit/api/openstack/compute/contrib/test_flavors_extra_specs.py

@@ -23,8 +23,8 @@ from nova.api.openstack.compute.plugins.v3 import flavors_extraspecs \
 import nova.db
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests.objects import test_flavor
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit.objects import test_flavor
 
 
 def return_create_flavor_extra_specs(context, flavor_id, extra_specs):

nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_dns.py

@@ -27,7 +27,7 @@ from nova import db
 from nova import exception
 from nova import network
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 name = "arbitraryname"

nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_pools.py

@@ -21,7 +21,7 @@ from nova.api.openstack.compute.plugins.v3 import floating_ip_pools as\
 from nova import context
 from nova import network
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 def fake_get_floating_ip_pools(self, context):

nova/tests/unit/api/openstack/compute/contrib/test_floating_ips.py

@@ -31,8 +31,8 @@ from nova import db
 from nova import exception
 from nova import network
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_network
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_network
 
 
 FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'

nova/tests/unit/api/openstack/compute/contrib/test_floating_ips_bulk.py

@@ -22,7 +22,7 @@ from nova.api.openstack.compute.plugins.v3 import floating_ips_bulk as\
 from nova import context
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 CONF = cfg.CONF
 

nova/tests/unit/api/openstack/compute/contrib/test_fping.py

@@ -18,7 +18,7 @@ from nova.api.openstack.compute.contrib import fping
 from nova.api.openstack.compute.plugins.v3 import fping as fping_v21
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 import nova.utils
 
 

nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py

@@ -27,8 +27,8 @@ from nova import exception
 from nova import objects
 from nova.objects import instance as instance_obj
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 
 SENTINEL = object()

nova/tests/unit/api/openstack/compute/contrib/test_hosts.py

@@ -25,8 +25,8 @@ from nova import context as context_maker
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests import fake_hosts
-from nova.tests import utils
+from nova.tests.unit import fake_hosts
+from nova.tests.unit import utils
 
 
 def stub_service_get_all(context, disabled=None):

nova/tests/unit/api/openstack/compute/contrib/test_hypervisor_status.py

@@ -21,7 +21,7 @@ from nova.api.openstack.compute.plugins.v3 import hypervisors \
     as hypervisors_v21
 from nova.api.openstack import extensions
 from nova import test
-from nova.tests.api.openstack.compute.contrib import test_hypervisors
+from nova.tests.unit.api.openstack.compute.contrib import test_hypervisors
 
 TEST_HYPER = dict(test_hypervisors.TEST_HYPERS[0],
                   service=dict(id=1,

nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py

@@ -27,7 +27,7 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 TEST_HYPERS = [

nova/tests/unit/api/openstack/compute/contrib/test_image_size.py

@@ -20,7 +20,7 @@ import webob
 from nova.api.openstack.compute.contrib import image_size
 from nova.image import glance
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 NOW_API_FORMAT = "2010-10-11T10:30:22Z"
 IMAGES = [{

nova/tests/unit/api/openstack/compute/contrib/test_instance_actions.py

@@ -30,9 +30,9 @@ from nova import exception
 from nova.openstack.common import policy as common_policy
 from nova import policy
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
-from nova.tests import fake_server_actions
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
+from nova.tests.unit import fake_server_actions
 
 FAKE_UUID = fake_server_actions.FAKE_UUID
 FAKE_REQUEST_ID = fake_server_actions.FAKE_REQUEST_ID1

nova/tests/unit/api/openstack/compute/contrib/test_instance_usage_audit_log.py

@@ -22,8 +22,8 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests.objects import test_service
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit.objects import test_service
 from nova import utils
 
 

nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py

@@ -26,8 +26,8 @@ from nova.openstack.common import policy as common_policy
 from nova import policy
 from nova import quota
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests.objects import test_keypair
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit.objects import test_keypair
 
 
 QUOTAS = quota.QUOTAS

nova/tests/unit/api/openstack/compute/contrib/test_migrate_server.py

@@ -16,9 +16,9 @@
 from nova.api.openstack.compute.plugins.v3 import migrate_server
 from nova import exception
 from nova.openstack.common import uuidutils
-from nova.tests.api.openstack.compute.plugins.v3 import \
+from nova.tests.unit.api.openstack.compute.plugins.v3 import \
      admin_only_action_common
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 class MigrateServerTests(admin_only_action_common.CommonTests):

nova/tests/unit/api/openstack/compute/contrib/test_multinic.py

@@ -21,7 +21,7 @@ from nova import compute
 from nova import exception
 from nova import objects
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 UUID = '70f6db34-de8d-4fbd-aafb-4065bdfa6114'

nova/tests/unit/api/openstack/compute/contrib/test_networks.py

@@ -36,7 +36,7 @@ from nova import exception
 from nova.network import manager
 from nova import objects
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 import nova.utils
 
 CONF = cfg.CONF
@@ -433,7 +433,7 @@ class NetworksTestV21(test.NoDBTestCase):
         res_dict = self.controller.show(req, uuid)
         self.assertEqual(res_dict['network']['project_id'], 'fake')
 
-    @mock.patch('nova.tests.api.openstack.compute.contrib.test_networks.'
+    @mock.patch('nova.tests.unit.api.openstack.compute.contrib.test_networks.'
                 'FakeNetworkAPI.add_network_to_project',
                 side_effect=exception.NoMoreNetworks)
     def test_network_add_no_more_networks_fail(self, mock_add):
@@ -442,7 +442,7 @@ class NetworksTestV21(test.NoDBTestCase):
         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.add, req,
                           {'id': uuid})
 
-    @mock.patch('nova.tests.api.openstack.compute.contrib.test_networks.'
+    @mock.patch('nova.tests.unit.api.openstack.compute.contrib.test_networks.'
                 'FakeNetworkAPI.add_network_to_project',
                 side_effect=exception.NetworkNotFoundForUUID(uuid='fake_uuid'))
     def test_network_add_network_not_found_networks_fail(self, mock_add):

nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py

@@ -34,8 +34,8 @@ from nova.network.neutronv2 import api as neutron_api
 from nova.network.security_group import neutron_driver
 from nova.objects import instance as instance_obj
 from nova import test
-from nova.tests.api.openstack.compute.contrib import test_security_groups
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack.compute.contrib import test_security_groups
+from nova.tests.unit.api.openstack import fakes
 
 
 class TestNeutronSecurityGroupsTestCase(test.TestCase):

nova/tests/unit/api/openstack/compute/contrib/test_quota_classes.py

@@ -20,7 +20,7 @@ from nova.api.openstack.compute.contrib import quota_classes
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 def quota_set(class_name):

nova/tests/unit/api/openstack/compute/contrib/test_quotas.py

@@ -28,7 +28,7 @@ from nova import context as context_maker
 from nova import exception
 from nova import quota
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 def quota_set(id, include_server_group_quotas=True):

nova/tests/unit/api/openstack/compute/contrib/test_rescue.py

@@ -20,7 +20,7 @@ import webob
 from nova import compute
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 CONF = cfg.CONF
 CONF.import_opt('password_length', 'nova.utils')

nova/tests/unit/api/openstack/compute/contrib/test_scheduler_hints.py

@@ -27,9 +27,9 @@ import nova.compute.api
 from nova.compute import flavors
 from nova import db
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
-from nova.tests.image import fake
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
+from nova.tests.unit.image import fake
 
 
 UUID = fakes.FAKE_UUID

nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py

@@ -24,7 +24,7 @@ from nova.api.openstack import wsgi
 from nova import context
 import nova.db
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 CONF = cfg.CONF

nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py

@@ -34,9 +34,9 @@ from nova import objects
 from nova.objects import instance as instance_obj
 from nova import quota
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
-from nova.tests import utils
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
+from nova.tests.unit import utils
 
 CONF = cfg.CONF
 FAKE_UUID1 = 'a47ae74e-ab08-447f-8eee-ffd43fc46c16'

nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py

@@ -22,7 +22,7 @@ from nova.api.openstack import wsgi
 from nova.compute import api as compute_api
 from nova import exception
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 
 UUID = 'abc'

nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py

@@ -24,7 +24,7 @@ import nova.db
 from nova.openstack.common import uuidutils
 from nova import quota
 from nova import test
-from nova.tests.api.openstack import fakes
+from nova.tests.unit.api.openstack import fakes
 
 CONF = cfg.CONF
 

nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py

@@ -26,8 +26,8 @@ from nova import exception
 from nova import objects
 from nova.openstack.common import uuidutils
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import utils
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import utils
 
 FAKE_UUID1 = 'a47ae74e-ab08-447f-8eee-ffd43fc46c16'
 FAKE_UUID2 = 'c6e6430a-6563-4efa-9542-5e93c9e97d18'

nova/tests/unit/api/openstack/compute/contrib/test_server_password.py

@@ -21,8 +21,8 @@ import webob
 from nova.api.metadata import password
 from nova import compute
 from nova import test
-from nova.tests.api.openstack import fakes
-from nova.tests import fake_instance
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
 
 
 CONF = cfg.CONF