diff --git a/nova/api/openstack/placement/wsgi.py b/nova/api/openstack/placement/wsgi.py index 087a0f59bc6..c982f90f9d9 100644 --- a/nova/api/openstack/placement/wsgi.py +++ b/nova/api/openstack/placement/wsgi.py @@ -18,12 +18,12 @@ import os import os.path +from oslo_log import log as logging + from nova.api.openstack.placement import deploy from nova import conf from nova import config -from oslo_log import log as logging - CONFIG_FILE = 'nova.conf' diff --git a/nova/conf/database.py b/nova/conf/database.py index e2a3483c6d4..b0d64db356b 100644 --- a/nova/conf/database.py +++ b/nova/conf/database.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.conf import paths - from oslo_config import cfg from oslo_db import options as oslo_db_options +from nova.conf import paths + _DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('nova.sqlite') diff --git a/nova/conf/xvp.py b/nova/conf/xvp.py index 5c608801bc9..fe83484ce26 100644 --- a/nova/conf/xvp.py +++ b/nova/conf/xvp.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.conf import paths - from oslo_config import cfg +from nova.conf import paths + xvp_group = cfg.OptGroup( 'xvp', title='XVP options', diff --git a/nova/tests/unit/api/openstack/compute/test_availability_zone.py b/nova/tests/unit/api/openstack/compute/test_availability_zone.py index 5b06478fe78..d50d512a30d 100644 --- a/nova/tests/unit/api/openstack/compute/test_availability_zone.py +++ b/nova/tests/unit/api/openstack/compute/test_availability_zone.py @@ -15,6 +15,7 @@ import datetime import iso8601 +from oslo_config import cfg from nova.api.openstack.compute import availability_zone as az_v21 from nova.api.openstack.compute import extension_info @@ -30,7 +31,6 @@ from nova.tests.unit.image import fake from nova.tests.unit import matchers from nova.tests.unit.objects import test_service -from oslo_config import cfg FAKE_UUID = fakes.FAKE_UUID diff --git a/nova/tests/unit/api/openstack/test_wsgi.py b/nova/tests/unit/api/openstack/test_wsgi.py index eddb184ce81..10b13c39218 100644 --- a/nova/tests/unit/api/openstack/test_wsgi.py +++ b/nova/tests/unit/api/openstack/test_wsgi.py @@ -11,6 +11,7 @@ # under the License. import mock +from oslo_serialization import jsonutils import six import testscenarios import webob @@ -24,7 +25,6 @@ from nova.tests.unit.api.openstack import fakes from nova.tests.unit import matchers from nova.tests.unit import utils -from oslo_serialization import jsonutils class MicroversionedTest(testscenarios.WithScenarios, test.NoDBTestCase): diff --git a/nova/tests/unit/compute/test_host_api.py b/nova/tests/unit/compute/test_host_api.py index 2091e4e755a..dc5bb0d5406 100644 --- a/nova/tests/unit/compute/test_host_api.py +++ b/nova/tests/unit/compute/test_host_api.py @@ -18,6 +18,7 @@ import mock from oslo_serialization import jsonutils +import testtools from nova.api.openstack.compute import services from nova.cells import utils as cells_utils @@ -32,7 +33,6 @@ from nova.tests.unit import fake_notifier from nova.tests.unit.objects import test_objects from nova.tests.unit.objects import test_service -import testtools class ComputeHostAPITestCase(test.TestCase): diff --git a/nova/tests/unit/objects/test_security_group.py b/nova/tests/unit/objects/test_security_group.py index 363551f58df..931a479ec13 100644 --- a/nova/tests/unit/objects/test_security_group.py +++ b/nova/tests/unit/objects/test_security_group.py @@ -13,13 +13,13 @@ # under the License. import mock +from oslo_versionedobjects import fixture as ovo_fixture from nova import db from nova.objects import instance from nova.objects import security_group from nova.tests.unit.objects import test_objects from nova.tests import uuidsentinel as uuids -from oslo_versionedobjects import fixture as ovo_fixture fake_secgroup = { diff --git a/nova/tests/unit/volume/test_cinder.py b/nova/tests/unit/volume/test_cinder.py index 6d3aaf54415..f99337457ce 100644 --- a/nova/tests/unit/volume/test_cinder.py +++ b/nova/tests/unit/volume/test_cinder.py @@ -16,6 +16,7 @@ from cinderclient import exceptions as cinder_exception from keystoneclient import exceptions as keystone_exception import mock +from oslo_utils import timeutils import nova.conf from nova import context @@ -25,8 +26,6 @@ from nova.tests import uuidsentinel as uuids from nova.volume import cinder -from oslo_utils import timeutils - CONF = nova.conf.CONF diff --git a/tox.ini b/tox.ini index db0f286e4a9..bfbaf586dac 100644 --- a/tox.ini +++ b/tox.ini @@ -160,6 +160,7 @@ enable-extensions = H106,H203,H904 ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405 exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools/xenserver*,releasenotes import-order-style = pep8 +application-import-names = nova # To get a list of functions that are more complex than 25, set max-complexity # to 25 and run 'tox -epep8'. # 34 is currently the most complex thing we have