Merge "Switch to using oslo_* instead of oslo.*"

nova/api/auth.py

@@ -16,9 +16,9 @@ Common Auth Middleware.
 
 """
 
-from oslo.config import cfg
-from oslo.middleware import request_id
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_middleware import request_id
+from oslo_serialization import jsonutils
 import webob.dec
 import webob.exc
 

nova/api/compute_req_id.py

@@ -23,7 +23,7 @@ Responses for APIv3 are taken care of by the request_id middleware provided
 in oslo.
 """
 
-from oslo.middleware import base
+from oslo_middleware import base
 import webob.dec
 
 from nova.openstack.common import context

nova/api/ec2/__init__.py

@@ -20,11 +20,11 @@ Starting point for routing EC2 requests.
 
 import hashlib
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import importutils
-from oslo.utils import netutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
+from oslo_utils import importutils
+from oslo_utils import netutils
+from oslo_utils import timeutils
 import requests
 import six
 import webob

nova/api/ec2/apirequest.py

@@ -23,7 +23,7 @@ import datetime
 from xml.dom import minidom
 
 from lxml import etree
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six
 
 from nova.api.ec2 import ec2utils

nova/api/ec2/cloud.py

@@ -23,8 +23,8 @@ datastore.
 import base64
 import time
 
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_utils import timeutils
 
 from nova.api.ec2 import ec2utils
 from nova.api.ec2 import inst_state

nova/api/ec2/ec2utils.py

@@ -17,7 +17,7 @@
 import functools
 import re
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from nova import context
 from nova import exception

nova/api/ec2/faults.py

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

nova/api/metadata/base.py

@@ -20,10 +20,10 @@ import base64
 import os
 import posixpath
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import importutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
+from oslo_utils import importutils
+from oslo_utils import timeutils
 
 from nova.api.ec2 import ec2utils
 from nova.api.metadata import password

nova/api/metadata/handler.py

@@ -19,7 +19,7 @@ import hashlib
 import hmac
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import webob.dec
 import webob.exc

nova/api/metadata/vendordata_json.py

@@ -17,8 +17,8 @@
 
 import errno
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
 
 from nova.api.metadata import base
 from nova.i18n import _LW

nova/api/openstack/__init__.py

@@ -18,7 +18,7 @@
 WSGI middleware for OpenStack API controllers.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 import routes
 import stevedore
 import webob.dec

nova/api/openstack/auth.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
 import webob.dec
 import webob.exc
 

nova/api/openstack/common.py

@@ -19,7 +19,7 @@ import itertools
 import os
 import re
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six.moves.urllib.parse as urlparse
 import webob
 from webob import exc

nova/api/openstack/compute/__init__.py

@@ -18,7 +18,7 @@
 WSGI middleware for OpenStack Compute API.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import nova.api.openstack
 from nova.api.openstack.compute import consoles

nova/api/openstack/compute/contrib/__init__.py

@@ -19,7 +19,7 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.api.openstack import extensions
 from nova.openstack.common import log as logging

nova/api/openstack/compute/contrib/admin_actions.py

@@ -15,7 +15,7 @@
 import os.path
 import traceback
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six
 import webob
 from webob import exc

nova/api/openstack/compute/contrib/assisted_volume_snapshots.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 import webob
 

nova/api/openstack/compute/contrib/availability_zone.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
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi

nova/api/openstack/compute/contrib/baremetal_nodes.py

@@ -15,8 +15,8 @@
 
 """The bare-metal admin extension with Ironic Proxy."""
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 import webob
 
 from nova.api.openstack import extensions

nova/api/openstack/compute/contrib/cells.py

@@ -16,10 +16,10 @@
 
 """The cells extension."""
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.utils import strutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+import oslo_messaging as messaging
+from oslo_utils import strutils
+from oslo_utils import timeutils
 import six
 from webob import exc
 

nova/api/openstack/compute/contrib/cloudpipe.py

@@ -14,8 +14,8 @@
 
 """Connect your vlan to the world."""
 
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_utils import timeutils
 from webob import exc
 
 from nova.api.openstack import extensions

