Fix import statement order

Fix import statement order to comply with
OpenStack Style Guidelines(*1).

*1: http://docs.openstack.org/developer/hacking/#import-order-template

TrivialFix
Change-Id: I8ded09c14396a46f9d0f8f565d1294b179ce09bc

diff --git a/nova/tests/functional/db/test_aggregate.py b/nova/tests/functional/db/test_aggregate.py
index 3d05718b14ea11185889b00fbf4c6f4590ad228e..e995df343e5845e22a82200e70ec2fc61800321c 100644 (file)
--- a/nova/tests/functional/db/test_aggregate.py
+++ b/nova/tests/functional/db/test_aggregate.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 from copy import deepcopy
+
 import mock
 from oslo_db import exception as db_exc
 from oslo_utils import timeutils
@@ -20,13 +21,12 @@ from nova import db
 from nova.db.sqlalchemy import api as db_api
 from nova.db.sqlalchemy import api_models
 from nova import exception
+import nova.objects.aggregate as aggregate_obj
 from nova import test
 from nova.tests.unit import matchers
 from nova.tests.unit.objects.test_objects import compare_obj as base_compare
 from nova.tests import uuidsentinel
 
-import nova.objects.aggregate as aggregate_obj
-
 
 SUBS = {'metadata': 'metadetails'}
 

diff --git a/nova/tests/functional/notification_sample_tests/notification_sample_base.py b/nova/tests/functional/notification_sample_tests/notification_sample_base.py
index 4841c1f9c6d9865ea37b4639c19cf0814a0e5699..a3e208ea5931d381d8169b71b1b27eefe4498662 100644 (file)
--- a/nova/tests/functional/notification_sample_tests/notification_sample_base.py
+++ b/nova/tests/functional/notification_sample_tests/notification_sample_base.py
@@ -12,10 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
 import time
 
+import mock
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import fixture as utils_fixture

diff --git a/nova/tests/functional/regressions/test_bug_1595962.py b/nova/tests/functional/regressions/test_bug_1595962.py
index 7a95207c70a4f6bdd59c311acd1f6d4c16164261..beb6db2d59b6f36b96d129dc5fd27e4ea8f61fa0 100644 (file)
--- a/nova/tests/functional/regressions/test_bug_1595962.py
+++ b/nova/tests/functional/regressions/test_bug_1595962.py
@@ -12,9 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import time
+
 import fixtures
 import mock
-import time
 
 import nova.conf
 from nova import test

diff --git a/nova/tests/unit/api/openstack/compute/test_hypervisors.py b/nova/tests/unit/api/openstack/compute/test_hypervisors.py
index 92f87df919fea122469b7591f639e69d08977928..743c8f35e5100260f7510bdc9eadbf885c85f9f5 100644 (file)
--- a/nova/tests/unit/api/openstack/compute/test_hypervisors.py
+++ b/nova/tests/unit/api/openstack/compute/test_hypervisors.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import copy
+
 import mock
 import netaddr
 from oslo_serialization import jsonutils

diff --git a/nova/tests/unit/db/test_sqlalchemy_migration.py b/nova/tests/unit/db/test_sqlalchemy_migration.py
index 2a417d9e8ed27b56a4bce22739da5603b4f34fb4..3b8627eda525a41bc36a1ccc4011b85867e68653 100644 (file)
--- a/nova/tests/unit/db/test_sqlalchemy_migration.py
+++ b/nova/tests/unit/db/test_sqlalchemy_migration.py
@@ -13,12 +13,12 @@
 #    under the License.
 
 import importlib
-import mock
 import uuid
 
 from migrate import exceptions as versioning_exceptions
 from migrate import UniqueConstraint
 from migrate.versioning import api as versioning_api
+import mock
 from oslo_db.sqlalchemy import utils as db_utils
 import sqlalchemy
 

diff --git a/nova/tests/unit/objects/test_host_mapping.py b/nova/tests/unit/objects/test_host_mapping.py
index 9e2b2c9e7e15712fbdde7668b59a5c8723e2f58c..30433d2e7e53ab3e2d29843c50cd42fa62754a94 100644 (file)
--- a/nova/tests/unit/objects/test_host_mapping.py
+++ b/nova/tests/unit/objects/test_host_mapping.py
@@ -13,9 +13,8 @@
 import mock
 
 from nova import objects
