Merge "Move oslo.config references to oslo_config"

ironic/api/__init__.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 API_SERVICE_OPTS = [

ironic/api/app.py

@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 
 from ironic.api import acl

ironic/api/config.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 # Server Specific Configurations
 # See https://pecan.readthedocs.org/en/latest/configuration.html#server-configuration # noqa

ironic/api/controllers/v1/node.py

@@ -15,7 +15,7 @@
 
 import datetime
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 from pecan import rest
 import wsme

ironic/api/controllers/v1/utils.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import jsonpatch
-from oslo.config import cfg
+from oslo_config import cfg
 import wsme
 
 from ironic.common.i18n import _

ironic/api/hooks.py

@@ -16,7 +16,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import hooks
 from webob import exc
 

ironic/cmd/api.py

@@ -21,7 +21,7 @@ import logging
 import sys
 from wsgiref import simple_server
 
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves import socketserver
 
 from ironic.api import app

ironic/cmd/conductor.py

@@ -21,7 +21,7 @@ The Ironic Management Service
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import service as ironic_service
 from ironic.openstack.common import service

ironic/cmd/dbsync.py

@@ -21,7 +21,7 @@ Run storage database migration.
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import service
 from ironic.db import migration

ironic/common/config.py

@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import rpc
 from ironic import version

ironic/common/dhcp_factory.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 import stevedore
 
 from ironic.common import exception

ironic/common/disk_partitioner.py

@@ -15,8 +15,8 @@
 
 import re
 
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/common/driver_factory.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 from stevedore import dispatch
 
 from ironic.common import exception

ironic/common/exception.py

@@ -22,7 +22,7 @@ SHOULD include dedicated exception logging.
 
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from ironic.common.i18n import _

ironic/common/glance_service/base_image_service.py

@@ -22,7 +22,7 @@ import sys
 import time
 
 from glanceclient import client
-from oslo.config import cfg
+from oslo_config import cfg
 import sendfile
 import six.moves.urllib.parse as urlparse
 

ironic/common/glance_service/service_utils.py

@@ -19,8 +19,8 @@ import itertools
 import logging
 import random
 
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 import six
 import six.moves.urllib.parse as urlparse

ironic/common/glance_service/v2/image_service.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from swiftclient import utils as swift_utils
 
 from ironic.common import exception as exc

ironic/common/hash_ring.py

@@ -17,7 +17,7 @@ import bisect
 import hashlib
 import threading
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/common/image_service.py

@@ -15,8 +15,8 @@
 #    under the License.
 
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 
 glance_opts = [

ironic/common/images.py

@@ -23,8 +23,8 @@ import os
 import shutil
 
 import jinja2
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/common/keystone.py

@@ -13,9 +13,9 @@
 # under the License.
 
 from keystoneclient import exceptions as ksexception
-# NOTE(deva): import auth_token so oslo.config pulls in keystone_authtoken
+# NOTE(deva): import auth_token so oslo_config pulls in keystone_authtoken
 from keystonemiddleware import auth_token  # noqa
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves.urllib import parse
 
 from ironic.common import exception

ironic/common/paths.py

@@ -17,7 +17,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 path_opts = [
     cfg.StrOpt('pybasedir',

ironic/common/policy.py

@@ -15,8 +15,8 @@
 
 """Policy Engine For Ironic."""
 
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 
 from ironic.openstack.common import policy
 

ironic/common/pxe_utils.py

@@ -17,7 +17,7 @@
 import os
 
 import jinja2
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import dhcp_factory
 from ironic.common import exception

ironic/common/rpc.py

@@ -27,8 +27,8 @@ __all__ = [
     'TRANSPORT_ALIASES',
 ]
 
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 
 from ironic.common import context as ironic_context

ironic/common/service.py

@@ -18,9 +18,9 @@
 
 import socket
 
-from oslo.config import cfg
 from oslo import messaging
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import config
 from ironic.common.i18n import _LE

ironic/common/swift.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves.urllib import parse
 from swiftclient import client as swift_client
 from swiftclient import exceptions as swift_exceptions

ironic/common/utils.py

@@ -29,9 +29,9 @@ import tempfile
 import uuid
 
 import netaddr
-from oslo.config import cfg
 from oslo.utils import excutils
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import paramiko
 import six
 

ironic/conductor/manager.py

@@ -49,10 +49,10 @@ import threading
 
 import eventlet
 from eventlet import greenpool
-from oslo.config import cfg
 from oslo import messaging
 from oslo.utils import excutils
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 from oslo_db import exception as db_exception
 
 from ironic.common import dhcp_factory

ironic/conductor/task_manager.py

@@ -96,8 +96,8 @@ raised in the background thread.):
 
 import functools
 
-from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_config import cfg
 import retrying
 
 from ironic.common import driver_factory

ironic/db/api.py

@@ -19,7 +19,7 @@ Base classes for storage engines
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db import api as db_api
 import six
 

ironic/db/migration.py

@@ -16,7 +16,7 @@
 
 """Database setup and migration commands."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore import driver
 
 _IMPL = None

ironic/db/sqlalchemy/api.py

@@ -19,8 +19,8 @@
 import collections
 import datetime
 
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_db.sqlalchemy import session as db_session
 from oslo_db.sqlalchemy import utils as db_utils

ironic/db/sqlalchemy/models.py

@@ -20,7 +20,7 @@ SQLAlchemy models for baremetal data.
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db import options as db_options
 from oslo_db.sqlalchemy import models
 import six.moves.urllib.parse as urlparse

ironic/dhcp/neutron.py

@@ -18,8 +18,8 @@ import time
 
 from neutronclient.common import exceptions as neutron_client_exc
 from neutronclient.v2_0 import client as clientv20
-from oslo.config import cfg
 from oslo.utils import netutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/drivers/modules/agent.py

@@ -15,8 +15,8 @@
 import os
 import time
 
-from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_config import cfg
 
 from ironic.common import dhcp_factory
 from ironic.common import exception

ironic/drivers/modules/agent_client.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 import requests
 

ironic/drivers/modules/console_utils.py

@@ -24,9 +24,9 @@ import subprocess
 import tempfile
 import time
 
-from oslo.config import cfg
 from oslo.utils import netutils
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/drivers/modules/deploy_utils.py

@@ -25,10 +25,10 @@ import stat
 import tempfile
 import time
 
-from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import units
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import requests
 import six
 

ironic/drivers/modules/ilo/common.py

@@ -18,8 +18,8 @@ Common functionalities shared between different iLO modules.
 
 import tempfile
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/drivers/modules/ilo/deploy.py

@@ -17,7 +17,7 @@ iLO Deploy Driver(s) and supporting methods.
 
 import tempfile
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/drivers/modules/ilo/power.py

@@ -16,8 +16,8 @@
 iLO Power Driver
 """
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/drivers/modules/image_cache.py

@@ -22,8 +22,8 @@ import os
 import tempfile
 import time
 
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.glance_service import service_utils

ironic/drivers/modules/ipminative.py

@@ -22,9 +22,9 @@ Ironic Native IPMI power manager.
 import os
 import tempfile
 
-from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/drivers/modules/ipmitool.py

@@ -36,9 +36,9 @@ import stat
 import tempfile
 import time
 
-from oslo.config import cfg
 from oslo.utils import excutils
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/drivers/modules/irmc/common.py

@@ -15,8 +15,8 @@
 Common functionalities shared between different iRMC modules.
 """
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/drivers/modules/irmc/power.py

@@ -14,8 +14,8 @@
 """
 iRMC Power Driver using the Base Server Profile
 """
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/drivers/modules/iscsi_deploy.py

@@ -15,8 +15,8 @@
 
 import os
 
-from oslo.config import cfg
 from oslo.utils import strutils
+from oslo_config import cfg
 import six
 from six.moves.urllib import parse
 

ironic/drivers/modules/pxe.py

@@ -20,7 +20,7 @@ PXE Driver and supporting meta-classes.
 import os
 import shutil
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import dhcp_factory
 from ironic.common import exception

ironic/drivers/modules/seamicro.py

@@ -21,8 +21,8 @@ Provides vendor passthru methods for SeaMicro specific functionality.
 import os
 import re
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 from six.moves.urllib import parse as urlparse
 
 from ironic.common import boot_devices

ironic/drivers/modules/snmp.py

@@ -29,8 +29,8 @@ models.
 
 import abc
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 import six
 
 from ironic.common import exception

ironic/drivers/modules/ssh.py

@@ -28,8 +28,8 @@ Currently supported environments are:
 
 import os
 
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/migrate_nova/migrate_db.py

@@ -218,7 +218,7 @@ def parse_nova_config(config_file):
     """Parse nova.conf and return known defaults if setting is not present.
 
     This avoids having to import nova code from this script and risk conflicts
-    with Ironic's tree around oslo.config resources.
+    with Ironic's tree around oslo_config resources.
     """
     if not os.path.isfile(config_file):
         print("nova.conf not found at %s. Please specify the location via "

ironic/netconf.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo.utils import netutils
+from oslo_config import cfg
 
 CONF = cfg.CONF
 

ironic/tests/api/base.py

@@ -23,7 +23,7 @@
 # NOTE(deva): import auth_token so we can override a config option
 from keystonemiddleware import auth_token  # noqa
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 import pecan.testing
 from six.moves.urllib import parse as urlparse

ironic/tests/api/test_acl.py

@@ -19,7 +19,7 @@ are blocked or allowed to be processed.
 # NOTE(deva): import auth_token so we can override a config option
 from keystonemiddleware import auth_token  # noqa
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.tests.api import base
 from ironic.tests.api import utils

ironic/tests/api/test_hooks.py

@@ -17,8 +17,8 @@
 import json
 
 import mock
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 from webob import exc as webob_exc
 
 from ironic.api.controllers import root

ironic/tests/api/v1/test_chassis.py

@@ -18,8 +18,8 @@ Tests for the API /chassis/ methods.
 import datetime
 
 import mock
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from six.moves.urllib import parse as urlparse
 from wsme import types as wtypes
 

ironic/tests/api/v1/test_nodes.py

@@ -19,8 +19,8 @@ import datetime
 import json
 
 import mock
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from six.moves.urllib import parse as urlparse
 from testtools.matchers import HasLength
 from wsme import types as wtypes

ironic/tests/api/v1/test_ports.py

@@ -18,8 +18,8 @@ Tests for the API /ports/ methods.
 import datetime
 
 import mock
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from six.moves.urllib import parse as urlparse
 from testtools.matchers import HasLength
 from wsme import types as wtypes

ironic/tests/api/v1/test_utils.py

@@ -18,7 +18,7 @@ import wsme
 from ironic.api.controllers.v1 import utils
 from ironic.tests import base
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 

ironic/tests/base.py

@@ -28,7 +28,7 @@ import sys
 import eventlet
 eventlet.monkey_patch(os=False)
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 
 from ironic.common import hash_ring

ironic/tests/conductor/test_manager.py

@@ -22,8 +22,8 @@ import datetime
 
 import eventlet
 import mock
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 from oslo_db import exception as db_exception
 
 from ironic.common import boot_devices

ironic/tests/conductor/test_rpcapi.py

@@ -21,7 +21,7 @@ Unit Tests for :py:class:`ironic.conductor.rpcapi.ConductorAPI`.
 import copy
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/tests/conf_fixture.py

@@ -15,7 +15,7 @@
 #    under the License.
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import config
 

ironic/tests/db/base.py

@@ -19,7 +19,7 @@ import os
 import shutil
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import paths
 from ironic.db import api as dbapi

ironic/tests/drivers/ilo/test_common.py

@@ -18,8 +18,8 @@
 import tempfile
 
 import mock
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common import images

ironic/tests/drivers/ilo/test_deploy.py

@@ -18,7 +18,7 @@
 import tempfile
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/tests/drivers/ilo/test_management.py

@@ -16,8 +16,8 @@
 """Test class for Management Interface used by iLO modules."""
 
 import mock
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/tests/drivers/ilo/test_power.py

@@ -16,8 +16,8 @@
 """Test class for IloPower module."""
 
 import mock
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/tests/drivers/irmc/test_common.py

@@ -16,7 +16,7 @@ Test class for common methods used by iRMC modules.
 """
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.conductor import task_manager

ironic/tests/drivers/irmc/test_power.py

@@ -16,7 +16,7 @@ Test class for iRMC Power Driver
 """
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common import states

ironic/tests/drivers/test_agent.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import dhcp_factory
 from ironic.common import exception

ironic/tests/drivers/test_console_utils.py

@@ -24,9 +24,9 @@ import subprocess
 import tempfile
 
 import mock
-from oslo.config import cfg
 from oslo.utils import netutils
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common import utils

ironic/tests/drivers/test_deploy_utils.py

@@ -22,8 +22,8 @@ import tempfile
 
 import fixtures
 import mock
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import requests
 
 from ironic.common import disk_partitioner

ironic/tests/drivers/test_ipminative.py

@@ -20,7 +20,7 @@ Test class for Native IPMI power driver module.
 """
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from pyghmi import exceptions as pyghmi_exception
 
 from ironic.common import boot_devices

ironic/tests/drivers/test_ipmitool.py

@@ -25,8 +25,8 @@ import tempfile
 import time
 
 import mock
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import driver_factory

ironic/tests/drivers/test_iscsi_deploy.py

@@ -19,7 +19,7 @@ import os
 import tempfile
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common import keystone

ironic/tests/drivers/test_pxe.py

@@ -22,7 +22,7 @@ import tempfile
 
 import fixtures
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_serialization import jsonutils as json
 
 from ironic.common import dhcp_factory

ironic/tests/drivers/test_snmp.py

@@ -21,7 +21,7 @@
 """Test class for SNMP power driver module."""
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from pysnmp.entity.rfc3413.oneliner import cmdgen
 from pysnmp import error as snmp_error
 

ironic/tests/drivers/test_ssh.py

@@ -17,8 +17,8 @@
 
 import fixtures
 import mock
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import paramiko
 
 from ironic.common import boot_devices

ironic/tests/policy_fixture.py

@@ -15,7 +15,7 @@
 import os
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import policy as ironic_policy
 from ironic.tests import fake_policy

ironic/tests/test_glance_service.py

@@ -32,7 +32,7 @@ from ironic.tests import base
 from ironic.tests import matchers
 from ironic.tests import stubs
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 
 CONF = cfg.CONF

ironic/tests/test_hash_ring.py

@@ -16,7 +16,7 @@
 import hashlib
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from testtools import matchers
 
 from ironic.common import exception

ironic/tests/test_images.py

@@ -20,8 +20,8 @@ import os
 import shutil
 
 import mock
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import six.moves.builtins as __builtin__
 
 from ironic.common import exception

ironic/tests/test_pxe_utils.py

@@ -17,7 +17,7 @@
 import os
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import pxe_utils
 from ironic.conductor import task_manager

ironic/tests/test_swift.py

@@ -16,7 +16,7 @@ import __builtin__
 import sys
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from swiftclient import client as swift_client
 from swiftclient import exceptions as swift_exception
 from swiftclient import utils as swift_utils

ironic/tests/test_utils.py

@@ -23,8 +23,8 @@ import uuid
 
 import mock
 import netaddr
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import six
 import six.moves.builtins as __builtin__