nova/api/openstack/compute/contrib/disk_config.py

@@ -14,7 +14,7 @@
 
 """Disk Config extension."""
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 from webob import exc
 
 from nova.api.openstack import extensions

nova/api/openstack/compute/contrib/evacuate.py

@@ -13,7 +13,7 @@
 #   under the License.
 
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 from webob import exc
 
 from nova.api.openstack import common

nova/api/openstack/compute/contrib/floating_ip_dns.py

@@ -14,7 +14,7 @@
 
 import urllib
 
-from oslo.utils import netutils
+from oslo_utils import netutils
 import webob
 
 from nova.api.openstack import extensions

nova/api/openstack/compute/contrib/floating_ips_bulk.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 import netaddr
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import webob.exc
 

nova/api/openstack/compute/contrib/fping.py

@@ -17,7 +17,7 @@
 import itertools
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from webob import exc
 
 from nova.api.openstack import common

nova/api/openstack/compute/contrib/hide_server_addresses.py

@@ -15,7 +15,7 @@
 
 """Extension for hiding server addresses in certain states."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi

nova/api/openstack/compute/contrib/instance_usage_audit_log.py

@@ -16,7 +16,7 @@
 
 import datetime
 
-from oslo.config import cfg
+from oslo_config import cfg
 import webob.exc
 
 from nova.api.openstack import extensions

nova/api/openstack/compute/contrib/os_tenant_networks.py

@@ -16,7 +16,7 @@
 
 import netaddr
 import netaddr.core as netexc
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import webob
 from webob import exc

nova/api/openstack/compute/contrib/quotas.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six.moves.urllib.parse as urlparse
 import webob
 

nova/api/openstack/compute/contrib/rescue.py

@@ -14,7 +14,7 @@
 
 """The rescue mode extension."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 import webob
 from webob import exc
 

nova/api/openstack/compute/contrib/security_groups.py

@@ -19,7 +19,7 @@
 import contextlib
 from xml.dom import minidom
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 import webob
 from webob import exc

nova/api/openstack/compute/contrib/simple_tenant_usage.py

@@ -16,7 +16,7 @@
 import datetime
 
 import iso8601
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 import six.moves.urllib.parse as urlparse
 from webob import exc

nova/api/openstack/compute/contrib/volumes.py

@@ -15,7 +15,7 @@
 
 """The volumes extension."""
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import webob
 from webob import exc
 

nova/api/openstack/compute/extensions.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 nova.api.openstack import extensions as base_extensions
 from nova.openstack.common import log as logging

nova/api/openstack/compute/flavors.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import webob
 
 from nova.api.openstack import common

nova/api/openstack/compute/limits.py

@@ -38,8 +38,8 @@ import math
 import re
 import time
 
-from oslo.serialization import jsonutils
-from oslo.utils import importutils
+from oslo_serialization import jsonutils
+from oslo_utils import importutils
 import webob.dec
 import webob.exc
 

nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py

@@ -16,7 +16,7 @@
 
 """The Assisted volume snapshots extension."""
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 from webob import exc
 

nova/api/openstack/compute/plugins/v3/availability_zone.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
 
 from nova.api.openstack.compute.schemas.v3 import availability_zone as schema
 from nova.api.openstack import extensions

nova/api/openstack/compute/plugins/v3/baremetal_nodes.py

@@ -16,8 +16,8 @@
 
 """The bare-metal admin extension."""
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 import webob
 
 from nova.api.openstack import extensions

nova/api/openstack/compute/plugins/v3/block_device_mapping_v1.py

@@ -15,7 +15,7 @@
 
 """The legacy block device mappings extension."""
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 from webob import exc
 
 from nova.api.openstack.compute.schemas.v3 import block_device_mapping_v1 as \

nova/api/openstack/compute/plugins/v3/cells.py

@@ -16,9 +16,9 @@
 
 """The cells extension."""
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.utils import strutils
+from oslo_config import cfg
+import oslo_messaging as messaging
+from oslo_utils import strutils
 import six
 from webob import exc
 

