From 60b1154b141601c018e91f39f356592086b6e62e Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 26 Apr 2012 15:20:43 -0700 Subject: Imports to human alphabetical order Problems identified by enabling N306 in run_tests.sh Change-Id: Ifddfe58da020dd041bcbbf5f14941514a09f61c1 --- bin/nova-all | 2 +- bin/nova-consoleauth | 2 +- bin/nova-dhcpbridge | 2 +- bin/nova-objectstore | 2 +- nova/scheduler/multi.py | 2 +- nova/scheduler/simple.py | 4 ++-- nova/tests/api/ec2/test_faults.py | 2 +- nova/tests/scheduler/fakes.py | 2 +- nova/tests/scheduler/test_chance_scheduler.py | 2 +- nova/tests/scheduler/test_filter_scheduler.py | 4 ++-- nova/virt/driver.py | 2 +- tools/clean_file_locks.py | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bin/nova-all b/bin/nova-all index 5edf3328f..143ab2bed 100755 --- a/bin/nova-all +++ b/bin/nova-all @@ -42,9 +42,9 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import flags from nova import log as logging +from nova.objectstore import s3server from nova import service from nova import utils -from nova.objectstore import s3server from nova.vnc import xvp_proxy diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth index 325a399d7..fbc9ad849 100755 --- a/bin/nova-consoleauth +++ b/bin/nova-consoleauth @@ -31,11 +31,11 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): sys.path.insert(0, possible_topdir) +from nova.consoleauth import manager from nova import flags from nova import log as logging from nova import service from nova import utils -from nova.consoleauth import manager if __name__ == "__main__": diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index e9b822c8a..162fdd5a6 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -39,9 +39,9 @@ from nova import context from nova import db from nova import flags from nova import log as logging +from nova.network import linux_net from nova import rpc from nova import utils -from nova.network import linux_net FLAGS = flags.FLAGS diff --git a/bin/nova-objectstore b/bin/nova-objectstore index 957de821f..70553ea08 100755 --- a/bin/nova-objectstore +++ b/bin/nova-objectstore @@ -36,9 +36,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): from nova import flags from nova import log as logging +from nova.objectstore import s3server from nova import service from nova import utils -from nova.objectstore import s3server if __name__ == '__main__': diff --git a/nova/scheduler/multi.py b/nova/scheduler/multi.py index dcc755d22..b58a23fe7 100644 --- a/nova/scheduler/multi.py +++ b/nova/scheduler/multi.py @@ -23,8 +23,8 @@ Scheduler that allows routing some calls to one driver and others to another. from nova import flags from nova.openstack.common import cfg -from nova import utils from nova.scheduler import driver +from nova import utils multi_scheduler_opts = [ diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py index 507d5d9fb..651b50af2 100644 --- a/nova/scheduler/simple.py +++ b/nova/scheduler/simple.py @@ -22,11 +22,11 @@ Simple Scheduler """ from nova import db -from nova import flags from nova import exception +from nova import flags from nova.openstack.common import cfg -from nova.scheduler import driver from nova.scheduler import chance +from nova.scheduler import driver from nova import utils diff --git a/nova/tests/api/ec2/test_faults.py b/nova/tests/api/ec2/test_faults.py index be2b5ffe2..e26b8feaf 100644 --- a/nova/tests/api/ec2/test_faults.py +++ b/nova/tests/api/ec2/test_faults.py @@ -14,8 +14,8 @@ import webob -from nova import test from nova.api.ec2 import faults +from nova import test class TestFaults(test.TestCase): diff --git a/nova/tests/scheduler/fakes.py b/nova/tests/scheduler/fakes.py index c2d9e4288..83fbfe8b7 100644 --- a/nova/tests/scheduler/fakes.py +++ b/nova/tests/scheduler/fakes.py @@ -18,9 +18,9 @@ Fakes For Scheduler tests. import mox -from nova import db from nova.compute import instance_types from nova.compute import vm_states +from nova import db from nova.scheduler import filter_scheduler from nova.scheduler import host_manager diff --git a/nova/tests/scheduler/test_chance_scheduler.py b/nova/tests/scheduler/test_chance_scheduler.py index ed6ffeba4..a9bb7a08e 100644 --- a/nova/tests/scheduler/test_chance_scheduler.py +++ b/nova/tests/scheduler/test_chance_scheduler.py @@ -24,8 +24,8 @@ import mox from nova import context from nova import exception -from nova.scheduler import driver from nova.scheduler import chance +from nova.scheduler import driver from nova.tests.scheduler import test_scheduler diff --git a/nova/tests/scheduler/test_filter_scheduler.py b/nova/tests/scheduler/test_filter_scheduler.py index 733d3a267..0256f2aa3 100644 --- a/nova/tests/scheduler/test_filter_scheduler.py +++ b/nova/tests/scheduler/test_filter_scheduler.py @@ -20,9 +20,9 @@ import mox from nova import context from nova import exception -from nova.scheduler import least_cost -from nova.scheduler import host_manager from nova.scheduler import filter_scheduler +from nova.scheduler import host_manager +from nova.scheduler import least_cost from nova import test from nova.tests.scheduler import fakes from nova.tests.scheduler import test_scheduler diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 9658273db..a638f00ec 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -22,11 +22,11 @@ Driver base-classes: types that support that contract """ +from nova.compute import power_state from nova import context as nova_context from nova import db from nova import flags from nova import log as logging -from nova.compute import power_state LOG = logging.getLogger(__name__) diff --git a/tools/clean_file_locks.py b/tools/clean_file_locks.py index eb21177aa..790d82f67 100755 --- a/tools/clean_file_locks.py +++ b/tools/clean_file_locks.py @@ -26,8 +26,8 @@ import logging import optparse from nova import flags -from nova import utils from nova import log +from nova import utils LOG = log.getLogger('nova.utils') -- cgit