rearrange imports

9 files changed, 17 insertions, 15 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 4628e93b2..3dac2963c 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/041_add_network_priority.py b/nova/db/sqlalchemy/migrate_repo/versions/041_add_network_priority.py
index e619b1fcd..e69380199 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/041_add_network_priority.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/041_add_network_priority.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 Nicira, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,14 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import datetime
-
 from sqlalchemy import *
 from migrate import *
 
 from nova import log as logging
 from nova import utils
 
+
 meta = MetaData()
 
 # Add priority column to networks table
diff --git a/nova/network/quantum/fake.py b/nova/network/quantum/fake.py
index a923bbf1a..3f6996e63 100644
--- a/nova/network/quantum/fake.py
+++ b/nova/network/quantum/fake.py
@@ -15,12 +15,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import math
+from netaddr import IPNetwork
+
 from nova import exception
 from nova import ipv6
 from nova import log as logging
 from nova import utils
-import math
-from netaddr import IPNetwork
 
 
 LOG = logging.getLogger("network.quantum.fake")
diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py
index 2c2fd4dd7..e49d0cfdc 100644
--- a/nova/network/quantum/manager.py
+++ b/nova/network/quantum/manager.py
@@ -20,10 +20,10 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import manager
-from nova import utils
 from nova.network import manager
 from nova.network.quantum import quantum_connection
 from nova.network.quantum import fake
+from nova import utils
 
 LOG = logging.getLogger("quantum_manager")
 
diff --git a/nova/network/quantum/melange_connection.py b/nova/network/quantum/melange_connection.py
index b3955138d..2d884fa60 100644
--- a/nova/network/quantum/melange_connection.py
+++ b/nova/network/quantum/melange_connection.py
@@ -19,6 +19,7 @@ import httplib
 import socket
 import urllib
 import json
+
 from nova import flags
 
 
diff --git a/nova/network/quantum/melange_ipam_lib.py b/nova/network/quantum/melange_ipam_lib.py
index 526be6327..5b58520c2 100644
--- a/nova/network/quantum/melange_ipam_lib.py
+++ b/nova/network/quantum/melange_ipam_lib.py
@@ -21,6 +21,7 @@ from nova import flags
 from nova import log as logging
 from nova.network.quantum import melange_connection
 
+
 LOG = logging.getLogger("quantum_melange_ipam")
 
 FLAGS = flags.FLAGS
diff --git a/nova/network/quantum/nova_ipam_lib.py b/nova/network/quantum/nova_ipam_lib.py
index a9a6dcb29..b72edeeff 100644
--- a/nova/network/quantum/nova_ipam_lib.py
+++ b/nova/network/quantum/nova_ipam_lib.py
@@ -17,15 +17,15 @@
 
 import math
 
-#from nova import context
 from nova import db
 from nova import exception
 from nova import flags
 from nova import ipv6
 from nova import log as logging
-from nova import utils
 from nova.network import manager
 from nova.network.quantum import melange_connection as melange
+from nova import utils
+
 
 LOG = logging.getLogger("quantum_nova_ipam_lib")
 
diff --git a/nova/network/quantum/quantum_connection.py b/nova/network/quantum/quantum_connection.py
index d6f749bf2..7a96d23fd 100644
--- a/nova/network/quantum/quantum_connection.py
+++ b/nova/network/quantum/quantum_connection.py
@@ -17,9 +17,9 @@
 
 from nova import flags
 from nova import log as logging
+from nova.network.quantum import client as quantum_client
 from nova import utils
 
-from nova.network.quantum.client import Client
 
 LOG = logging.getLogger("nova.network.quantum")
 FLAGS = flags.FLAGS
@@ -40,10 +40,10 @@ flags.DEFINE_string('quantum_default_tenant_id',
 class QuantumClientConnection:
 
     def __init__(self):
-        self.client = Client(FLAGS.quantum_connection_host,
-                             FLAGS.quantum_connection_port,
-                             format="json",
-                             logger=LOG)
+        self.client = quantum_client.Client(FLAGS.quantum_connection_host,
+                                            FLAGS.quantum_connection_port,
+                                            format="json",
+                                            logger=LOG)
 
     def create_network(self, tenant_id, network_name):
         data = {'network': {'name': network_name}}
diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py
index 80cab950e..8ef22ac7e 100644
--- a/nova/tests/test_quantum.py
+++ b/nova/tests/test_quantum.py
@@ -19,8 +19,8 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import log as logging
-from nova import test
 from nova.network.quantum import manager as quantum_manager
+from nova import test
 
 LOG = logging.getLogger('nova.tests.quantum_network')