nova/api/openstack/compute/plugins/v3/cloudpipe.py

@@ -14,8 +14,8 @@
 
 """Connect your vlan to the world."""
 
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_utils import timeutils
 from webob import exc
 
 from nova.api.openstack.compute.schemas.v3 import cloudpipe

nova/api/openstack/compute/plugins/v3/disk_config.py

@@ -14,7 +14,7 @@
 
 """Disk Config extension."""
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 from webob import exc
 
 from nova.api.openstack.compute.schemas.v3 import disk_config

nova/api/openstack/compute/plugins/v3/evacuate.py

@@ -13,8 +13,8 @@
 #   under the License.
 
 
-from oslo.config import cfg
-from oslo.utils import strutils
+from oslo_config import cfg
+from oslo_utils import strutils
 from webob import exc
 
 from nova.api.openstack import common

nova/api/openstack/compute/plugins/v3/flavors.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import webob
 
 from nova.api.openstack import common

nova/api/openstack/compute/plugins/v3/floating_ip_dns.py

@@ -14,7 +14,7 @@
 
 import urllib
 
-from oslo.utils import netutils
+from oslo_utils import netutils
 import webob
 
 from nova.api.openstack.compute.schemas.v3 import floating_ip_dns

nova/api/openstack/compute/plugins/v3/floating_ips_bulk.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 import netaddr
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import webob.exc
 

nova/api/openstack/compute/plugins/v3/fping.py

@@ -17,7 +17,7 @@
 import itertools
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from webob import exc
 
 from nova.api.openstack import common

nova/api/openstack/compute/plugins/v3/hide_server_addresses.py

@@ -15,7 +15,7 @@
 
 """Extension for hiding server addresses in certain states."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi

nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py

@@ -16,7 +16,7 @@
 
 import datetime
 
-from oslo.config import cfg
+from oslo_config import cfg
 import webob.exc
 
 from nova.api.openstack import extensions

nova/api/openstack/compute/plugins/v3/migrate_server.py

@@ -13,7 +13,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 from webob import exc
 
 from nova.api.openstack import common

nova/api/openstack/compute/plugins/v3/pci.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import webob.exc
 
 from nova.api.openstack import extensions

nova/api/openstack/compute/plugins/v3/quota_sets.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six.moves.urllib.parse as urlparse
 import webob
 

nova/api/openstack/compute/plugins/v3/rescue.py

@@ -14,7 +14,7 @@
 
 """The rescue mode extension."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 from webob import exc
 
 from nova.api.openstack import common

nova/api/openstack/compute/plugins/v3/security_groups.py

@@ -15,7 +15,7 @@
 #    under the License.
 
 """The security groups extension."""
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from webob import exc
 
 from nova.api.openstack import common

nova/api/openstack/compute/plugins/v3/servers.py

@@ -17,10 +17,10 @@
 import base64
 import re
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.utils import strutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+import oslo_messaging as messaging
+from oslo_utils import strutils
+from oslo_utils import timeutils
 import six
 import stevedore
 import webob

nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py

@@ -16,7 +16,7 @@
 import datetime
 
 import iso8601
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 import six.moves.urllib.parse as urlparse
 from webob import exc

nova/api/openstack/compute/plugins/v3/tenant_networks.py

@@ -16,7 +16,7 @@
 
 import netaddr
 import netaddr.core as netexc
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 from webob import exc
 

nova/api/openstack/compute/plugins/v3/volumes.py

@@ -15,7 +15,7 @@
 
 """The volumes extension."""
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 from webob import exc
 
 from nova.api.openstack import common

nova/api/openstack/compute/servers.py

@@ -19,11 +19,11 @@ import os
 import re
 import sys
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.utils import netutils
-from oslo.utils import strutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+import oslo_messaging as messaging
+from oslo_utils import netutils
+from oslo_utils import strutils
+from oslo_utils import timeutils
 import six
 import webob
 from webob import exc

nova/api/openstack/compute/versions.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 nova.api.openstack.compute.views import versions as views_versions
 from nova.api.openstack import wsgi

