Cleaning up imports in nova.api

Change-Id: I2779c1fbff7344370ce17c6562086e29329b6e65

19 files changed, 24 insertions, 40 deletions

diff --git a/nova/api/auth.py b/nova/api/auth.py
index a94f28739..6be22620c 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -21,7 +21,6 @@ Common Auth Middleware.
 import webob.dec
 import webob.exc
 
-from nova import context
 from nova import flags
 from nova import wsgi
 
diff --git a/nova/api/direct.py b/nova/api/direct.py
index 5e6826f82..1a86b0c97 100644
--- a/nova/api/direct.py
+++ b/nova/api/direct.py
@@ -37,12 +37,11 @@ import urllib
 import routes
 import webob
 
+import nova.api.openstack.wsgi
 from nova import context
 from nova import exception
-from nova import flags
 from nova import utils
 from nova import wsgi
-import nova.api.openstack.wsgi
 
 
 # Global storage for registering modules.
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 0433d5152..3c1250f97 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -25,16 +25,16 @@ import webob
 import webob.dec
 import webob.exc
 
+from nova.api.ec2 import apirequest
+from nova.api.ec2 import ec2utils
+from nova.api.ec2 import faults
+from nova.auth import manager
 from nova import context
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import utils
 from nova import wsgi
-from nova.api.ec2 import apirequest
-from nova.api.ec2 import ec2utils
-from nova.api.ec2 import faults
-from nova.auth import manager
 
 FLAGS = flags.FLAGS
 LOG = logging.getLogger("nova.api")
diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index d9a64506d..de2348c91 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -21,19 +21,20 @@ Admin API controller, exposed through http via the api worker.
 """
 
 import base64
-import netaddr
 import urllib
 
+import netaddr
+
+from nova.api.ec2 import ec2utils
+from nova.auth import manager
 from nova import compute
 from nova.compute import instance_types
+from nova.compute import vm_states
 from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import utils
-from nova.api.ec2 import ec2utils
-from nova.auth import manager
-from nova.compute import vm_states
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index 61b5ba3a5..dd1692d50 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -24,11 +24,11 @@ import datetime
 # TODO(termie): replace minidom with etree
 from xml.dom import minidom
 
+from nova.api.ec2.admin import AdminController
+from nova.api.ec2 import ec2utils
+from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import exception
-from nova.api.ec2 import ec2utils
-from nova.api.ec2.admin import AdminController
 
 LOG = logging.getLogger("nova.api.request")
 FLAGS = flags.FLAGS
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index c6df3913f..1f5405dea 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -30,22 +30,21 @@ import tempfile
 import time
 import urllib
 
+from nova.api.ec2 import ec2utils
+from nova.compute import instance_types
 from nova import block_device
 from nova import compute
-
+from nova.compute import vm_states
 from nova import crypto
 from nova import db
 from nova import exception
 from nova import flags
+from nova.image import s3
 from nova import log as logging
 from nova import network
 from nova import rpc
 from nova import utils
 from nova import volume
-from nova.api.ec2 import ec2utils
-from nova.compute import instance_types
-from nova.compute import vm_states
-from nova.image import s3
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py
index 641929b21..f54a9f960 100644
--- a/nova/api/ec2/ec2utils.py
+++ b/nova/api/ec2/ec2utils.py
@@ -20,8 +20,8 @@ import re
 
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova import ipv6
+from nova import log as logging
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/api/ec2/faults.py b/nova/api/ec2/faults.py
index 9e47702d9..92bb4f6e7 100644
--- a/nova/api/ec2/faults.py
+++ b/nova/api/ec2/faults.py
@@ -15,9 +15,9 @@
 import webob.dec
 import webob.exc
 
-from nova import utils
 from nova import context
 from nova import flags
+from nova import utils
 
 FLAGS = flags.FLAGS
 
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index aa6f04310..059ef8ec2 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -23,6 +23,7 @@ import base64
 import webob.dec
 import webob.exc
 
+from nova.api.ec2 import ec2utils
 from nova import block_device
 from nova import compute
 from nova import context
@@ -33,7 +34,6 @@ from nova import log as logging
 from nova import network
 from nova import volume
 from nova import wsgi
-from nova.api.ec2 import ec2utils
 
 
 LOG = logging.getLogger('nova.api.metadata')
diff --git a/nova/api/openstack/v2/flavors.py b/nova/api/openstack/v2/flavors.py
index c3db25f07..0d1d4d996 100644
--- a/nova/api/openstack/v2/flavors.py
+++ b/nova/api/openstack/v2/flavors.py
@@ -15,14 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from lxml import etree
 import webob
 
 from nova.api.openstack.v2.views import flavors as flavors_view
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import instance_types
-from nova import db
 from nova import exception
 
 
diff --git a/nova/api/openstack/v2/image_metadata.py b/nova/api/openstack/v2/image_metadata.py
index e3cfac4e0..1afbe01bb 100644
--- a/nova/api/openstack/v2/image_metadata.py
+++ b/nova/api/openstack/v2/image_metadata.py
@@ -22,7 +22,6 @@ from nova.api.openstack import wsgi
 from nova import exception
 from nova import flags
 from nova import image
-from nova import utils
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/api/openstack/v2/images.py b/nova/api/openstack/v2/images.py
index 84b7b17db..d30bf7385 100644
--- a/nova/api/openstack/v2/images.py
+++ b/nova/api/openstack/v2/images.py
@@ -13,9 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os.path
-
-from lxml import etree
 import webob.exc
 
 from nova.api.openstack import common
diff --git a/nova/api/openstack/v2/ips.py b/nova/api/openstack/v2/ips.py
index 705754665..f903cb8ba 100644
--- a/nova/api/openstack/v2/ips.py
+++ b/nova/api/openstack/v2/ips.py
@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from lxml import etree
 from webob import exc
 
 import nova
diff --git a/nova/api/openstack/v2/limits.py b/nova/api/openstack/v2/limits.py
index 04ff9e647..19c25b0b4 100644
--- a/nova/api/openstack/v2/limits.py
+++ b/nova/api/openstack/v2/limits.py
@@ -24,13 +24,10 @@ import json
 import math
 import re
 import time
-import urllib
 
-from lxml import etree
 from webob.dec import wsgify
 import webob.exc
 
-from nova.api.openstack import common
 from nova.api.openstack.v2.views import limits as limits_views
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
diff --git a/nova/api/openstack/v2/views/flavors.py b/nova/api/openstack/v2/views/flavors.py
index 5fdea3d0e..64284e406 100644
--- a/nova/api/openstack/v2/views/flavors.py
+++ b/nova/api/openstack/v2/views/flavors.py
@@ -15,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os.path
-
 from nova.api.openstack import common
 
 
diff --git a/nova/api/openstack/v2/views/limits.py b/nova/api/openstack/v2/views/limits.py
index 138a40cb8..cff6781be 100644
--- a/nova/api/openstack/v2/views/limits.py
+++ b/nova/api/openstack/v2/views/limits.py
@@ -17,7 +17,6 @@
 
 import datetime
 
-from nova.api.openstack import common
 from nova import utils
 
 
diff --git a/nova/api/openstack/v2/zones.py b/nova/api/openstack/v2/zones.py
index 8c5add2d1..8457eb5dd 100644
--- a/nova/api/openstack/v2/zones.py
+++ b/nova/api/openstack/v2/zones.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 import json
-import urlparse
 
 from nova.api.openstack import common
 from nova.api.openstack.v2 import servers
@@ -22,7 +21,6 @@ from nova.api.openstack import xmlutil
 from nova.api.openstack import wsgi
 from nova.compute import api as compute
 from nova import crypto
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 1ffca9ecc..7b2f3b90d 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -15,11 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from lxml import etree
-import webob
 from xml.dom import minidom
 from xml.parsers import expat
 
+from lxml import etree
+import webob
+
 from nova import exception
 from nova import log as logging
 from nova import utils
diff --git a/nova/api/openstack/xmlutil.py b/nova/api/openstack/xmlutil.py
index 10bc08f05..f0293b50f 100644
--- a/nova/api/openstack/xmlutil.py
+++ b/nova/api/openstack/xmlutil.py
@@ -19,8 +19,8 @@ import os.path
 
 from lxml import etree
 
-from nova import utils
 from nova.api.openstack import wsgi
+from nova import utils
 
 
 XMLNS_V10 = 'http://docs.rackspacecloud.com/servers/api/v1.0'