Merge "Switch to oslo.config fixture"

nova/tests/unit/conf_fixture.py

@@ -15,11 +15,10 @@
 #    under the License.
 
 from oslo.config import cfg
-
+from oslo.config import fixture as config_fixture
 
 from nova import config
 from nova import ipv6
-from nova.openstack.common.fixture import config as config_fixture
 from nova import paths
 from nova.tests.unit import utils
 

nova/tests/unit/virt/libvirt/test_imagebackend.py

@@ -23,12 +23,12 @@ import fixtures
 import mock
 from oslo.concurrency import lockutils
 from oslo.config import cfg
+from oslo.config import fixture as config_fixture
 from oslo.utils import units
 
 from nova import context
 from nova import exception
 from nova import keymgr
-from nova.openstack.common.fixture import config as config_fixture
 from nova.openstack.common import imageutils
 from nova.openstack.common import uuidutils
 from nova import test

nova/tests/unit/virt/xenapi/test_vm_utils.py

@@ -23,6 +23,7 @@ import mox
 from oslo.concurrency import lockutils
 from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo.config import fixture as config_fixture
 from oslo.utils import timeutils
 from oslo.utils import units
 import six
@@ -34,7 +35,6 @@ from nova import context
 from nova import exception
 from nova.i18n import _
 from nova import objects
-from nova.openstack.common.fixture import config as config_fixture
 from nova import test
 from nova.tests.unit.objects import test_flavor
 from nova.tests.unit.virt.xenapi import stubs

nova/tests/unit/virt/xenapi/test_xenapi.py

@@ -26,6 +26,7 @@ import mock
 import mox
 from oslo.concurrency import lockutils
 from oslo.config import cfg
+from oslo.config import fixture as config_fixture
 from oslo.serialization import jsonutils
 from oslo.utils import importutils
 
@@ -44,7 +45,6 @@ from nova import db
 from nova import exception
 from nova import objects
 from nova.objects import instance as instance_obj
-from nova.openstack.common.fixture import config as config_fixture
 from nova.openstack.common import log as logging
 from nova import test
 from nova.tests.unit.db import fakes as db_fakes