nova/api/openstack/compute/views/images.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from nova.api.openstack import common
 from nova.image import glance

nova/api/openstack/compute/views/limits.py

@@ -15,7 +15,7 @@
 
 import datetime
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 
 class ViewBuilder(object):

nova/api/openstack/compute/views/servers.py

@@ -16,7 +16,7 @@
 
 import hashlib
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from nova.api.openstack import common
 from nova.api.openstack.compute.views import addresses as views_addresses

nova/api/openstack/extensions.py

@@ -18,7 +18,7 @@ import abc
 import functools
 import os
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 import six
 import webob.dec
 import webob.exc

nova/api/openstack/wsgi.py

@@ -19,8 +19,8 @@ import inspect
 import math
 import time
 
-from oslo.serialization import jsonutils
-from oslo.utils import strutils
+from oslo_serialization import jsonutils
+from oslo_utils import strutils
 import six
 import webob
 

nova/api/sizelimit.py

@@ -15,7 +15,7 @@
 Request Body limiting middleware.
 
 """
-from oslo.middleware import sizelimit
+from oslo_middleware import sizelimit
 
 
 # TODO(ekudryashova): Remove below aliases when grenade jobs

nova/api/validation/validators.py

@@ -21,7 +21,7 @@ import re
 
 import jsonschema
 import netaddr
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import rfc3986
 import six
 

nova/availability_zones.py

@@ -17,7 +17,7 @@
 
 import collections
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import objects
 from nova.openstack.common import memorycache

nova/baserpc.py

@@ -18,9 +18,9 @@
 Base RPC client and server common to all services.
 """
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+import oslo_messaging as messaging
+from oslo_serialization import jsonutils
 
 from nova import rpc
 

nova/block_device.py

@@ -15,8 +15,8 @@
 
 import re
 
-from oslo.config import cfg
-from oslo.utils import strutils
+from oslo_config import cfg
+from oslo_utils import strutils
 
 from nova import exception
 from nova.i18n import _

nova/cells/manager.py

@@ -19,10 +19,10 @@ Cells Service Manager
 import datetime
 import time
 
-from oslo.config import cfg
-from oslo import messaging as oslo_messaging
-from oslo.utils import importutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+import oslo_messaging
+from oslo_utils import importutils
+from oslo_utils import timeutils
 
 from nova.cells import messaging
 from nova.cells import state as cells_state

nova/cells/messaging.py

@@ -30,12 +30,12 @@ import sys
 import traceback
 
 from eventlet import queue
-from oslo.config import cfg
-from oslo import messaging
-from oslo.serialization import jsonutils
-from oslo.utils import excutils
-from oslo.utils import importutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+import oslo_messaging as messaging
+from oslo_serialization import jsonutils
+from oslo_utils import excutils
+from oslo_utils import importutils
+from oslo_utils import timeutils
 import six
 
 from nova.cells import state as cells_state

nova/cells/opts.py