-from nova import test
-
 from nova.objects import host_mapping
+from nova import test
 from nova.tests.unit.objects import test_cell_mapping
 from nova.tests.unit.objects import test_objects
 

diff --git a/nova/tests/unit/scheduler/client/test_report.py b/nova/tests/unit/scheduler/client/test_report.py
index 9ba31a30f2ef9d0a8478ce1dd9febd911b97399a..f8dd82fcf957177912c5e644795b4f5a9fd50c6d 100644 (file)
--- a/nova/tests/unit/scheduler/client/test_report.py
+++ b/nova/tests/unit/scheduler/client/test_report.py
@@ -10,9 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
-
 from keystoneauth1 import exceptions as ks_exc
+import mock
 
 import nova.conf
 from nova import context

diff --git a/nova/tests/unit/test_policy.py b/nova/tests/unit/test_policy.py
index 39dd79807e813f0716fe0854131a975c37fddbc9..c6919a72ad6dfaa50b41b6c3d187c951dcb08b5f 100644 (file)
--- a/nova/tests/unit/test_policy.py
+++ b/nova/tests/unit/test_policy.py
@@ -15,9 +15,9 @@
 
 """Test of Policy Engine For Nova."""
 
-import mock
 import os.path
 
+import mock
 from oslo_policy import policy as oslo_policy
 from oslo_serialization import jsonutils
 import requests_mock

diff --git a/nova/tests/unit/virt/libvirt/fake_imagebackend.py b/nova/tests/unit/virt/libvirt/fake_imagebackend.py
index ba3b2a49b109f1892d3b47eb767aaca6c47bb2cb..59074f95bbd0afa4ed54040f877742fe003e9dae 100644 (file)
--- a/nova/tests/unit/virt/libvirt/fake_imagebackend.py
+++ b/nova/tests/unit/virt/libvirt/fake_imagebackend.py
@@ -14,10 +14,11 @@
 #    under the License.
 
 import collections
-import fixtures
 import functools
-import mock
 import os
+
+import fixtures
+import mock
 import six
 
 from nova.virt.libvirt import config

diff --git a/nova/tests/unit/virt/libvirt/storage/test_dmcrypt.py b/nova/tests/unit/virt/libvirt/storage/test_dmcrypt.py
index 93c4f771d81ad62d547145d777dc5ad5725ed3a5..df16f53bfd24d6ad381d963ae082b0880881c7d4 100644 (file)
--- a/nova/tests/unit/virt/libvirt/storage/test_dmcrypt.py
+++ b/nova/tests/unit/virt/libvirt/storage/test_dmcrypt.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 import mock
-
 from oslo_concurrency import processutils
 
 from nova import test

diff --git a/nova/tests/unit/virt/libvirt/volume/test_vzstorage.py b/nova/tests/unit/virt/libvirt/volume/test_vzstorage.py
index f6faacd6ffd15f52e80c005a00a116b494573d70..ec1e4642f61909f5b417a361d5c375f7afa06637 100644 (file)
--- a/nova/tests/unit/virt/libvirt/volume/test_vzstorage.py
+++ b/nova/tests/unit/virt/libvirt/volume/test_vzstorage.py
@@ -10,14 +10,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
 
+import mock
+from os_brick.initiator import connector
+
 from nova import exception
 from nova.tests.unit.virt.libvirt.volume import test_volume
 from nova import utils
 from nova.virt.libvirt.volume import vzstorage
-from os_brick.initiator import connector
 
 
 class LibvirtVZStorageTestCase(test_volume.LibvirtVolumeBaseTestCase):

diff --git a/nova/tests/unit/virt/xenapi/stubs.py b/nova/tests/unit/virt/xenapi/stubs.py
index af9489a6f2099148aa5789d8a1a384d9f8c47b09..b0f9049fce76a131e38505a3748489de1757683d 100644 (file)
--- a/nova/tests/unit/virt/xenapi/stubs.py
+++ b/nova/tests/unit/virt/xenapi/stubs.py
@@ -13,12 +13,12 @@
 
 """Stubouts, mocks and fixtures for the test suite."""
 
-import mock
 import pickle
 import random
 import sys
 
 import fixtures
+import mock
 from oslo_serialization import jsonutils
 import six