From 706a1370056ffccc2c8811fc1ac0679944564ece Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 15 Feb 2013 22:30:16 +0000 Subject: Use oslo-config-2013.1b4 The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b4 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Add dependency_links to setup.py so that oslo-config can be installed from the tarball URL specified in pip-requires. Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already does for paste. It turns out imp.find_module() doesn't correct handle namespace packages. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc --- nova/tests/api/ec2/test_cinder_cloud.py | 2 +- nova/tests/api/ec2/test_cloud.py | 2 +- nova/tests/api/ec2/test_ec2_validate.py | 3 ++- nova/tests/api/ec2/test_middleware.py | 2 +- nova/tests/api/openstack/compute/contrib/test_admin_actions.py | 2 +- nova/tests/api/openstack/compute/contrib/test_cloudpipe.py | 2 +- nova/tests/api/openstack/compute/contrib/test_evacuate.py | 2 +- nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py | 2 +- nova/tests/api/openstack/compute/contrib/test_networks.py | 2 +- nova/tests/api/openstack/compute/contrib/test_rescue.py | 2 +- .../openstack/compute/contrib/test_security_group_default_rules.py | 2 +- nova/tests/api/openstack/compute/contrib/test_security_groups.py | 2 +- nova/tests/api/openstack/compute/contrib/test_server_password.py | 2 +- nova/tests/api/openstack/compute/contrib/test_volumes.py | 4 ++-- nova/tests/api/openstack/compute/test_extensions.py | 2 +- nova/tests/api/openstack/compute/test_image_metadata.py | 2 +- nova/tests/api/openstack/compute/test_server_actions.py | 3 +-- nova/tests/api/openstack/compute/test_server_metadata.py | 2 +- nova/tests/api/openstack/compute/test_servers.py | 3 +-- nova/tests/api/test_sizelimit.py | 2 +- nova/tests/baremetal/db/base.py | 3 ++- nova/tests/baremetal/test_driver.py | 3 ++- nova/tests/baremetal/test_ipmi.py | 3 ++- nova/tests/baremetal/test_pxe.py | 2 +- nova/tests/baremetal/test_virtual_power_driver.py | 6 ++---- nova/tests/baremetal/test_volume_driver.py | 4 ++-- nova/tests/cells/fakes.py | 3 ++- nova/tests/cells/test_cells_manager.py | 3 ++- nova/tests/cells/test_cells_messaging.py | 5 +++-- nova/tests/cells/test_cells_rpc_driver.py | 3 ++- nova/tests/cells/test_cells_rpcapi.py | 3 ++- nova/tests/cells/test_cells_scheduler.py | 3 ++- nova/tests/cert/test_rpcapi.py | 3 ++- nova/tests/compute/test_compute.py | 2 +- nova/tests/compute/test_compute_utils.py | 3 ++- nova/tests/compute/test_multiple_nodes.py | 3 ++- nova/tests/compute/test_resource_tracker.py | 3 ++- nova/tests/compute/test_rpcapi.py | 3 ++- nova/tests/conf_fixture.py | 2 +- nova/tests/console/test_console.py | 3 ++- nova/tests/console/test_rpcapi.py | 3 ++- nova/tests/consoleauth/test_rpcapi.py | 3 ++- nova/tests/fake_libvirt_utils.py | 3 ++- nova/tests/fake_network.py | 3 ++- nova/tests/fake_volume.py | 3 ++- nova/tests/image/fake.py | 4 ++-- nova/tests/image/test_glance.py | 2 +- nova/tests/integrated/integrated_helpers.py | 3 ++- nova/tests/integrated/test_api_samples.py | 2 +- nova/tests/integrated/test_extensions.py | 3 ++- nova/tests/network/test_linux_net.py | 2 +- nova/tests/network/test_manager.py | 3 +-- nova/tests/network/test_quantumv2.py | 5 ++--- nova/tests/network/test_rpcapi.py | 3 ++- nova/tests/policy_fixture.py | 2 +- nova/tests/scheduler/test_host_filters.py | 3 ++- nova/tests/scheduler/test_least_cost.py | 5 +++-- nova/tests/scheduler/test_rpcapi.py | 3 ++- nova/tests/test_availability_zones.py | 3 ++- nova/tests/test_db_api.py | 2 +- nova/tests/test_hypervapi.py | 3 ++- nova/tests/test_imagebackend.py | 5 +++-- nova/tests/test_imagecache.py | 4 ++-- nova/tests/test_libvirt.py | 3 +-- nova/tests/test_libvirt_vif.py | 2 +- nova/tests/test_libvirt_volume.py | 3 ++- nova/tests/test_metadata.py | 2 +- nova/tests/test_notifications.py | 3 ++- nova/tests/test_objectstore.py | 2 +- nova/tests/test_pipelib.py | 3 ++- nova/tests/test_quota.py | 3 ++- nova/tests/test_service.py | 6 +++--- nova/tests/test_test.py | 3 ++- nova/tests/test_utils.py | 2 +- nova/tests/test_versions.py | 3 ++- nova/tests/test_xenapi.py | 3 ++- nova/tests/utils.py | 6 +++--- 77 files changed, 127 insertions(+), 97 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index 5e5723a08..d4ce58023 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -21,6 +21,7 @@ import copy import uuid import fixtures +from oslo.config import cfg from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils @@ -29,7 +30,6 @@ from nova.compute import utils as compute_utils from nova import context from nova import db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index 0eb2b89ae..07780eb02 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -26,6 +26,7 @@ import string import tempfile import fixtures +from oslo.config import cfg from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils @@ -40,7 +41,6 @@ from nova import db from nova import exception from nova.image import s3 from nova.network import api as network_api -from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py index 4dcdf4e54..24d226335 100644 --- a/nova/tests/api/ec2/test_ec2_validate.py +++ b/nova/tests/api/ec2/test_ec2_validate.py @@ -18,13 +18,14 @@ import datetime +from oslo.config import cfg + from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils from nova.compute import utils as compute_utils from nova import context from nova import db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.openstack.common import timeutils diff --git a/nova/tests/api/ec2/test_middleware.py b/nova/tests/api/ec2/test_middleware.py index f50689028..05463b849 100644 --- a/nova/tests/api/ec2/test_middleware.py +++ b/nova/tests/api/ec2/test_middleware.py @@ -17,6 +17,7 @@ # under the License. from lxml import etree +from oslo.config import cfg import webob import webob.dec import webob.exc @@ -24,7 +25,6 @@ import webob.exc from nova.api import ec2 from nova import context from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import timeutils from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py index 76351e489..600d25889 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py +++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py @@ -15,6 +15,7 @@ import datetime import uuid +from oslo.config import cfg import webob from nova.api.openstack import compute @@ -23,7 +24,6 @@ from nova.compute import api as compute_api from nova.compute import vm_states from nova import context from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.scheduler import rpcapi as scheduler_rpcapi from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py index 133554abd..40b4e6d93 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py @@ -14,12 +14,12 @@ # under the License. from lxml import etree +from oslo.config import cfg from nova.api.openstack.compute.contrib import cloudpipe from nova.api.openstack import wsgi from nova.compute import utils as compute_utils from nova import db -from nova.openstack.common import cfg from nova.openstack.common import timeutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_evacuate.py b/nova/tests/api/openstack/compute/contrib/test_evacuate.py index f76bf7bcf..9411b5663 100644 --- a/nova/tests/api/openstack/compute/contrib/test_evacuate.py +++ b/nova/tests/api/openstack/compute/contrib/test_evacuate.py @@ -14,12 +14,12 @@ import uuid +from oslo.config import cfg import webob from nova.compute import api as compute_api from nova.compute import vm_states from nova import context -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py b/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py index 408b17d48..a36bb32cf 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py +++ b/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py @@ -14,11 +14,11 @@ # under the License. import netaddr +from oslo.config import cfg import webob from nova.api.openstack.compute.contrib import floating_ips_bulk from nova import context -from nova.openstack.common import cfg from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_networks.py b/nova/tests/api/openstack/compute/contrib/test_networks.py index 44d9e8af3..fef60f20b 100644 --- a/nova/tests/api/openstack/compute/contrib/test_networks.py +++ b/nova/tests/api/openstack/compute/contrib/test_networks.py @@ -19,12 +19,12 @@ import math import netaddr import uuid +from oslo.config import cfg import webob from nova.api.openstack.compute.contrib import networks_associate from nova.api.openstack.compute.contrib import os_networks as networks from nova import exception -from nova.openstack.common import cfg from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_rescue.py b/nova/tests/api/openstack/compute/contrib/test_rescue.py index 2719c1339..359eafb2a 100644 --- a/nova/tests/api/openstack/compute/contrib/test_rescue.py +++ b/nova/tests/api/openstack/compute/contrib/test_rescue.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg import webob from nova import compute from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py b/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py index 88dee2edf..2b4145764 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py +++ b/nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py @@ -15,13 +15,13 @@ # under the License. from lxml import etree +from oslo.config import cfg import webob from nova.api.openstack.compute.contrib import security_group_default_rules from nova.api.openstack import wsgi from nova import context import nova.db -from nova.openstack.common import cfg from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py index 2823c3e8f..1b254c2a7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py +++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py @@ -17,6 +17,7 @@ from lxml import etree import mox +from oslo.config import cfg import webob from nova.api.openstack.compute.contrib import security_groups @@ -25,7 +26,6 @@ from nova.api.openstack import xmlutil from nova import compute import nova.db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova import quota from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_server_password.py b/nova/tests/api/openstack/compute/contrib/test_server_password.py index 87da90efe..6e7d66a06 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_password.py +++ b/nova/tests/api/openstack/compute/contrib/test_server_password.py @@ -14,11 +14,11 @@ # under the License. from lxml import etree +from oslo.config import cfg import webob from nova.api.metadata import password from nova import compute -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py index 175513e72..90e226eac 100644 --- a/nova/tests/api/openstack/compute/contrib/test_volumes.py +++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py @@ -16,19 +16,19 @@ import datetime from lxml import etree +from oslo.config import cfg import webob +from webob import exc from nova.api.openstack.compute.contrib import volumes from nova.compute import api as compute_api from nova.compute import instance_types from nova import context -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import timeutils from nova import test from nova.tests.api.openstack import fakes from nova.volume import cinder -from webob import exc CONF = cfg.CONF CONF.import_opt('password_length', 'nova.utils') diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py index 63a6b3c9a..bd3fde1f3 100644 --- a/nova/tests/api/openstack/compute/test_extensions.py +++ b/nova/tests/api/openstack/compute/test_extensions.py @@ -18,6 +18,7 @@ import iso8601 from lxml import etree +from oslo.config import cfg import webob from nova.api.openstack import compute @@ -25,7 +26,6 @@ from nova.api.openstack.compute import extensions as compute_extensions from nova.api.openstack import extensions as base_extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_image_metadata.py b/nova/tests/api/openstack/compute/test_image_metadata.py index 9a8b75c9e..29165b548 100644 --- a/nova/tests/api/openstack/compute/test_image_metadata.py +++ b/nova/tests/api/openstack/compute/test_image_metadata.py @@ -15,10 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg import webob from nova.api.openstack.compute import image_metadata -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py index d4c93ef39..101458bf3 100644 --- a/nova/tests/api/openstack/compute/test_server_actions.py +++ b/nova/tests/api/openstack/compute/test_server_actions.py @@ -17,6 +17,7 @@ import base64 import uuid import mox +from oslo.config import cfg import webob from nova.api.openstack.compute import servers @@ -26,14 +27,12 @@ from nova.compute import vm_states from nova import db from nova import exception from nova.image import glance -from nova.openstack.common import cfg from nova.openstack.common import importutils from nova import test from nova.tests.api.openstack import fakes from nova.tests.image import fake from nova.tests import matchers - CONF = cfg.CONF CONF.import_opt('password_length', 'nova.utils') FAKE_UUID = fakes.FAKE_UUID diff --git a/nova/tests/api/openstack/compute/test_server_metadata.py b/nova/tests/api/openstack/compute/test_server_metadata.py index 71fa9f3f3..3ba895953 100644 --- a/nova/tests/api/openstack/compute/test_server_metadata.py +++ b/nova/tests/api/openstack/compute/test_server_metadata.py @@ -17,6 +17,7 @@ import uuid +from oslo.config import cfg import webob from nova.api.openstack.compute import server_metadata @@ -24,7 +25,6 @@ from nova.compute import rpcapi as compute_rpcapi from nova.compute import vm_states import nova.db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 597422ab8..228d81f45 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -23,6 +23,7 @@ import uuid import iso8601 from lxml import etree +from oslo.config import cfg import webob from nova.api.openstack import compute @@ -41,7 +42,6 @@ from nova.db.sqlalchemy import models from nova import exception from nova.network import manager from nova.network.quantumv2 import api as quantum_api -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import policy as common_policy from nova.openstack.common import rpc @@ -52,7 +52,6 @@ from nova.tests import fake_network from nova.tests.image import fake from nova.tests import matchers - CONF = cfg.CONF CONF.import_opt('password_length', 'nova.utils') CONF.import_opt('scheduler_topic', 'nova.scheduler.rpcapi') diff --git a/nova/tests/api/test_sizelimit.py b/nova/tests/api/test_sizelimit.py index 9c5ab1a27..862a0d65f 100644 --- a/nova/tests/api/test_sizelimit.py +++ b/nova/tests/api/test_sizelimit.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg import webob import nova.api.sizelimit -from nova.openstack.common import cfg from nova import test CONF = cfg.CONF diff --git a/nova/tests/baremetal/db/base.py b/nova/tests/baremetal/db/base.py index 37e51fe79..499eee32a 100644 --- a/nova/tests/baremetal/db/base.py +++ b/nova/tests/baremetal/db/base.py @@ -15,8 +15,9 @@ """Bare-metal DB test base class.""" +from oslo.config import cfg + from nova import context as nova_context -from nova.openstack.common import cfg from nova import test from nova.virt.baremetal.db import migration as bm_migration from nova.virt.baremetal.db.sqlalchemy import session as bm_session diff --git a/nova/tests/baremetal/test_driver.py b/nova/tests/baremetal/test_driver.py index 37ef71881..a4bcc8128 100644 --- a/nova/tests/baremetal/test_driver.py +++ b/nova/tests/baremetal/test_driver.py @@ -20,8 +20,9 @@ """Tests for the base baremetal driver class.""" +from oslo.config import cfg + from nova import exception -from nova.openstack.common import cfg from nova import test from nova.tests.baremetal.db import base as bm_db_base from nova.tests.baremetal.db import utils as bm_db_utils diff --git a/nova/tests/baremetal/test_ipmi.py b/nova/tests/baremetal/test_ipmi.py index 87800cb47..faf800a46 100644 --- a/nova/tests/baremetal/test_ipmi.py +++ b/nova/tests/baremetal/test_ipmi.py @@ -23,7 +23,8 @@ import os import stat import tempfile -from nova.openstack.common import cfg +from oslo.config import cfg + from nova import test from nova.tests.baremetal.db import utils as bm_db_utils from nova import utils diff --git a/nova/tests/baremetal/test_pxe.py b/nova/tests/baremetal/test_pxe.py index 9703feb40..2f3ac5158 100644 --- a/nova/tests/baremetal/test_pxe.py +++ b/nova/tests/baremetal/test_pxe.py @@ -21,10 +21,10 @@ import os +from oslo.config import cfg from testtools import matchers from nova import exception -from nova.openstack.common import cfg from nova.openstack.common.db.sqlalchemy import session as db_session from nova.tests.baremetal.db import base as bm_db_base from nova.tests.baremetal.db import utils as bm_db_utils diff --git a/nova/tests/baremetal/test_virtual_power_driver.py b/nova/tests/baremetal/test_virtual_power_driver.py index 689677698..5a38ed87b 100644 --- a/nova/tests/baremetal/test_virtual_power_driver.py +++ b/nova/tests/baremetal/test_virtual_power_driver.py @@ -19,16 +19,14 @@ """Tests for baremetal virtual power driver.""" import mox +from oslo.config import cfg from nova import exception -from nova.openstack.common import cfg -from nova import utils as nutils - from nova.tests.baremetal.db import base as bm_db_base from nova.tests.baremetal.db import utils as bm_db_utils from nova.tests.image import fake as fake_image from nova.tests import utils - +from nova import utils as nutils from nova.virt.baremetal import db from nova.virt.baremetal import virtual_power_driver import nova.virt.powervm.common as connection diff --git a/nova/tests/baremetal/test_volume_driver.py b/nova/tests/baremetal/test_volume_driver.py index c83277516..24dadac94 100644 --- a/nova/tests/baremetal/test_volume_driver.py +++ b/nova/tests/baremetal/test_volume_driver.py @@ -15,9 +15,9 @@ """Tests for baremetal volume driver.""" -from nova.openstack.common import cfg -from nova import test +from oslo.config import cfg +from nova import test from nova.virt.baremetal import volume_driver CONF = cfg.CONF diff --git a/nova/tests/cells/fakes.py b/nova/tests/cells/fakes.py index e996cbe13..c200d3dba 100644 --- a/nova/tests/cells/fakes.py +++ b/nova/tests/cells/fakes.py @@ -16,6 +16,8 @@ Fakes For Cells tests. """ +from oslo.config import cfg + from nova.cells import driver from nova.cells import manager as cells_manager from nova.cells import messaging @@ -23,7 +25,6 @@ from nova.cells import state as cells_state import nova.db from nova.db import base from nova import exception -from nova.openstack.common import cfg CONF = cfg.CONF CONF.import_opt('name', 'nova.cells.opts', group='cells') diff --git a/nova/tests/cells/test_cells_manager.py b/nova/tests/cells/test_cells_manager.py index 1ebbc407d..d53fdbb7f 100644 --- a/nova/tests/cells/test_cells_manager.py +++ b/nova/tests/cells/test_cells_manager.py @@ -18,10 +18,11 @@ Tests For CellsManager import copy import datetime +from oslo.config import cfg + from nova.cells import messaging from nova.cells import utils as cells_utils from nova import context -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova.openstack.common import timeutils from nova import test diff --git a/nova/tests/cells/test_cells_messaging.py b/nova/tests/cells/test_cells_messaging.py index 811ad17fd..30adfdcd7 100644 --- a/nova/tests/cells/test_cells_messaging.py +++ b/nova/tests/cells/test_cells_messaging.py @@ -14,17 +14,18 @@ """ Tests For Cells Messaging module """ + +from oslo.config import cfg + from nova.cells import messaging from nova.cells import utils as cells_utils from nova import context from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova.openstack.common import timeutils from nova import test from nova.tests.cells import fakes - CONF = cfg.CONF CONF.import_opt('name', 'nova.cells.opts', group='cells') CONF.import_opt('allowed_rpc_exception_modules', diff --git a/nova/tests/cells/test_cells_rpc_driver.py b/nova/tests/cells/test_cells_rpc_driver.py index a44fe9376..e5e847c12 100644 --- a/nova/tests/cells/test_cells_rpc_driver.py +++ b/nova/tests/cells/test_cells_rpc_driver.py @@ -16,10 +16,11 @@ Tests For Cells RPC Communication Driver """ +from oslo.config import cfg + from nova.cells import messaging from nova.cells import rpc_driver from nova import context -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova.openstack.common.rpc import dispatcher as rpc_dispatcher from nova import test diff --git a/nova/tests/cells/test_cells_rpcapi.py b/nova/tests/cells/test_cells_rpcapi.py index d19ce5b2b..f00b1b290 100644 --- a/nova/tests/cells/test_cells_rpcapi.py +++ b/nova/tests/cells/test_cells_rpcapi.py @@ -16,8 +16,9 @@ Tests For Cells RPCAPI """ +from oslo.config import cfg + from nova.cells import rpcapi as cells_rpcapi -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/cells/test_cells_scheduler.py b/nova/tests/cells/test_cells_scheduler.py index ecd51c9f7..c9e626385 100644 --- a/nova/tests/cells/test_cells_scheduler.py +++ b/nova/tests/cells/test_cells_scheduler.py @@ -17,11 +17,12 @@ Tests For CellsScheduler """ import time +from oslo.config import cfg + from nova.compute import vm_states from nova import context from nova import db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import uuidutils from nova import test from nova.tests.cells import fakes diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/cert/test_rpcapi.py index dce325354..b743ca1e5 100644 --- a/nova/tests/cert/test_rpcapi.py +++ b/nova/tests/cert/test_rpcapi.py @@ -18,9 +18,10 @@ Unit Tests for nova.cert.rpcapi """ +from oslo.config import cfg + from nova.cert import rpcapi as cert_rpcapi from nova import context -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index c372eef02..f06bc0587 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -27,6 +27,7 @@ import traceback import uuid import mox +from oslo.config import cfg import nova from nova import compute @@ -45,7 +46,6 @@ from nova import exception from nova.image import glance from nova.network import api as network_api from nova.network import model as network_model -from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py index 9b865014c..0f96e657d 100644 --- a/nova/tests/compute/test_compute_utils.py +++ b/nova/tests/compute/test_compute_utils.py @@ -19,6 +19,8 @@ import string +from oslo.config import cfg + from nova.compute import instance_types from nova.compute import utils as compute_utils from nova import context @@ -26,7 +28,6 @@ from nova import db from nova import exception from nova.image import glance from nova.network import api as network_api -from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import log as logging from nova.openstack.common.notifier import api as notifier_api diff --git a/nova/tests/compute/test_multiple_nodes.py b/nova/tests/compute/test_multiple_nodes.py index 27ee7aaba..1a967c5e4 100644 --- a/nova/tests/compute/test_multiple_nodes.py +++ b/nova/tests/compute/test_multiple_nodes.py @@ -16,9 +16,10 @@ # under the License. """Tests for compute service with multiple compute nodes.""" +from oslo.config import cfg + from nova import context from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import importutils from nova import test from nova.virt import fake diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index f1d0d1f0c..84dbc69fc 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -19,13 +19,14 @@ import uuid +from oslo.config import cfg + from nova.compute import instance_types from nova.compute import resource_tracker from nova.compute import task_states from nova.compute import vm_states from nova import context from nova import db -from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import test diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index b81e049bf..a78a13883 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -18,10 +18,11 @@ Unit Tests for nova.compute.rpcapi """ +from oslo.config import cfg + from nova.compute import rpcapi as compute_rpcapi from nova import context from nova import db -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py index 230f70a1b..e2ea18f98 100644 --- a/nova/tests/conf_fixture.py +++ b/nova/tests/conf_fixture.py @@ -17,10 +17,10 @@ # under the License. import fixtures +from oslo.config import cfg from nova import config from nova import ipv6 -from nova.openstack.common import cfg from nova import paths from nova.tests import utils diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py index 8c2e603aa..0f95f3d95 100644 --- a/nova/tests/console/test_console.py +++ b/nova/tests/console/test_console.py @@ -18,12 +18,13 @@ """Tests For Console proxy.""" +from oslo.config import cfg + from nova.console import api as console_api from nova.console import rpcapi as console_rpcapi from nova import context from nova import db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/console/test_rpcapi.py b/nova/tests/console/test_rpcapi.py index 8d9d0514f..298c59c4e 100644 --- a/nova/tests/console/test_rpcapi.py +++ b/nova/tests/console/test_rpcapi.py @@ -18,9 +18,10 @@ Unit Tests for nova.console.rpcapi """ +from oslo.config import cfg + from nova.console import rpcapi as console_rpcapi from nova import context -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/consoleauth/test_rpcapi.py b/nova/tests/consoleauth/test_rpcapi.py index 264c4e10b..15af5fdcf 100644 --- a/nova/tests/consoleauth/test_rpcapi.py +++ b/nova/tests/consoleauth/test_rpcapi.py @@ -18,9 +18,10 @@ Unit Tests for nova.consoleauth.rpcapi """ +from oslo.config import cfg + from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/fake_libvirt_utils.py b/nova/tests/fake_libvirt_utils.py index 38236cd21..31b1af231 100644 --- a/nova/tests/fake_libvirt_utils.py +++ b/nova/tests/fake_libvirt_utils.py @@ -17,7 +17,8 @@ import os import StringIO -from nova.openstack.common import cfg +from oslo.config import cfg + from nova.virt.libvirt import utils as libvirt_utils diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index f384df272..42ce71ded 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -15,6 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg + from nova.compute import api as compute_api from nova.compute import manager as compute_manager import nova.context @@ -25,7 +27,6 @@ from nova.network import manager as network_manager from nova.network import model as network_model from nova.network import nova_ipam_lib from nova.network import rpcapi as network_rpcapi -from nova.openstack.common import cfg from nova.virt.libvirt import config as libvirt_config diff --git a/nova/tests/fake_volume.py b/nova/tests/fake_volume.py index 0d8a502a5..607f1444d 100644 --- a/nova/tests/fake_volume.py +++ b/nova/tests/fake_volume.py @@ -16,8 +16,9 @@ import uuid +from oslo.config import cfg + from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py index 78cd667e4..51cf30a3e 100644 --- a/nova/tests/image/fake.py +++ b/nova/tests/image/fake.py @@ -22,12 +22,12 @@ import copy import datetime import uuid +from oslo.config import cfg + from nova import exception import nova.image.glance -from nova.openstack.common import cfg from nova.openstack.common import log as logging - CONF = cfg.CONF CONF.import_opt('null_kernel', 'nova.compute.api') LOG = logging.getLogger(__name__) diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py index fb26fa4f1..a7ed4c409 100644 --- a/nova/tests/image/test_glance.py +++ b/nova/tests/image/test_glance.py @@ -24,11 +24,11 @@ import tempfile import time import glanceclient.exc +from oslo.config import cfg from nova import context from nova import exception from nova.image import glance -from nova.openstack.common import cfg from nova import test from nova.tests.api.openstack import fakes from nova.tests.glance import stubs as glance_stubs diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py index 90e9a806e..0e696a6c4 100644 --- a/nova/tests/integrated/integrated_helpers.py +++ b/nova/tests/integrated/integrated_helpers.py @@ -23,8 +23,9 @@ import random import string import uuid +from oslo.config import cfg + import nova.image.glance -from nova.openstack.common import cfg from nova.openstack.common.log import logging from nova import service from nova import test diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index a61ac3b8d..8c2723e67 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -25,6 +25,7 @@ import uuid as uuid_lib import coverage from lxml import etree +from oslo.config import cfg from nova.api.metadata import password from nova.api.openstack.compute.contrib import coverage_ext @@ -36,7 +37,6 @@ from nova import db from nova.db.sqlalchemy import models from nova import exception from nova.network import api as network_api -from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils from nova.openstack.common.log import logging diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py index ca5ff8374..33499ee5d 100644 --- a/nova/tests/integrated/test_extensions.py +++ b/nova/tests/integrated/test_extensions.py @@ -15,8 +15,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg + # Import extensions to pull in osapi_compute_extension CONF option used below. -from nova.openstack.common import cfg from nova.openstack.common.log import logging from nova.tests.integrated import integrated_helpers diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index 50c98e78c..cba08d9ce 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -19,12 +19,12 @@ import calendar import os import mox +from oslo.config import cfg from nova import context from nova import db from nova.network import driver from nova.network import linux_net -from nova.openstack.common import cfg from nova.openstack.common import fileutils from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index 4344aa07b..313321ea7 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -18,6 +18,7 @@ import fixtures import mox +from oslo.config import cfg from nova import context from nova import db @@ -28,7 +29,6 @@ from nova.network import floating_ips from nova.network import linux_net from nova.network import manager as network_manager from nova.network import model as net_model -from nova.openstack.common import cfg from nova.openstack.common.db.sqlalchemy import session as db_session from nova.openstack.common import importutils from nova.openstack.common import log as logging @@ -40,7 +40,6 @@ from nova.tests import fake_network from nova.tests import matchers from nova import utils - CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/nova/tests/network/test_quantumv2.py b/nova/tests/network/test_quantumv2.py index 91d609914..a37c63efb 100644 --- a/nova/tests/network/test_quantumv2.py +++ b/nova/tests/network/test_quantumv2.py @@ -18,16 +18,15 @@ import uuid import mox +from oslo.config import cfg +from quantumclient.v2_0 import client from nova import context from nova import exception from nova.network import model from nova.network import quantumv2 from nova.network.quantumv2 import api as quantumapi -from nova.openstack.common import cfg from nova import test -from quantumclient.v2_0 import client - CONF = cfg.CONF diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/network/test_rpcapi.py index 33663b8da..a161fe5e0 100644 --- a/nova/tests/network/test_rpcapi.py +++ b/nova/tests/network/test_rpcapi.py @@ -18,9 +18,10 @@ Unit Tests for nova.network.rpcapi """ +from oslo.config import cfg + from nova import context from nova.network import rpcapi as network_rpcapi -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/policy_fixture.py b/nova/tests/policy_fixture.py index 282a28b44..91813defd 100644 --- a/nova/tests/policy_fixture.py +++ b/nova/tests/policy_fixture.py @@ -15,8 +15,8 @@ import os import fixtures +from oslo.config import cfg -from nova.openstack.common import cfg from nova.openstack.common import policy as common_policy import nova.policy from nova.tests import fake_policy diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index 53e51668c..009614610 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -16,11 +16,12 @@ Tests For Scheduler Host Filters. """ import httplib + +from oslo.config import cfg import stubout from nova import context from nova import db -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import timeutils from nova.scheduler import filters diff --git a/nova/tests/scheduler/test_least_cost.py b/nova/tests/scheduler/test_least_cost.py index d159d8f4c..d920b7255 100644 --- a/nova/tests/scheduler/test_least_cost.py +++ b/nova/tests/scheduler/test_least_cost.py @@ -15,14 +15,15 @@ """ Tests For Least Cost functions. """ + +from oslo.config import cfg + from nova import context -from nova.openstack.common import cfg from nova.scheduler import weights from nova.scheduler.weights import least_cost from nova import test from nova.tests.scheduler import fakes - test_least_cost_opts = [ cfg.FloatOpt('compute_fake_weigher1_weight', default=2.0, diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index af6a57ba6..62038c722 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/nova/tests/scheduler/test_rpcapi.py @@ -18,8 +18,9 @@ Unit Tests for nova.scheduler.rpcapi """ +from oslo.config import cfg + from nova import context -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova.scheduler import rpcapi as scheduler_rpcapi from nova import test diff --git a/nova/tests/test_availability_zones.py b/nova/tests/test_availability_zones.py index 4192fa08f..85dc1eefd 100644 --- a/nova/tests/test_availability_zones.py +++ b/nova/tests/test_availability_zones.py @@ -19,10 +19,11 @@ Tests for availability zones """ +from oslo.config import cfg + from nova import availability_zones as az from nova import context from nova import db -from nova.openstack.common import cfg from nova import test CONF = cfg.CONF diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 27ca1ed8b..cf81cca74 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -22,6 +22,7 @@ import datetime import uuid as stdlib_uuid +from oslo.config import cfg from sqlalchemy import MetaData from sqlalchemy.schema import Table from sqlalchemy.sql.expression import select @@ -29,7 +30,6 @@ from sqlalchemy.sql.expression import select from nova import context from nova import db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common.db.sqlalchemy import session as db_session from nova.openstack.common import timeutils from nova import test diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py index 025d3a454..5912bb301 100644 --- a/nova/tests/test_hypervapi.py +++ b/nova/tests/test_hypervapi.py @@ -26,13 +26,14 @@ import shutil import time import uuid +from oslo.config import cfg + from nova.api.metadata import base as instance_metadata from nova.compute import power_state from nova.compute import task_states from nova import context from nova import db from nova.image import glance -from nova.openstack.common import cfg from nova import test from nova.tests import fake_network from nova.tests.hyperv import db_fakes diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py index bd88fcd60..c3d274da8 100644 --- a/nova/tests/test_imagebackend.py +++ b/nova/tests/test_imagebackend.py @@ -15,10 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. -import fixtures import os -from nova.openstack.common import cfg +import fixtures +from oslo.config import cfg + from nova.openstack.common import uuidutils from nova import test from nova.tests import fake_libvirt_utils diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index 389612c64..8c752bbb9 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -24,14 +24,14 @@ import logging import os import time -from nova import test +from oslo.config import cfg from nova.compute import vm_states from nova import conductor from nova import db -from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import log +from nova import test from nova import utils from nova.virt.libvirt import imagecache from nova.virt.libvirt import utils as virtutils diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 8ac74aabd..80437ede8 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -27,6 +27,7 @@ import shutil import tempfile from lxml import etree +from oslo.config import cfg from xml.dom import minidom from nova.api.ec2 import cloud @@ -38,7 +39,6 @@ from nova.compute import vm_states from nova import context from nova import db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import fileutils from nova.openstack.common import importutils from nova.openstack.common import jsonutils @@ -63,7 +63,6 @@ from nova.virt.libvirt import firewall from nova.virt.libvirt import imagebackend from nova.virt.libvirt import utils as libvirt_utils - try: import libvirt except ImportError: diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py index 749fda33a..cb7943ea8 100644 --- a/nova/tests/test_libvirt_vif.py +++ b/nova/tests/test_libvirt_vif.py @@ -15,10 +15,10 @@ # under the License. from lxml import etree +from oslo.config import cfg from nova import exception from nova.network import model as network_model -from nova.openstack.common import cfg from nova import test from nova.tests import fakelibvirt from nova import utils diff --git a/nova/tests/test_libvirt_volume.py b/nova/tests/test_libvirt_volume.py index fa71782ee..7945329f8 100644 --- a/nova/tests/test_libvirt_volume.py +++ b/nova/tests/test_libvirt_volume.py @@ -17,8 +17,9 @@ import os +from oslo.config import cfg + from nova import exception -from nova.openstack.common import cfg from nova.storage import linuxscsi from nova import test from nova.tests import fake_libvirt_utils diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 95399e33d..3d01f1336 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -25,6 +25,7 @@ import hmac import json import re +from oslo.config import cfg import webob from nova.api.metadata import base @@ -36,7 +37,6 @@ from nova import db from nova.db.sqlalchemy import api from nova import exception from nova.network import api as network_api -from nova.openstack.common import cfg from nova import test from nova.tests import fake_network diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py index aec6c8f67..9b38756c8 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/test_notifications.py @@ -19,6 +19,8 @@ import copy +from oslo.config import cfg + from nova.compute import instance_types from nova.compute import task_states from nova.compute import vm_states @@ -26,7 +28,6 @@ from nova import context from nova import db from nova.network import api as network_api from nova import notifications -from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common.notifier import api as notifier_api from nova.openstack.common.notifier import test_notifier diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py index 37d8c5d7d..0775bb66f 100644 --- a/nova/tests/test_objectstore.py +++ b/nova/tests/test_objectstore.py @@ -27,9 +27,9 @@ import tempfile from boto import exception as boto_exception from boto.s3 import connection as s3 +from oslo.config import cfg from nova.objectstore import s3server -from nova.openstack.common import cfg from nova import test from nova import wsgi diff --git a/nova/tests/test_pipelib.py b/nova/tests/test_pipelib.py index 5cd715552..4b76581a4 100644 --- a/nova/tests/test_pipelib.py +++ b/nova/tests/test_pipelib.py @@ -13,10 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg + from nova.cloudpipe import pipelib from nova import context from nova import crypto -from nova.openstack.common import cfg from nova import test from nova import utils diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index 08b33e201..1ea4eea21 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -18,6 +18,8 @@ import datetime +from oslo.config import cfg + from nova import compute from nova.compute import instance_types from nova import context @@ -25,7 +27,6 @@ from nova import db from nova.db.sqlalchemy import api as sqa_api from nova.db.sqlalchemy import models as sqa_models from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import rpc from nova.openstack.common import timeutils from nova import quota diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py index 71beed51e..efe84fbb1 100644 --- a/nova/tests/test_service.py +++ b/nova/tests/test_service.py @@ -20,19 +20,19 @@ Unit Tests for remote procedure calls using queue """ -import mox import sys +import mox +from oslo.config import cfg + from nova import context from nova import db from nova import exception from nova import manager -from nova.openstack.common import cfg from nova import service from nova import test from nova import wsgi - test_service_opts = [ cfg.StrOpt("fake_manager", default="nova.tests.test_service.FakeManager", diff --git a/nova/tests/test_test.py b/nova/tests/test_test.py index 9e2d3560c..759b05e3b 100644 --- a/nova/tests/test_test.py +++ b/nova/tests/test_test.py @@ -18,7 +18,8 @@ """Tests for the testing base code.""" -from nova.openstack.common import cfg +from oslo.config import cfg + from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index bdff108d9..940ddf6ec 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -26,10 +26,10 @@ import tempfile import mox import netaddr +from oslo.config import cfg import nova from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import timeutils from nova import test from nova import utils diff --git a/nova/tests/test_versions.py b/nova/tests/test_versions.py index 780e5ae12..1536af4c0 100644 --- a/nova/tests/test_versions.py +++ b/nova/tests/test_versions.py @@ -17,7 +17,8 @@ import __builtin__ import StringIO -from nova.openstack.common import cfg +from oslo.config import cfg + from nova import test from nova import version diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 2a484d832..84c3caa63 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -23,6 +23,8 @@ import functools import os import re +from oslo.config import cfg + from nova.compute import api as compute_api from nova.compute import instance_types from nova.compute import power_state @@ -31,7 +33,6 @@ from nova.compute import vm_states from nova import context from nova import db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/tests/utils.py b/nova/tests/utils.py index 74199eb92..9daa72f34 100644 --- a/nova/tests/utils.py +++ b/nova/tests/utils.py @@ -16,15 +16,15 @@ import platform -import nova.context -import nova.db +from oslo.config import cfg from nova.compute import instance_types +import nova.context +import nova.db from nova import exception from nova.image import glance from nova.network import minidns from nova.network import model as network_model -from nova.openstack.common import cfg CONF = cfg.CONF CONF.import_opt('use_ipv6', 'nova.netconf') -- cgit