@@ -16,7 +16,7 @@
 Global cells config options
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 cells_opts = [

nova/cells/rpc_driver.py

@@ -17,8 +17,8 @@
 """
 Cells RPC Communication Driver
 """
-from oslo.config import cfg
-from oslo import messaging
+from oslo_config import cfg
+import oslo_messaging as messaging
 
 from nova.cells import driver
 from nova import rpc

nova/cells/rpcapi.py

@@ -23,9 +23,9 @@ services.  That communication is handled by the cells driver via the
 messging module.
 """
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+import oslo_messaging as messaging
+from oslo_serialization import jsonutils
 
 from nova import exception
 from nova.i18n import _LE

nova/cells/scheduler.py

@@ -19,7 +19,7 @@ Cells Scheduler
 import copy
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.cells import filters
 from nova.cells import weights

nova/cells/state.py

@@ -21,11 +21,11 @@ import datetime
 import functools
 import time
 
-from oslo.config import cfg
-from oslo.db import exception as db_exc
-from oslo.serialization import jsonutils
-from oslo.utils import timeutils
-from oslo.utils import units
+from oslo_config import cfg
+from oslo_db import exception as db_exc
+from oslo_serialization import jsonutils
+from oslo_utils import timeutils
+from oslo_utils import units
 
 from nova.cells import rpc_driver
 from nova import context

nova/cells/weights/mute_child.py

@@ -18,8 +18,8 @@ If a child cell hasn't sent capacity or capability updates in a while,
 downgrade its likelihood of being chosen for scheduling requests.
 """
 
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_utils import timeutils
 
 from nova.cells import weights
 from nova.i18n import _LW

nova/cells/weights/ram_by_instance_type.py

@@ -16,7 +16,7 @@
 """
 Weigh cells by memory needed in a way that spreads instances.
 """
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.cells import weights
 

nova/cells/weights/weight_offset.py

@@ -18,7 +18,7 @@ Weigh cells by their weight_offset in the DB.  Cells with higher
 weight_offsets in the DB will be preferred.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.cells import weights
 

nova/cert/manager.py

@@ -24,7 +24,7 @@ Cert manager manages x509 certificates.
 
 import base64
 
-from oslo import messaging
+import oslo_messaging as messaging
 
 from nova import crypto
 from nova import manager

nova/cert/rpcapi.py

@@ -16,8 +16,8 @@
 Client side of the cert manager RPC API.
 """
 
-from oslo.config import cfg
-from oslo import messaging
+from oslo_config import cfg
+import oslo_messaging as messaging
 
 from nova import rpc
 

nova/cloudpipe/pipelib.py

@@ -24,7 +24,7 @@ import os
 import string
 import zipfile
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import compute
 from nova.compute import flavors

nova/cmd/all.py

@@ -26,7 +26,7 @@ continue attempting to launch the rest of the services.
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import config
 from nova.i18n import _LE

nova/cmd/api.py

@@ -22,7 +22,7 @@ Starts both the EC2 and OpenStack APIs in separate greenthreads.
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import config
 from nova import objects

nova/cmd/api_ec2.py

@@ -18,7 +18,7 @@
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import config
 from nova import objects

nova/cmd/api_metadata.py

@@ -18,7 +18,7 @@
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.conductor import rpcapi as conductor_rpcapi
 from nova import config

nova/cmd/api_os_compute.py

@@ -18,7 +18,7 @@
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import config
 from nova import objects

nova/cmd/baseproxy.py

@@ -20,7 +20,7 @@ for Openstack Nova."""
 import os
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import config
 from nova.console import websocketproxy

nova/cmd/cells.py

@@ -17,7 +17,7 @@
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import config
 from nova import objects

nova/cmd/cert.py

@@ -16,7 +16,7 @@
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import config
 from nova.openstack.common import log as logging

nova/cmd/compute.py

@@ -19,7 +19,7 @@
 import sys
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.conductor import rpcapi as conductor_rpcapi
 from nova import config

nova/cmd/conductor.py

@@ -16,8 +16,8 @@
 
 import sys
 
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from nova import config
 from nova import objects

nova/cmd/console.py

@@ -17,7 +17,7 @@
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import config
 from nova.openstack.common import log as logging

nova/cmd/consoleauth.py

@@ -17,7 +17,7 @@
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import config
 from nova import objects

nova/cmd/dhcpbridge.py

@@ -24,9 +24,9 @@ import os
 import sys
 import traceback
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
+from oslo_utils import importutils
 
 from nova.conductor import rpcapi as conductor_rpcapi
 from nova import config

nova/cmd/manage.py

@@ -60,9 +60,9 @@ import sys
 
 import decorator
 import netaddr
-from oslo.config import cfg
-from oslo import messaging
-from oslo.utils import importutils
+from oslo_config import cfg
+import oslo_messaging as messaging
+from oslo_utils import importutils
 import six
 
 from nova.api.ec2 import ec2utils

nova/cmd/network.py

@@ -19,7 +19,7 @@
 import sys
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.conductor import rpcapi as conductor_rpcapi
 from nova import config