Switch to using oslo_* instead of oslo.*

The oslo team is recommending everyone to switch to the
non-namespaced versions of libraries. Updating the hacking
rule to include a check to prevent oslo.* import from
creeping back in.

This commit includes:
- using oslo_utils instead of oslo.utils
- using oslo_serialization instead of oslo.serialization
- using oslo_db instead of oslo.db
- using oslo_i18n instead of oslo.i18n
- using oslo_middleware instead of oslo.middleware
- using oslo_config instead of oslo.config
- using oslo_messaging instead of "from oslo import messaging"
- using oslo_vmware instead of oslo.vmware

Change-Id: I3e2eb147b321ce3e928817b62abcb7d023c5f13f

27 files changed, 43 insertions, 43 deletions

diff --git a/nova/scheduler/chance.py b/nova/scheduler/chance.py
index 528711ce2f..f2b0528444 100644
--- a/nova/scheduler/chance.py
+++ b/nova/scheduler/chance.py
@@ -21,7 +21,7 @@ Chance (Random) Scheduler implementation
 
 import random
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import exception
 from nova.i18n import _
diff --git a/nova/scheduler/client/__init__.py b/nova/scheduler/client/__init__.py
index 338a95ad58..6c349d3c00 100644
--- a/nova/scheduler/client/__init__.py
+++ b/nova/scheduler/client/__init__.py
@@ -15,7 +15,7 @@
 
 import functools
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from nova.scheduler import utils
 
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index 1f7e6debe3..91b0cd4f2f 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -19,8 +19,8 @@
 Scheduler base class that all Schedulers should inherit from
 """
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 
 from nova import db
 from nova.i18n import _
diff --git a/nova/scheduler/filter_scheduler.py b/nova/scheduler/filter_scheduler.py
index 80acc020a7..c24687c0a1 100644
--- a/nova/scheduler/filter_scheduler.py
+++ b/nova/scheduler/filter_scheduler.py
@@ -21,7 +21,7 @@ Weighing Functions.
 
 import random
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import exception
 from nova.i18n import _
diff --git a/nova/scheduler/filters/aggregate_image_properties_isolation.py b/nova/scheduler/filters/aggregate_image_properties_isolation.py
index 7ff9e4ff02..4fad37bd29 100644
--- a/nova/scheduler/filters/aggregate_image_properties_isolation.py
+++ b/nova/scheduler/filters/aggregate_image_properties_isolation.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.openstack.common import log as logging
 from nova.scheduler import filters
diff --git a/nova/scheduler/filters/availability_zone_filter.py b/nova/scheduler/filters/availability_zone_filter.py
index 02476e519f..534474fded 100644
--- a/nova/scheduler/filters/availability_zone_filter.py
+++ b/nova/scheduler/filters/availability_zone_filter.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.openstack.common import log as logging
 from nova.scheduler import filters
diff --git a/nova/scheduler/filters/compute_capabilities_filter.py b/nova/scheduler/filters/compute_capabilities_filter.py
index c05d9c35c7..aa3994671d 100644
--- a/nova/scheduler/filters/compute_capabilities_filter.py
+++ b/nova/scheduler/filters/compute_capabilities_filter.py
@@ -13,7 +13,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
 
 from nova.openstack.common import log as logging
diff --git a/nova/scheduler/filters/compute_filter.py b/nova/scheduler/filters/compute_filter.py
index 8cad68ff43..0dbfcf2657 100644
--- a/nova/scheduler/filters/compute_filter.py
+++ b/nova/scheduler/filters/compute_filter.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.i18n import _LW
 from nova.openstack.common import log as logging
diff --git a/nova/scheduler/filters/core_filter.py b/nova/scheduler/filters/core_filter.py
index d588a22dfd..9d00917c87 100644
--- a/nova/scheduler/filters/core_filter.py
+++ b/nova/scheduler/filters/core_filter.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 nova.i18n import _LW
 from nova.openstack.common import log as logging
diff --git a/nova/scheduler/filters/disk_filter.py b/nova/scheduler/filters/disk_filter.py
index 75e1cf03d8..c2e53f4c3a 100644
--- a/nova/scheduler/filters/disk_filter.py
+++ b/nova/scheduler/filters/disk_filter.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.i18n import _LW
 from nova.openstack.common import log as logging
diff --git a/nova/scheduler/filters/io_ops_filter.py b/nova/scheduler/filters/io_ops_filter.py
index e22167a131..f721c76e15 100644
--- a/nova/scheduler/filters/io_ops_filter.py
+++ b/nova/scheduler/filters/io_ops_filter.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.i18n import _LW
 from nova.openstack.common import log as logging
diff --git a/nova/scheduler/filters/isolated_hosts_filter.py b/nova/scheduler/filters/isolated_hosts_filter.py
index 6d383dde09..a77cd2f919 100644
--- a/nova/scheduler/filters/isolated_hosts_filter.py
+++ b/nova/scheduler/filters/isolated_hosts_filter.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.scheduler import filters
 
diff --git a/nova/scheduler/filters/json_filter.py b/nova/scheduler/filters/json_filter.py
index 6f3e914af0..e3f59b2be0 100644
--- a/nova/scheduler/filters/json_filter.py
+++ b/nova/scheduler/filters/json_filter.py
@@ -16,7 +16,7 @@
 
 import operator
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 
 from nova.scheduler import filters
diff --git a/nova/scheduler/filters/metrics_filter.py b/nova/scheduler/filters/metrics_filter.py
index 3118a693ef..a520410194 100644
--- a/nova/scheduler/filters/metrics_filter.py
+++ b/nova/scheduler/filters/metrics_filter.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.openstack.common import log as logging
 from nova.scheduler import filters
diff --git a/nova/scheduler/filters/num_instances_filter.py b/nova/scheduler/filters/num_instances_filter.py
index ea8953d0ef..b596a0ce62 100644
--- a/nova/scheduler/filters/num_instances_filter.py
+++ b/nova/scheduler/filters/num_instances_filter.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.i18n import _LW
 from nova.openstack.common import log as logging
diff --git a/nova/scheduler/filters/numa_topology_filter.py b/nova/scheduler/filters/numa_topology_filter.py
index e0d2fe8d59..9562406c8c 100644
--- a/nova/scheduler/filters/numa_topology_filter.py
+++ b/nova/scheduler/filters/numa_topology_filter.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
 
 from nova.scheduler import filters
 from nova.virt import hardware
diff --git a/nova/scheduler/filters/ram_filter.py b/nova/scheduler/filters/ram_filter.py
index 4677d2feb3..1ebf9d15f7 100644
--- a/nova/scheduler/filters/ram_filter.py
+++ b/nova/scheduler/filters/ram_filter.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 nova.i18n import _LW
 from nova.openstack.common import log as logging
diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py
index 4fd33f6c0e..3b62a12cd6 100644
--- a/nova/scheduler/filters/trusted_filter.py
+++ b/nova/scheduler/filters/trusted_filter.py
@@ -43,9 +43,9 @@ the Open Attestation project at:
     https://github.com/OpenAttestation/OpenAttestation
 """
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
+from oslo_utils import timeutils
 import requests
 
 from nova import context
diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py
index 65e2ff907f..f58a8ee7c3 100644
--- a/nova/scheduler/host_manager.py
+++ b/nova/scheduler/host_manager.py
@@ -20,9 +20,9 @@ Manage hosts in the current zone.
 import collections
 import UserDict
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
+from oslo_utils import timeutils
 
 from nova.compute import task_states
 from nova.compute import vm_states
diff --git a/nova/scheduler/ironic_host_manager.py b/nova/scheduler/ironic_host_manager.py
index 59f3839a4c..7d90fa4466 100644
--- a/nova/scheduler/ironic_host_manager.py
+++ b/nova/scheduler/ironic_host_manager.py
@@ -21,9 +21,9 @@ This host manager will consume all cpu's, disk space, and
 ram from a host / node as it is supporting Baremetal hosts, which can not be
 subdivided into multiple instances.
 """
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
+from oslo_utils import timeutils
 
 from nova.openstack.common import log as logging
 from nova.scheduler import host_manager
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index a272654e46..1599e31ce1 100644
--- a/nova/scheduler/manager.py
+++ b/nova/scheduler/manager.py
@@ -19,10 +19,10 @@
 Scheduler Service
 """
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.serialization import jsonutils
-from oslo.utils import importutils
+from oslo_config import cfg
+import oslo_messaging as messaging
+from oslo_serialization import jsonutils
+from oslo_utils import importutils
 
 from nova import exception
 from nova import manager
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py
index 2bcdabee49..329f561a5d 100644
--- a/nova/scheduler/rpcapi.py
+++ b/nova/scheduler/rpcapi.py
@@ -16,8 +16,8 @@
 Client side of the scheduler manager RPC API.
 """
 
-from oslo.config import cfg
-from oslo import messaging
+from oslo_config import cfg
+import oslo_messaging as messaging
 
 from nova.objects import base as objects_base
 from nova import rpc
diff --git a/nova/scheduler/scheduler_options.py b/nova/scheduler/scheduler_options.py
index 43d04a3f9d..dca38afb34 100644
--- a/nova/scheduler/scheduler_options.py
+++ b/nova/scheduler/scheduler_options.py
@@ -23,10 +23,10 @@ dynamic configuration.
 import datetime
 import os
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import excutils
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
+from oslo_utils import excutils
+from oslo_utils import timeutils
 
 from nova.i18n import _LE
 from nova.openstack.common import log as logging
diff --git a/nova/scheduler/utils.py b/nova/scheduler/utils.py
index c146dcd606..c87796b625 100644
--- a/nova/scheduler/utils.py
+++ b/nova/scheduler/utils.py
@@ -18,9 +18,9 @@ import collections
 import functools
 import sys
 
-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.compute import flavors
 from nova.compute import utils as compute_utils
diff --git a/nova/scheduler/weights/io_ops.py b/nova/scheduler/weights/io_ops.py
index 37f1895519..40b36b6130 100644
--- a/nova/scheduler/weights/io_ops.py
+++ b/nova/scheduler/weights/io_ops.py
@@ -21,7 +21,7 @@ option to a positive number and the weighing has the opposite effect of the
 default.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.scheduler import weights
 
diff --git a/nova/scheduler/weights/metrics.py b/nova/scheduler/weights/metrics.py
index db21498391..602a779945 100644
--- a/nova/scheduler/weights/metrics.py
+++ b/nova/scheduler/weights/metrics.py
@@ -26,7 +26,7 @@ in the configuration file as the followings:
     The final weight would be name1.value * 1.0 + name2.value * -1.0.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova import exception
 from nova.scheduler import utils
diff --git a/nova/scheduler/weights/ram.py b/nova/scheduler/weights/ram.py
index b17ccbe0fa..740a3d2843 100644
--- a/nova/scheduler/weights/ram.py
+++ b/nova/scheduler/weights/ram.py
@@ -20,7 +20,7 @@ stacking, you can set the 'ram_weight_multiplier' option to a negative
 number and the weighing has the opposite effect of the default.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from nova.scheduler import weights