From 65806634f937cae1b11d4d5d166a0783bf56a9d3 Mon Sep 17 00:00:00 2001 From: dineshbhor Date: Wed, 20 Jan 2016 04:34:57 -0800 Subject: [PATCH] Fix invalid import order Make corrections in import order for six, mock, oslo_config as per OpenStack import standards [1]. [1] http://docs.openstack.org/developer/hacking/#import-order-template TrivialFix Change-Id: Iea1103544c1ec03ca8665ce1248d93437ef5511a --- nova/console/websocketproxy.py | 6 +++--- .../unit/api/openstack/compute/test_baremetal_nodes.py | 4 ++-- nova/tests/unit/compute/test_resource_tracker.py | 2 +- nova/tests/unit/image/test_transfer_modules.py | 2 +- nova/tests/unit/virt/libvirt/fake_libvirt_utils.py | 1 + nova/tests/unit/virt/libvirt/test_fakelibvirt.py | 3 +-- nova/tests/unit/virt/xenapi/test_volume_utils.py | 1 - nova/virt/libvirt/volume/glusterfs.py | 2 +- nova/virt/libvirt/volume/nfs.py | 2 +- nova/virt/libvirt/volume/quobyte.py | 2 +- nova/virt/xenapi/image/glance.py | 2 +- nova/virt/xenapi/volume_utils.py | 2 +- nova/volume/encryptors/base.py | 1 + 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nova/console/websocketproxy.py b/nova/console/websocketproxy.py index 6b57380f38..7dc68e16f8 100644 --- a/nova/console/websocketproxy.py +++ b/nova/console/websocketproxy.py @@ -18,19 +18,19 @@ Websocket proxy that is compatible with OpenStack Nova. Leverages websockify.py by Joel Martin ''' -from six.moves import http_cookies as Cookie -import six.moves.urllib.parse as urlparse import socket import sys +from oslo_config import cfg from oslo_log import log as logging +from six.moves import http_cookies as Cookie +import six.moves.urllib.parse as urlparse import websockify from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context from nova import exception from nova.i18n import _ -from oslo_config import cfg LOG = logging.getLogger(__name__) diff --git a/nova/tests/unit/api/openstack/compute/test_baremetal_nodes.py b/nova/tests/unit/api/openstack/compute/test_baremetal_nodes.py index c5775653d1..69080f8c29 100644 --- a/nova/tests/unit/api/openstack/compute/test_baremetal_nodes.py +++ b/nova/tests/unit/api/openstack/compute/test_baremetal_nodes.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. + +from ironicclient import exc as ironic_exc import mock import six from webob import exc -from ironicclient import exc as ironic_exc - from nova.api.openstack.compute import baremetal_nodes \ as b_nodes_v21 from nova.api.openstack.compute.legacy_v2.contrib import baremetal_nodes \ diff --git a/nova/tests/unit/compute/test_resource_tracker.py b/nova/tests/unit/compute/test_resource_tracker.py index 3137a56ad2..9ec9c0c3f3 100644 --- a/nova/tests/unit/compute/test_resource_tracker.py +++ b/nova/tests/unit/compute/test_resource_tracker.py @@ -17,13 +17,13 @@ import copy import datetime -import six import uuid import mock from oslo_config import cfg from oslo_serialization import jsonutils from oslo_utils import timeutils +import six from nova.compute.monitors import base as monitor_base from nova.compute import resource_tracker diff --git a/nova/tests/unit/image/test_transfer_modules.py b/nova/tests/unit/image/test_transfer_modules.py index 34024065a8..af7bc96e90 100644 --- a/nova/tests/unit/image/test_transfer_modules.py +++ b/nova/tests/unit/image/test_transfer_modules.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -import six.moves.urllib.parse as urlparse import mock +import six.moves.urllib.parse as urlparse from nova import exception from nova.image.download import file as tm_file diff --git a/nova/tests/unit/virt/libvirt/fake_libvirt_utils.py b/nova/tests/unit/virt/libvirt/fake_libvirt_utils.py index 23fdef5911..82f56e6353 100644 --- a/nova/tests/unit/virt/libvirt/fake_libvirt_utils.py +++ b/nova/tests/unit/virt/libvirt/fake_libvirt_utils.py @@ -13,6 +13,7 @@ # under the License. import os + from six.moves import StringIO from nova.virt.libvirt import utils as libvirt_utils diff --git a/nova/tests/unit/virt/libvirt/test_fakelibvirt.py b/nova/tests/unit/virt/libvirt/test_fakelibvirt.py index d3e14fe152..2f2f61aeab 100644 --- a/nova/tests/unit/virt/libvirt/test_fakelibvirt.py +++ b/nova/tests/unit/virt/libvirt/test_fakelibvirt.py @@ -12,12 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from nova import test - from lxml import etree import six from nova.compute import arch +from nova import test import nova.tests.unit.virt.libvirt.fakelibvirt as libvirt diff --git a/nova/tests/unit/virt/xenapi/test_volume_utils.py b/nova/tests/unit/virt/xenapi/test_volume_utils.py index cb7e4f40dc..618b099589 100644 --- a/nova/tests/unit/virt/xenapi/test_volume_utils.py +++ b/nova/tests/unit/virt/xenapi/test_volume_utils.py @@ -15,7 +15,6 @@ from eventlet import greenthread import mock - import six from nova import exception diff --git a/nova/virt/libvirt/volume/glusterfs.py b/nova/virt/libvirt/volume/glusterfs.py index e1b6b9023d..6564172af1 100644 --- a/nova/virt/libvirt/volume/glusterfs.py +++ b/nova/virt/libvirt/volume/glusterfs.py @@ -10,11 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -import six from oslo_concurrency import processutils from oslo_config import cfg from oslo_log import log as logging +import six from nova.i18n import _LE, _LW from nova import paths diff --git a/nova/virt/libvirt/volume/nfs.py b/nova/virt/libvirt/volume/nfs.py index 4ea7d7cc13..b48190b95c 100644 --- a/nova/virt/libvirt/volume/nfs.py +++ b/nova/virt/libvirt/volume/nfs.py @@ -10,11 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -import six from oslo_concurrency import processutils from oslo_config import cfg from oslo_log import log as logging +import six from nova.i18n import _LE, _LW from nova import paths diff --git a/nova/virt/libvirt/volume/quobyte.py b/nova/virt/libvirt/volume/quobyte.py index 494e6c23f5..199439be5d 100644 --- a/nova/virt/libvirt/volume/quobyte.py +++ b/nova/virt/libvirt/volume/quobyte.py @@ -15,12 +15,12 @@ import errno import os -import six from oslo_concurrency import processutils from oslo_config import cfg from oslo_log import log as logging from oslo_utils import fileutils +import six from nova import exception as nova_exception from nova.i18n import _ diff --git a/nova/virt/xenapi/image/glance.py b/nova/virt/xenapi/image/glance.py index ab8697477a..3a368acb91 100644 --- a/nova/virt/xenapi/image/glance.py +++ b/nova/virt/xenapi/image/glance.py @@ -14,11 +14,11 @@ # under the License. import functools -import six import sys from oslo_config import cfg from oslo_log import log as logging +import six from nova.compute import utils as compute_utils from nova import exception diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py index 0bb6128f78..1b78c826ad 100644 --- a/nova/virt/xenapi/volume_utils.py +++ b/nova/virt/xenapi/volume_utils.py @@ -19,7 +19,6 @@ and storage repositories """ import re -import six import string import uuid @@ -28,6 +27,7 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_utils import strutils from oslo_utils import versionutils +import six from nova import exception from nova.i18n import _, _LE, _LW diff --git a/nova/volume/encryptors/base.py b/nova/volume/encryptors/base.py index 03639c69ea..b5065b7ab0 100644 --- a/nova/volume/encryptors/base.py +++ b/nova/volume/encryptors/base.py @@ -15,6 +15,7 @@ import abc + import six from nova import keymgr