Merge "Revert : Switch off oslo.* namespace check temporarily"

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

@@ -15,7 +15,7 @@
 
 """The hypervisors admin extension."""
 
-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/hypervisors.py

@@ -15,7 +15,7 @@
 
 """The hypervisors admin extension."""
 
-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/preserve_ephemeral_rebuild.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 
 from nova.api.openstack.compute.schemas.v3 import preserve_ephemeral_rebuild
 from nova.api.openstack import extensions

nova/objects/vcpu_model.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from nova.compute import arch
 from nova.compute import cpumodel

nova/openstack/common/versionutils.py

@@ -21,7 +21,7 @@ import functools
 import inspect
 import logging
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pkg_resources
 import six
 

nova/tests/unit/api/openstack/compute/contrib/test_tenant_networks.py

@@ -15,7 +15,7 @@
 import copy
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import webob
 
 from nova.api.openstack.compute.contrib import os_tenant_networks as networks

nova/tests/unit/virt/vmwareapi/test_network_util.py

@@ -17,7 +17,7 @@
 import collections
 
 import mock
-from oslo.vmware import vim_util
+from oslo_vmware import vim_util
 
 from nova import test
 from nova.tests.unit.virt.vmwareapi import fake

tox.ini

@@ -68,9 +68,8 @@ commands =
 # The rest of the ignores are TODOs
 # New from hacking 0.9: E129, E131, H407, H405
 # E251 Skipped due to https://github.com/jcrocholl/pep8/issues/301
-# N333 Skip the oslo.* namespace check temporarily
 
-ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405,N333
+ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405
 exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools/xenserver*
 # To get a list of functions that are more complex than 25, set max-complexity
 # to 25 and run 'tox -epep8'.