From f3dc6eefe78463047f63c138cff62c664c21a971 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 9 Jul 2014 17:00:21 -0400 Subject: [PATCH] Fix and gate on H305 and H307 Both H305 and H307 are part of the OpenStack style guide. Ensure that there are 3 groups of imports, stdlib, third-party and project specific. Within each category ensure that imports are in alphabetical order. Change-Id: Id4994551c135c3c1a4982153f0c6cacba6176b95 --- nova/api/ec2/apirequest.py | 3 ++- nova/api/openstack/compute/contrib/console_output.py | 1 + nova/api/openstack/compute/contrib/security_groups.py | 1 + nova/api/openstack/compute/plugins/v3/servers.py | 2 +- nova/api/openstack/urlmap.py | 3 ++- nova/api/openstack/xmlutil.py | 6 +++--- nova/cmd/__init__.py | 1 + nova/cmd/baremetal_deploy_helper.py | 9 ++++----- nova/cmd/manage.py | 2 +- nova/compute/monitors/__init__.py | 3 +-- nova/objects/fields.py | 2 +- nova/objects/network.py | 1 - nova/pci/pci_request.py | 3 ++- nova/scheduler/filters/json_filter.py | 1 + nova/tests/api/ec2/test_cloud.py | 2 +- .../compute/contrib/test_availability_zone.py | 1 + .../compute/contrib/test_console_auth_tokens.py | 3 +-- .../openstack/compute/contrib/test_console_output.py | 1 + .../openstack/compute/contrib/test_floating_ip_dns.py | 3 ++- .../api/openstack/compute/contrib/test_services.py | 2 +- .../tests/api/openstack/compute/contrib/test_shelve.py | 1 + .../compute/plugins/v3/test_availability_zone.py | 3 ++- .../api/openstack/compute/plugins/v3/test_flavors.py | 3 +-- .../compute/plugins/v3/test_security_groups.py | 3 ++- .../api/openstack/compute/plugins/v3/test_services.py | 2 +- .../api/openstack/compute/plugins/v3/test_shelve.py | 1 + nova/tests/api/openstack/test_common.py | 3 ++- nova/tests/api/openstack/test_wsgi.py | 1 + nova/tests/api/openstack/test_xmlutil.py | 3 ++- nova/tests/api/test_auth.py | 1 + nova/tests/api/test_sizelimit.py | 3 ++- nova/tests/compute/test_compute.py | 5 ++--- nova/tests/compute/test_compute_api.py | 1 + nova/tests/compute/test_resource_tracker.py | 2 +- nova/tests/compute/test_vmmode.py | 3 +-- nova/tests/conductor/test_conductor.py | 1 + nova/tests/consoleauth/test_consoleauth.py | 1 + nova/tests/db/test_db_api.py | 3 +-- nova/tests/db/test_sqlite.py | 3 ++- nova/tests/image/test_glance.py | 9 +++------ nova/tests/image/test_s3.py | 4 ++-- nova/tests/integrated/test_multiprocess_api.py | 3 ++- nova/tests/matchers.py | 3 +-- .../network/security_group/test_neutron_driver.py | 1 - nova/tests/network/test_manager.py | 1 + nova/tests/objects/test_fields.py | 2 +- nova/tests/objects/test_flavor.py | 1 + nova/tests/objects/test_instance_action.py | 3 ++- nova/tests/scheduler/test_filter_scheduler.py | 2 +- nova/tests/test_cinder.py | 5 ++--- nova/tests/test_configdrive2.py | 6 +++--- nova/tests/test_metadata.py | 2 +- nova/tests/test_nova_manage.py | 3 ++- nova/tests/test_objectstore.py | 2 +- nova/tests/test_service.py | 5 ++--- nova/tests/test_wsgi.py | 8 ++++---- nova/tests/virt/baremetal/test_pxe.py | 1 - nova/tests/virt/baremetal/test_tilera.py | 1 - nova/tests/virt/hyperv/test_networkutilsv2.py | 1 - nova/tests/virt/hyperv/test_rdpconsoleutils.py | 1 - nova/tests/virt/hyperv/test_rdpconsoleutilsv2.py | 1 - nova/tests/virt/hyperv/test_vhdutils.py | 1 - nova/tests/virt/hyperv/test_vhdutilsv2.py | 3 +-- nova/tests/virt/hyperv/test_vmutils.py | 1 - nova/tests/virt/hyperv/test_vmutilsv2.py | 1 - nova/tests/virt/libvirt/test_driver.py | 10 +++++----- nova/tests/virt/libvirt/test_vif.py | 1 + nova/tests/virt/libvirt/test_volume.py | 2 +- nova/tests/virt/test_virt_disk_vfs_guestfs.py | 1 - nova/tests/virt/test_virt_disk_vfs_localfs.py | 1 - nova/tests/virt/test_virt_drivers.py | 2 +- nova/tests/virt/vmwareapi/test_configdrive.py | 2 +- nova/tests/virt/vmwareapi/test_ds_util.py | 1 + nova/tests/virt/vmwareapi/test_imagecache.py | 2 +- nova/tests/virt/vmwareapi/test_vim_util.py | 1 + nova/tests/virt/vmwareapi/test_vm_util.py | 2 +- nova/tests/virt/vmwareapi/test_volumeops.py | 1 + nova/tests/virt/xenapi/image/test_bittorrent.py | 3 +-- nova/tests/virt/xenapi/image/test_vdi_through_dev.py | 3 ++- nova/tests/virt/xenapi/test_volume_utils.py | 3 +-- nova/tests/virt/xenapi/test_xenapi.py | 2 +- nova/virt/configdrive.py | 2 +- nova/virt/hyperv/pathutils.py | 3 ++- nova/virt/hyperv/vhdutils.py | 3 ++- nova/virt/hyperv/vhdutilsv2.py | 3 ++- nova/virt/libvirt/driver.py | 2 +- nova/virt/libvirt/imagebackend.py | 3 +-- nova/virt/storage_users.py | 3 ++- nova/virt/vmwareapi/error_util.py | 1 - nova/virt/xenapi/fake.py | 3 +-- nova/virt/xenapi/image/bittorrent.py | 3 +-- nova/virt/xenapi/image/vdi_through_dev.py | 5 +++-- nova/vnc/xvp_proxy.py | 2 +- nova/wsgi.py | 2 +- .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py | 1 + .../xenserver/xenapi/etc/xapi.d/plugins/xenstore.py | 2 +- tox.ini | 2 +- 97 files changed, 124 insertions(+), 117 deletions(-) diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py index 395ef046ebe7..0854bd7bc50a 100644 --- a/nova/api/ec2/apirequest.py +++ b/nova/api/ec2/apirequest.py @@ -19,10 +19,11 @@ APIRequest class """ import datetime -from lxml import etree # TODO(termie): replace minidom with etree from xml.dom import minidom +from lxml import etree + from nova.api.ec2 import ec2utils from nova import exception from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py index 7fb3502c8eb6..fab5c25afd90 100644 --- a/nova/api/openstack/compute/contrib/console_output.py +++ b/nova/api/openstack/compute/contrib/console_output.py @@ -15,6 +15,7 @@ # under the License. import re + import webob from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index ee3e0ffea35f..a9e4fe2c861e 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -18,6 +18,7 @@ import contextlib import json + import webob from webob import exc diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py index 294de977bd86..eb34c1880482 100644 --- a/nova/api/openstack/compute/plugins/v3/servers.py +++ b/nova/api/openstack/compute/plugins/v3/servers.py @@ -16,11 +16,11 @@ import base64 import re -import stevedore from oslo.config import cfg from oslo import messaging import six +import stevedore import webob from webob import exc diff --git a/nova/api/openstack/urlmap.py b/nova/api/openstack/urlmap.py index b8404c6eb8d7..49a876466ea7 100644 --- a/nova/api/openstack/urlmap.py +++ b/nova/api/openstack/urlmap.py @@ -13,10 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -import paste.urlmap import re import urllib2 +import paste.urlmap + from nova.api.openstack import wsgi diff --git a/nova/api/openstack/xmlutil.py b/nova/api/openstack/xmlutil.py index fab5709d9ae2..68e50f82ea07 100644 --- a/nova/api/openstack/xmlutil.py +++ b/nova/api/openstack/xmlutil.py @@ -14,14 +14,14 @@ # under the License. import os.path - -from lxml import etree -import six from xml.dom import minidom from xml.parsers import expat from xml import sax from xml.sax import expatreader +from lxml import etree +import six + from nova import exception from nova.openstack.common.gettextutils import _ from nova import utils diff --git a/nova/cmd/__init__.py b/nova/cmd/__init__.py index 39f834aeff80..cbe5ae351e67 100644 --- a/nova/cmd/__init__.py +++ b/nova/cmd/__init__.py @@ -30,6 +30,7 @@ if ('eventlet' in sys.modules and os.environ['EVENTLET_NO_GREENDNS'] = 'yes' import eventlet + from nova import debugger if debugger.enabled(): diff --git a/nova/cmd/baremetal_deploy_helper.py b/nova/cmd/baremetal_deploy_helper.py index 08f665f7d2b2..fd997ce8e1d4 100644 --- a/nova/cmd/baremetal_deploy_helper.py +++ b/nova/cmd/baremetal_deploy_helper.py @@ -16,16 +16,15 @@ """Starter script for Bare-Metal Deployment Service.""" -import os -import sys -import threading -import time - import cgi +import os import Queue import re import socket import stat +import sys +import threading +import time from wsgiref import simple_server from nova import config diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index c60fa207d7e9..5f75cb02237a 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -55,10 +55,10 @@ from __future__ import print_function import argparse -import decorator import os import sys +import decorator import netaddr from oslo.config import cfg from oslo import messaging diff --git a/nova/compute/monitors/__init__.py b/nova/compute/monitors/__init__.py index 99529792675f..511738599f3f 100644 --- a/nova/compute/monitors/__init__.py +++ b/nova/compute/monitors/__init__.py @@ -23,9 +23,8 @@ that needs to be implemented by Resource Monitor. import functools import types -import six - from oslo.config import cfg +import six from nova import loadables from nova.openstack.common.gettextutils import _ diff --git a/nova/objects/fields.py b/nova/objects/fields.py index 722af5bf065c..57936a28e96e 100644 --- a/nova/objects/fields.py +++ b/nova/objects/fields.py @@ -14,8 +14,8 @@ import abc import datetime -import iso8601 +import iso8601 import netaddr import six diff --git a/nova/objects/network.py b/nova/objects/network.py index 32baed9eb00b..829ff518349b 100644 --- a/nova/objects/network.py +++ b/nova/objects/network.py @@ -13,7 +13,6 @@ # under the License. import netaddr - from oslo.config import cfg from nova import db diff --git a/nova/pci/pci_request.py b/nova/pci/pci_request.py index d69097c4fd53..d07dfbd96dde 100644 --- a/nova/pci/pci_request.py +++ b/nova/pci/pci_request.py @@ -33,14 +33,15 @@ """ import copy + import jsonschema +from oslo.config import cfg from nova import exception from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.pci import pci_utils from nova import utils -from oslo.config import cfg pci_alias_opts = [ cfg.MultiStrOpt('pci_alias', diff --git a/nova/scheduler/filters/json_filter.py b/nova/scheduler/filters/json_filter.py index 19a3b1e13dff..6c813579adad 100644 --- a/nova/scheduler/filters/json_filter.py +++ b/nova/scheduler/filters/json_filter.py @@ -15,6 +15,7 @@ import operator + import six from nova.openstack.common import jsonutils diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index 5ad292d9ec82..90f95e0ded44 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -20,12 +20,12 @@ import base64 import copy import datetime import functools -import iso8601 import os import string import tempfile import fixtures +import iso8601 import mock from oslo.config import cfg diff --git a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py b/nova/tests/api/openstack/compute/contrib/test_availability_zone.py index e8d3adf5be60..3bfd0748a0ea 100644 --- a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py +++ b/nova/tests/api/openstack/compute/contrib/test_availability_zone.py @@ -13,6 +13,7 @@ # under the License. import datetime + from lxml import etree import webob diff --git a/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py b/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py index 33782414326d..ce6c8856bff1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py +++ b/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import webob - from oslo.config import cfg +import webob from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context diff --git a/nova/tests/api/openstack/compute/contrib/test_console_output.py b/nova/tests/api/openstack/compute/contrib/test_console_output.py index 67a99d4903a5..d3feafb81998 100644 --- a/nova/tests/api/openstack/compute/contrib/test_console_output.py +++ b/nova/tests/api/openstack/compute/contrib/test_console_output.py @@ -14,6 +14,7 @@ # under the License. import string + import webob from nova.compute import api as compute_api diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py b/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py index 685b25b3a8bd..7eeab5c0c4d0 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py +++ b/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py @@ -14,8 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree import urllib + +from lxml import etree import webob from nova.api.openstack.compute.contrib import floating_ip_dns diff --git a/nova/tests/api/openstack/compute/contrib/test_services.py b/nova/tests/api/openstack/compute/contrib/test_services.py index b1587da4c9e2..74f07b92da20 100644 --- a/nova/tests/api/openstack/compute/contrib/test_services.py +++ b/nova/tests/api/openstack/compute/contrib/test_services.py @@ -15,8 +15,8 @@ import calendar import datetime -import iso8601 +import iso8601 import mock import webob.exc diff --git a/nova/tests/api/openstack/compute/contrib/test_shelve.py b/nova/tests/api/openstack/compute/contrib/test_shelve.py index 003dc5a563d6..43f852019cd1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_shelve.py +++ b/nova/tests/api/openstack/compute/contrib/test_shelve.py @@ -13,6 +13,7 @@ # under the License. import uuid + import webob from nova.api.openstack.compute.contrib import shelve diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_availability_zone.py b/nova/tests/api/openstack/compute/plugins/v3/test_availability_zone.py index df8d4808a025..ef41a7ef7bfa 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_availability_zone.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_availability_zone.py @@ -13,8 +13,9 @@ # under the License. import datetime -from oslo.config import cfg import uuid + +from oslo.config import cfg import webob from nova.api.openstack.compute import plugins diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py index 25c0cfeb5600..5f9f1a883d02 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py @@ -17,12 +17,11 @@ import six.moves.urllib.parse as urlparse import webob from nova.api.openstack.compute.plugins.v3 import flavors -from nova.openstack.common import jsonutils - import nova.compute.flavors from nova import context from nova import db from nova import exception +from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import matchers diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py b/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py index 50a6d8fe0be7..a055ffb561b4 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py @@ -14,8 +14,9 @@ # under the License. import datetime -from oslo.config import cfg import uuid + +from oslo.config import cfg import webob from nova.api.openstack.compute import plugins diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_services.py b/nova/tests/api/openstack/compute/plugins/v3/test_services.py index 4ed09b1ca211..85fca352b7e0 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_services.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_services.py @@ -14,8 +14,8 @@ import calendar import datetime -import iso8601 +import iso8601 import mock import webob.exc diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_shelve.py b/nova/tests/api/openstack/compute/plugins/v3/test_shelve.py index 717d9b27a37b..b790e45d09a5 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_shelve.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_shelve.py @@ -13,6 +13,7 @@ # under the License. import uuid + import webob from nova.api.openstack.compute.plugins.v3 import shelve diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py index c18e8cac1c21..41ffea15264f 100644 --- a/nova/tests/api/openstack/test_common.py +++ b/nova/tests/api/openstack/test_common.py @@ -17,12 +17,13 @@ Test suites for 'common' code used throughout the OpenStack HTTP API. """ +import xml.dom.minidom as minidom + from lxml import etree import mock from testtools import matchers import webob import webob.exc -import xml.dom.minidom as minidom from nova.api.openstack import common from nova.api.openstack import xmlutil diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py index 4d2234009aa5..ebbbf06646f5 100644 --- a/nova/tests/api/openstack/test_wsgi.py +++ b/nova/tests/api/openstack/test_wsgi.py @@ -11,6 +11,7 @@ # under the License. import inspect + import webob from nova.api.openstack import extensions diff --git a/nova/tests/api/openstack/test_xmlutil.py b/nova/tests/api/openstack/test_xmlutil.py index 75822a54edca..903340c8d6cb 100644 --- a/nova/tests/api/openstack/test_xmlutil.py +++ b/nova/tests/api/openstack/test_xmlutil.py @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from lxml import etree from xml.dom import minidom +from lxml import etree + from nova.api.openstack import xmlutil from nova import exception from nova import test diff --git a/nova/tests/api/test_auth.py b/nova/tests/api/test_auth.py index f4746e5704f8..819790919294 100644 --- a/nova/tests/api/test_auth.py +++ b/nova/tests/api/test_auth.py @@ -13,6 +13,7 @@ # under the License. import json + from oslo.config import cfg import webob import webob.exc diff --git a/nova/tests/api/test_sizelimit.py b/nova/tests/api/test_sizelimit.py index 7641661a3fec..5674fbfe3791 100644 --- a/nova/tests/api/test_sizelimit.py +++ b/nova/tests/api/test_sizelimit.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg import StringIO + +from oslo.config import cfg import webob import nova.api.sizelimit diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index c5abdadefca7..377e89430a06 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -22,20 +22,19 @@ import contextlib import datetime import operator import sys -import testtools import time import traceback import uuid +from eventlet import greenthread import mock import mox from oslo.config import cfg from oslo import messaging import six +import testtools from testtools import matchers as testtools_matchers -from eventlet import greenthread - import nova from nova import availability_zones from nova import block_device diff --git a/nova/tests/compute/test_compute_api.py b/nova/tests/compute/test_compute_api.py index 84c9a06edb06..2245ab46cc25 100644 --- a/nova/tests/compute/test_compute_api.py +++ b/nova/tests/compute/test_compute_api.py @@ -16,6 +16,7 @@ import contextlib import copy import datetime + import iso8601 import mock import mox diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index 0486abc514fe..46b1e5ffc194 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -15,9 +15,9 @@ """Tests for compute resource tracking.""" -import mock import uuid +import mock from oslo.config import cfg from nova.compute import flavors diff --git a/nova/tests/compute/test_vmmode.py b/nova/tests/compute/test_vmmode.py index 09d8a5b9b766..afcdbdf0d325 100644 --- a/nova/tests/compute/test_vmmode.py +++ b/nova/tests/compute/test_vmmode.py @@ -12,11 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. +from nova.compute import vm_mode from nova import exception from nova import test -from nova.compute import vm_mode - class ComputeVMModeTest(test.NoDBTestCase): diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index 936625edba0e..11bf143bb681 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -16,6 +16,7 @@ """Tests for the conductor service.""" import contextlib + import mock import mox from oslo import messaging diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py index 299957daf28b..110e1c0c99e3 100644 --- a/nova/tests/consoleauth/test_consoleauth.py +++ b/nova/tests/consoleauth/test_consoleauth.py @@ -19,6 +19,7 @@ Tests for Consoleauth Code. """ import mox + from nova.consoleauth import manager from nova import context from nova import db diff --git a/nova/tests/db/test_db_api.py b/nova/tests/db/test_db_api.py index 8213c70e27bc..b23355e738ed 100644 --- a/nova/tests/db/test_db_api.py +++ b/nova/tests/db/test_db_api.py @@ -20,11 +20,11 @@ import copy import datetime -import iso8601 import types import uuid as stdlib_uuid import eventlet +import iso8601 import mox import netaddr from oslo.config import cfg @@ -61,7 +61,6 @@ from nova import test from nova.tests import matchers from nova import utils - CONF = cfg.CONF CONF.import_opt('reserved_host_memory_mb', 'nova.compute.resource_tracker') CONF.import_opt('reserved_host_disk_mb', 'nova.compute.resource_tracker') diff --git a/nova/tests/db/test_sqlite.py b/nova/tests/db/test_sqlite.py index 3891ea72b443..e6a0951017e5 100644 --- a/nova/tests/db/test_sqlite.py +++ b/nova/tests/db/test_sqlite.py @@ -17,12 +17,13 @@ """Test cases for sqlite-specific logic""" -from nova import test from sqlalchemy import create_engine from sqlalchemy import Column, BigInteger, String import sqlalchemy.engine.reflection from sqlalchemy.ext.declarative import declarative_base +from nova import test + class TestSqlite(test.NoDBTestCase): """Tests for sqlite-specific logic.""" diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py index bdf6f32da267..557ab252988a 100644 --- a/nova/tests/image/test_glance.py +++ b/nova/tests/image/test_glance.py @@ -18,17 +18,15 @@ import datetime import filecmp import os import random +import sys import tempfile import time -import sys -import testtools - +import glanceclient.exc import mock import mox - -import glanceclient.exc from oslo.config import cfg +import testtools from nova import context from nova import exception @@ -37,7 +35,6 @@ from nova import test from nova.tests.api.openstack import fakes from nova.tests.glance import stubs as glance_stubs from nova import utils - import nova.virt.libvirt.utils as lv_utils CONF = cfg.CONF diff --git a/nova/tests/image/test_s3.py b/nova/tests/image/test_s3.py index b1749a86ed2c..d5fb984a3042 100644 --- a/nova/tests/image/test_s3.py +++ b/nova/tests/image/test_s3.py @@ -14,12 +14,12 @@ # under the License. import binascii -import eventlet -import mox import os import tempfile +import eventlet import fixtures +import mox from nova.api.ec2 import ec2utils from nova import context diff --git a/nova/tests/integrated/test_multiprocess_api.py b/nova/tests/integrated/test_multiprocess_api.py index fee7cd86d40f..a0725e9baa3e 100644 --- a/nova/tests/integrated/test_multiprocess_api.py +++ b/nova/tests/integrated/test_multiprocess_api.py @@ -17,12 +17,13 @@ Test multiprocess enabled API service. """ import errno -import fixtures import os import signal import time import traceback +import fixtures + from nova.openstack.common import log as logging from nova import service from nova.tests.integrated.api import client diff --git a/nova/tests/matchers.py b/nova/tests/matchers.py index 8107250d4c57..fc3db616ec26 100644 --- a/nova/tests/matchers.py +++ b/nova/tests/matchers.py @@ -18,9 +18,8 @@ import pprint -from testtools import content - from lxml import etree +from testtools import content class DictKeysMismatch(object): diff --git a/nova/tests/network/security_group/test_neutron_driver.py b/nova/tests/network/security_group/test_neutron_driver.py index 112f0776f8f3..1dadd9ed1a17 100644 --- a/nova/tests/network/security_group/test_neutron_driver.py +++ b/nova/tests/network/security_group/test_neutron_driver.py @@ -14,7 +14,6 @@ # under the License. # import mox - from neutronclient.common import exceptions as n_exc from neutronclient.v2_0 import client diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index b44cfb73d733..e8f73a2b233c 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -16,6 +16,7 @@ # under the License. import contextlib + import fixtures import mock import mox diff --git a/nova/tests/objects/test_fields.py b/nova/tests/objects/test_fields.py index f236b3efbc5c..fd437a22075b 100644 --- a/nova/tests/objects/test_fields.py +++ b/nova/tests/objects/test_fields.py @@ -13,8 +13,8 @@ # under the License. import datetime -import iso8601 +import iso8601 import netaddr from nova.network import model as network_model diff --git a/nova/tests/objects/test_flavor.py b/nova/tests/objects/test_flavor.py index b7db04df6f8c..6cf69e1e0f92 100644 --- a/nova/tests/objects/test_flavor.py +++ b/nova/tests/objects/test_flavor.py @@ -13,6 +13,7 @@ # under the License. import contextlib + import mock from nova import db diff --git a/nova/tests/objects/test_instance_action.py b/nova/tests/objects/test_instance_action.py index 7611ced6900e..9d4bc969c107 100644 --- a/nova/tests/objects/test_instance_action.py +++ b/nova/tests/objects/test_instance_action.py @@ -12,9 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import traceback +import mock + from nova import db from nova.objects import instance_action from nova.openstack.common import timeutils diff --git a/nova/tests/scheduler/test_filter_scheduler.py b/nova/tests/scheduler/test_filter_scheduler.py index 8af2bd9f0e7f..3e715dbd77b5 100644 --- a/nova/tests/scheduler/test_filter_scheduler.py +++ b/nova/tests/scheduler/test_filter_scheduler.py @@ -17,9 +17,9 @@ Tests For Filter Scheduler. """ import contextlib -import mock import uuid +import mock import mox from nova.compute import utils as compute_utils diff --git a/nova/tests/test_cinder.py b/nova/tests/test_cinder.py index 707136de8e18..81e1fd4f5e2e 100644 --- a/nova/tests/test_cinder.py +++ b/nova/tests/test_cinder.py @@ -12,14 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. +from cinderclient import exceptions as cinder_exception import six.moves.urllib.parse as urlparse -from cinderclient import exceptions as cinder_exception from nova import context from nova import exception -from nova.volume import cinder - from nova import test +from nova.volume import cinder def _stub_volume(**kwargs): diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py index a59345637e5a..2940f9ae48b1 100644 --- a/nova/tests/test_configdrive2.py +++ b/nova/tests/test_configdrive2.py @@ -14,16 +14,16 @@ # under the License. -import mox import os import tempfile -from nova import test +import mox +from oslo.config import cfg from nova.openstack.common import fileutils +from nova import test from nova import utils from nova.virt import configdrive -from oslo.config import cfg CONF = cfg.CONF diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 581bf01e795d..db5492b70de9 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -20,7 +20,6 @@ import base64 import hashlib import hmac import json -import mock import re try: @@ -28,6 +27,7 @@ try: except ImportError: import pickle +import mock from oslo.config import cfg import webob diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index 6ba1785a7456..4877b135f3e3 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -13,10 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -import fixtures import StringIO import sys +import fixtures + from nova.cmd import manage from nova import context from nova import db diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py index 3f10cab282ee..a8023d5f0143 100644 --- a/nova/tests/test_objectstore.py +++ b/nova/tests/test_objectstore.py @@ -18,11 +18,11 @@ Unittets for S3 objectstore clone. """ -import boto import os import shutil import tempfile +import boto from boto import exception as boto_exception from boto.s3 import connection as s3 from oslo.config import cfg diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py index 84826c563e34..c5c18b113095 100644 --- a/nova/tests/test_service.py +++ b/nova/tests/test_service.py @@ -19,24 +19,23 @@ Unit Tests for remote procedure calls using queue """ import sys -import testtools import mock import mox from oslo.config import cfg +import testtools from nova import context from nova import db from nova import exception from nova import manager +from nova.openstack.common import service as _service from nova import rpc from nova import service from nova import test from nova.tests import utils from nova import wsgi -from nova.openstack.common import service as _service - test_service_opts = [ cfg.StrOpt("fake_manager", default="nova.tests.test_service.FakeManager", diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py index 76a145d3ad4c..1ab354241165 100644 --- a/nova/tests/test_wsgi.py +++ b/nova/tests/test_wsgi.py @@ -18,20 +18,20 @@ import os.path import tempfile -import testtools +import urllib2 import eventlet import eventlet.wsgi import mock +from oslo.config import cfg import requests +import testtools +import webob import nova.exception from nova import test from nova.tests import utils import nova.wsgi -from oslo.config import cfg -import urllib2 -import webob SSL_CERT_DIR = os.path.normpath(os.path.join( os.path.dirname(os.path.abspath(__file__)), diff --git a/nova/tests/virt/baremetal/test_pxe.py b/nova/tests/virt/baremetal/test_pxe.py index 297bb4d01c88..d0c8f52111e0 100644 --- a/nova/tests/virt/baremetal/test_pxe.py +++ b/nova/tests/virt/baremetal/test_pxe.py @@ -21,7 +21,6 @@ import os import mox - from oslo.config import cfg from testtools import matchers diff --git a/nova/tests/virt/baremetal/test_tilera.py b/nova/tests/virt/baremetal/test_tilera.py index 7c9a1ca4180a..bcb15250f395 100644 --- a/nova/tests/virt/baremetal/test_tilera.py +++ b/nova/tests/virt/baremetal/test_tilera.py @@ -20,7 +20,6 @@ import os import mox - from oslo.config import cfg from nova import exception diff --git a/nova/tests/virt/hyperv/test_networkutilsv2.py b/nova/tests/virt/hyperv/test_networkutilsv2.py index 8949db8b3245..7864047fdcd9 100644 --- a/nova/tests/virt/hyperv/test_networkutilsv2.py +++ b/nova/tests/virt/hyperv/test_networkutilsv2.py @@ -15,7 +15,6 @@ import mock from nova import test - from nova.virt.hyperv import networkutilsv2 from nova.virt.hyperv import vmutils diff --git a/nova/tests/virt/hyperv/test_rdpconsoleutils.py b/nova/tests/virt/hyperv/test_rdpconsoleutils.py index 2818e5280571..98d4484b61d1 100644 --- a/nova/tests/virt/hyperv/test_rdpconsoleutils.py +++ b/nova/tests/virt/hyperv/test_rdpconsoleutils.py @@ -13,7 +13,6 @@ # under the License. from nova import test - from nova.virt.hyperv import rdpconsoleutils diff --git a/nova/tests/virt/hyperv/test_rdpconsoleutilsv2.py b/nova/tests/virt/hyperv/test_rdpconsoleutilsv2.py index 1dfd6dff1783..bcdfaf92f088 100644 --- a/nova/tests/virt/hyperv/test_rdpconsoleutilsv2.py +++ b/nova/tests/virt/hyperv/test_rdpconsoleutilsv2.py @@ -15,7 +15,6 @@ import mock from nova import test - from nova.virt.hyperv import rdpconsoleutilsv2 diff --git a/nova/tests/virt/hyperv/test_vhdutils.py b/nova/tests/virt/hyperv/test_vhdutils.py index 12595c3bfde7..c08a8902e6a5 100644 --- a/nova/tests/virt/hyperv/test_vhdutils.py +++ b/nova/tests/virt/hyperv/test_vhdutils.py @@ -15,7 +15,6 @@ import mock from nova import test - from nova.virt.hyperv import constants from nova.virt.hyperv import vhdutils from nova.virt.hyperv import vmutils diff --git a/nova/tests/virt/hyperv/test_vhdutilsv2.py b/nova/tests/virt/hyperv/test_vhdutilsv2.py index 648855e6c55f..4058654c9d0d 100644 --- a/nova/tests/virt/hyperv/test_vhdutilsv2.py +++ b/nova/tests/virt/hyperv/test_vhdutilsv2.py @@ -14,9 +14,8 @@ import mock -from nova import test - from nova.openstack.common import units +from nova import test from nova.virt.hyperv import constants from nova.virt.hyperv import vhdutilsv2 diff --git a/nova/tests/virt/hyperv/test_vmutils.py b/nova/tests/virt/hyperv/test_vmutils.py index f79ea42c0239..c9e029ba3df9 100644 --- a/nova/tests/virt/hyperv/test_vmutils.py +++ b/nova/tests/virt/hyperv/test_vmutils.py @@ -16,7 +16,6 @@ import mock from nova import test - from nova.virt.hyperv import vmutils diff --git a/nova/tests/virt/hyperv/test_vmutilsv2.py b/nova/tests/virt/hyperv/test_vmutilsv2.py index 4aaf5e6603f7..2a49acf5cb54 100644 --- a/nova/tests/virt/hyperv/test_vmutilsv2.py +++ b/nova/tests/virt/hyperv/test_vmutilsv2.py @@ -15,7 +15,6 @@ import mock from nova import test - from nova.virt.hyperv import vmutilsv2 diff --git a/nova/tests/virt/libvirt/test_driver.py b/nova/tests/virt/libvirt/test_driver.py index 73d5215e94e7..1c3b6134c3c2 100644 --- a/nova/tests/virt/libvirt/test_driver.py +++ b/nova/tests/virt/libvirt/test_driver.py @@ -16,21 +16,21 @@ import contextlib import copy import errno -import eventlet -import fixtures import functools -import mox import os import re import shutil import tempfile import uuid +from xml.dom import minidom +import eventlet from eventlet import greenthread +import fixtures from lxml import etree import mock +import mox from oslo.config import cfg -from xml.dom import minidom from nova.api.ec2 import cloud from nova.compute import flavors @@ -7864,7 +7864,7 @@ class IptablesFirewallTestCase(test.TestCase): from nova.network import linux_net linux_net.iptables_manager.execute = fake_iptables_execute - from nova.compute import utils as compute_utils + from nova.compute import utils as compute_utils # noqa self.stubs.Set(compute_utils, 'get_nw_info_for_instance', lambda instance: network_model) diff --git a/nova/tests/virt/libvirt/test_vif.py b/nova/tests/virt/libvirt/test_vif.py index 6589495ffb82..68ba269a68fa 100644 --- a/nova/tests/virt/libvirt/test_vif.py +++ b/nova/tests/virt/libvirt/test_vif.py @@ -13,6 +13,7 @@ # under the License. import contextlib + from lxml import etree import mock from oslo.config import cfg diff --git a/nova/tests/virt/libvirt/test_volume.py b/nova/tests/virt/libvirt/test_volume.py index 65c3456b88e4..d86b90d74c7e 100644 --- a/nova/tests/virt/libvirt/test_volume.py +++ b/nova/tests/virt/libvirt/test_volume.py @@ -14,10 +14,10 @@ # under the License. import contextlib -import fixtures import os import time +import fixtures import mock from oslo.config import cfg diff --git a/nova/tests/virt/test_virt_disk_vfs_guestfs.py b/nova/tests/virt/test_virt_disk_vfs_guestfs.py index 5210e4a7f915..353319b9887d 100644 --- a/nova/tests/virt/test_virt_disk_vfs_guestfs.py +++ b/nova/tests/virt/test_virt_disk_vfs_guestfs.py @@ -16,7 +16,6 @@ import sys from nova import exception from nova import test - from nova.tests import fakeguestfs from nova.virt.disk.vfs import guestfs as vfsimpl diff --git a/nova/tests/virt/test_virt_disk_vfs_localfs.py b/nova/tests/virt/test_virt_disk_vfs_localfs.py index dff98aa29d02..7c88708b948c 100644 --- a/nova/tests/virt/test_virt_disk_vfs_localfs.py +++ b/nova/tests/virt/test_virt_disk_vfs_localfs.py @@ -19,7 +19,6 @@ from nova.openstack.common import processutils from nova import test from nova.tests import utils as tests_utils import nova.utils - from nova.virt.disk.vfs import localfs as vfsimpl CONF = cfg.CONF diff --git a/nova/tests/virt/test_virt_drivers.py b/nova/tests/virt/test_virt_drivers.py index 9ba64c46f345..d45b2b9de121 100644 --- a/nova/tests/virt/test_virt_drivers.py +++ b/nova/tests/virt/test_virt_drivers.py @@ -13,10 +13,10 @@ # under the License. import base64 -import fixtures import sys import traceback +import fixtures import mock import netaddr import six diff --git a/nova/tests/virt/vmwareapi/test_configdrive.py b/nova/tests/virt/vmwareapi/test_configdrive.py index 6eb3ab14ff19..e957dbdb02cf 100644 --- a/nova/tests/virt/vmwareapi/test_configdrive.py +++ b/nova/tests/virt/vmwareapi/test_configdrive.py @@ -15,8 +15,8 @@ import contextlib import copy -import fixtures +import fixtures import mock import mox diff --git a/nova/tests/virt/vmwareapi/test_ds_util.py b/nova/tests/virt/vmwareapi/test_ds_util.py index 2417b36ba4c4..fcf852d12996 100644 --- a/nova/tests/virt/vmwareapi/test_ds_util.py +++ b/nova/tests/virt/vmwareapi/test_ds_util.py @@ -13,6 +13,7 @@ # under the License. import contextlib + import mock from nova.openstack.common import units diff --git a/nova/tests/virt/vmwareapi/test_imagecache.py b/nova/tests/virt/vmwareapi/test_imagecache.py index 24df7f950b7f..4917296d7f54 100644 --- a/nova/tests/virt/vmwareapi/test_imagecache.py +++ b/nova/tests/virt/vmwareapi/test_imagecache.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +import contextlib import datetime -import contextlib import mock from oslo.config import cfg diff --git a/nova/tests/virt/vmwareapi/test_vim_util.py b/nova/tests/virt/vmwareapi/test_vim_util.py index dcb22ba96884..a8aef84eb33f 100644 --- a/nova/tests/virt/vmwareapi/test_vim_util.py +++ b/nova/tests/virt/vmwareapi/test_vim_util.py @@ -13,6 +13,7 @@ # under the License. import collections + import fixtures import mock diff --git a/nova/tests/virt/vmwareapi/test_vm_util.py b/nova/tests/virt/vmwareapi/test_vm_util.py index 0b1112385cdb..15c4be350389 100644 --- a/nova/tests/virt/vmwareapi/test_vm_util.py +++ b/nova/tests/virt/vmwareapi/test_vm_util.py @@ -15,9 +15,9 @@ # under the License. import collections +import contextlib import re -import contextlib import mock from nova import exception diff --git a/nova/tests/virt/vmwareapi/test_volumeops.py b/nova/tests/virt/vmwareapi/test_volumeops.py index 9941823bc011..1d05843a549b 100644 --- a/nova/tests/virt/vmwareapi/test_volumeops.py +++ b/nova/tests/virt/vmwareapi/test_volumeops.py @@ -13,6 +13,7 @@ # under the License. import contextlib + import mock from nova import test diff --git a/nova/tests/virt/xenapi/image/test_bittorrent.py b/nova/tests/virt/xenapi/image/test_bittorrent.py index 33c60a2a5607..e3a70c5a242c 100644 --- a/nova/tests/virt/xenapi/image/test_bittorrent.py +++ b/nova/tests/virt/xenapi/image/test_bittorrent.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import pkg_resources - import mox +import pkg_resources from nova import context from nova.openstack.common.gettextutils import _ diff --git a/nova/tests/virt/xenapi/image/test_vdi_through_dev.py b/nova/tests/virt/xenapi/image/test_vdi_through_dev.py index 346aa0c124ab..ebf3d82ba14a 100644 --- a/nova/tests/virt/xenapi/image/test_vdi_through_dev.py +++ b/nova/tests/virt/xenapi/image/test_vdi_through_dev.py @@ -14,9 +14,10 @@ # under the License. import contextlib -import eventlet import tarfile +import eventlet + from nova.image import glance from nova import test from nova.virt.xenapi.client import session as xenapi_session diff --git a/nova/tests/virt/xenapi/test_volume_utils.py b/nova/tests/virt/xenapi/test_volume_utils.py index 051e5dcc63e5..1779bf2e50ef 100644 --- a/nova/tests/virt/xenapi/test_volume_utils.py +++ b/nova/tests/virt/xenapi/test_volume_utils.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock - from eventlet import greenthread +import mock from nova import exception from nova import test diff --git a/nova/tests/virt/xenapi/test_xenapi.py b/nova/tests/virt/xenapi/test_xenapi.py index b8ca2222a59a..d801018716d9 100644 --- a/nova/tests/virt/xenapi/test_xenapi.py +++ b/nova/tests/virt/xenapi/test_xenapi.py @@ -2622,7 +2622,7 @@ class XenAPIDom0IptablesFirewallTestCase(stubs.XenAPITestBase): network_model = fake_network.fake_get_instance_nw_info(self.stubs, 1) - from nova.compute import utils as compute_utils + from nova.compute import utils as compute_utils # noqa self.stubs.Set(compute_utils, 'get_nw_info_for_instance', lambda instance: network_model) diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index c9ca8f01b835..13ff8d873611 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -19,12 +19,12 @@ import os import shutil import tempfile -from nova.openstack.common import strutils from oslo.config import cfg from nova import exception from nova.openstack.common import fileutils from nova.openstack.common import log as logging +from nova.openstack.common import strutils from nova.openstack.common import units from nova import utils from nova import version diff --git a/nova/virt/hyperv/pathutils.py b/nova/virt/hyperv/pathutils.py index a36829edfee1..853281899d2f 100644 --- a/nova/virt/hyperv/pathutils.py +++ b/nova/virt/hyperv/pathutils.py @@ -16,10 +16,11 @@ import os import shutil +from oslo.config import cfg + from nova.openstack.common.gettextutils import _ from nova.openstack.common import log as logging from nova import utils -from oslo.config import cfg LOG = logging.getLogger(__name__) diff --git a/nova/virt/hyperv/vhdutils.py b/nova/virt/hyperv/vhdutils.py index 6bc0e55226d6..a7c650272035 100644 --- a/nova/virt/hyperv/vhdutils.py +++ b/nova/virt/hyperv/vhdutils.py @@ -29,10 +29,11 @@ import sys if sys.platform == 'win32': import wmi +from xml.etree import ElementTree + from nova.openstack.common.gettextutils import _ from nova.virt.hyperv import constants from nova.virt.hyperv import vmutils -from xml.etree import ElementTree VHD_HEADER_SIZE_FIX = 512 diff --git a/nova/virt/hyperv/vhdutilsv2.py b/nova/virt/hyperv/vhdutilsv2.py index 3a9855d871d9..44a0f7663f23 100644 --- a/nova/virt/hyperv/vhdutilsv2.py +++ b/nova/virt/hyperv/vhdutilsv2.py @@ -24,13 +24,14 @@ import sys if sys.platform == 'win32': import wmi +from xml.etree import ElementTree + from nova.openstack.common.gettextutils import _ from nova.openstack.common import units from nova.virt.hyperv import constants from nova.virt.hyperv import vhdutils from nova.virt.hyperv import vmutils from nova.virt.hyperv import vmutilsv2 -from xml.etree import ElementTree VHDX_BAT_ENTRY_SIZE = 8 diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index dce5b0de1723..3c38619b3948 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -26,7 +26,6 @@ Supports KVM, LXC, QEMU, UML, and XEN. """ import errno -import eventlet import functools import glob import mmap @@ -39,6 +38,7 @@ import threading import time import uuid +import eventlet from eventlet import greenio from eventlet import greenthread from eventlet import patcher diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index ecf9cddc2e2e..5a9383459694 100644 --- a/nova/virt/libvirt/imagebackend.py +++ b/nova/virt/libvirt/imagebackend.py @@ -17,9 +17,8 @@ import abc import contextlib import os -import six - from oslo.config import cfg +import six from nova import exception from nova.openstack.common import excutils diff --git a/nova/virt/storage_users.py b/nova/virt/storage_users.py index 836b55974e49..752f07efc068 100644 --- a/nova/virt/storage_users.py +++ b/nova/virt/storage_users.py @@ -17,10 +17,11 @@ import json import os import time +from oslo.config import cfg + from nova.openstack.common.gettextutils import _ from nova.openstack.common import log as logging from nova import utils -from oslo.config import cfg LOG = logging.getLogger(__name__) diff --git a/nova/virt/vmwareapi/error_util.py b/nova/virt/vmwareapi/error_util.py index 03b92fcd4ac4..ba01c931d3b8 100644 --- a/nova/virt/vmwareapi/error_util.py +++ b/nova/virt/vmwareapi/error_util.py @@ -17,7 +17,6 @@ Exception classes and SOAP response error checking module. """ from nova import exception - from nova.openstack.common.gettextutils import _ from nova.openstack.common import log as logging diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py index baa55a3b1eee..eabe139aec79 100644 --- a/nova/virt/xenapi/fake.py +++ b/nova/virt/xenapi/fake.py @@ -50,13 +50,12 @@ A fake XenAPI SDK. import base64 import pickle +import pprint import random import uuid from xml.sax import saxutils import zlib -import pprint - from nova import exception from nova.openstack.common.gettextutils import _ from nova.openstack.common import jsonutils diff --git a/nova/virt/xenapi/image/bittorrent.py b/nova/virt/xenapi/image/bittorrent.py index bffcf3bdf597..a77775d11366 100644 --- a/nova/virt/xenapi/image/bittorrent.py +++ b/nova/virt/xenapi/image/bittorrent.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import pkg_resources - from oslo.config import cfg +import pkg_resources import six.moves.urllib.parse as urlparse from nova.openstack.common.gettextutils import _ diff --git a/nova/virt/xenapi/image/vdi_through_dev.py b/nova/virt/xenapi/image/vdi_through_dev.py index 2947081ddaa9..a61cf3319405 100644 --- a/nova/virt/xenapi/image/vdi_through_dev.py +++ b/nova/virt/xenapi/image/vdi_through_dev.py @@ -14,11 +14,12 @@ # under the License. import contextlib -import eventlet -from eventlet import greenio import os import tarfile +import eventlet +from eventlet import greenio + from nova.image import glance from nova import utils from nova.virt.xenapi import vm_utils diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index 75fc13573fd5..5ab95c63a014 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -17,13 +17,13 @@ """Eventlet WSGI Services to proxy VNC for XCP protocol.""" import socket -import webob import eventlet import eventlet.green import eventlet.greenio import eventlet.wsgi from oslo.config import cfg +import webob from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context diff --git a/nova/wsgi.py b/nova/wsgi.py index e4a7df82aee5..8fbf863838ae 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -21,6 +21,7 @@ from __future__ import print_function import os.path import socket +import ssl import sys import eventlet @@ -29,7 +30,6 @@ import greenlet from oslo.config import cfg from paste import deploy import routes.middleware -import ssl import webob.dec import webob.exc diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py index ebe0b9a98537..cbeea5884f7d 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py @@ -23,6 +23,7 @@ import gettext import logging import logging.handlers import time + import XenAPI diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py index a6f1d6cd1532..3d28fc617d19 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py @@ -29,7 +29,7 @@ except ImportError: import utils # noqa -import XenAPIPlugin +import XenAPIPlugin # noqa import pluginlib_nova as pluginlib # noqa pluginlib.configure_logging("xenstore") diff --git a/tox.ini b/tox.ini index 05cd9c35e5b7..926e8b1ec37c 100644 --- a/tox.ini +++ b/tox.ini @@ -61,7 +61,7 @@ sitepackages = False # Stricter in hacking 0.9: F402 # E251 Skipped due to https://github.com/jcrocholl/pep8/issues/301 -ignore = E121,E122,E123,E124,E125,E129,E126,E127,E128,E131,E251,E265,E711,E712,E713,F402,H305,H307,H405,H803,H904 +ignore = E121,E122,E123,E124,E125,E129,E126,E127,E128,E131,E251,E265,E711,E712,E713,F402,H405,H803,H904 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools [hacking]