Merge "Alphabetize imports in nova/api/"

27 files changed, 33 insertions, 33 deletions

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 01787712a..c7c6d7081 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -25,8 +25,8 @@ from xml.dom import minidom
 
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.compute import vm_states
 from nova.compute import task_states
+from nova.compute import vm_states
 from nova import flags
 from nova import log as logging
 from nova.network import model as network_model
diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py
index 9e9bb9003..f52234cf1 100644
--- a/nova/api/openstack/compute/__init__.py
+++ b/nova/api/openstack/compute/__init__.py
@@ -24,12 +24,12 @@ import nova.api.openstack
 from nova.api.openstack.compute import consoles
 from nova.api.openstack.compute import extensions
 from nova.api.openstack.compute import flavors
-from nova.api.openstack.compute import images
 from nova.api.openstack.compute import image_metadata
+from nova.api.openstack.compute import images
 from nova.api.openstack.compute import ips
 from nova.api.openstack.compute import limits
-from nova.api.openstack.compute import servers
 from nova.api.openstack.compute import server_metadata
+from nova.api.openstack.compute import servers
 from nova.api.openstack.compute import versions
 from nova import flags
 from nova import log as logging
diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py
index c9f61ae00..4d02ecf7e 100644
--- a/nova/api/openstack/compute/contrib/__init__.py
+++ b/nova/api/openstack/compute/contrib/__init__.py
@@ -21,9 +21,9 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 """
 
+from nova.api.openstack import extensions
 from nova import flags
 from nova import log as logging
-from nova.api.openstack import extensions
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py
index 41843e32e..601825950 100644
--- a/nova/api/openstack/compute/contrib/certificates.py
+++ b/nova/api/openstack/compute/contrib/certificates.py
@@ -16,9 +16,9 @@
 
 import webob.exc
 
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.api.openstack import extensions
 from nova import flags
 from nova import log as logging
 from nova import network
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index dcdc87d16..b0d17ff14 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -17,9 +17,9 @@
 import os
 
 from nova.api.openstack import common
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.api.openstack import extensions
 from nova.auth import manager
 from nova.cloudpipe import pipelib
 from nova import compute
diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py
index 3c3a597c6..fd1e9418c 100644
--- a/nova/api/openstack/compute/contrib/console_output.py
+++ b/nova/api/openstack/compute/contrib/console_output.py
@@ -19,11 +19,11 @@
 import re
 import webob
 
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
 from nova import log as logging
-from nova.api.openstack import extensions
-from nova.api.openstack import wsgi
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/contrib/consoles.py b/nova/api/openstack/compute/contrib/consoles.py
index 387d77b2c..712cda87b 100644
--- a/nova/api/openstack/compute/contrib/consoles.py
+++ b/nova/api/openstack/compute/contrib/consoles.py
@@ -16,11 +16,11 @@
 
 import webob
 
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
 from nova import log as logging
-from nova.api.openstack import extensions
-from nova.api.openstack import wsgi
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/contrib/createserverext.py b/nova/api/openstack/compute/contrib/createserverext.py
index c5e26a349..08407aaca 100644
--- a/nova/api/openstack/compute/contrib/createserverext.py
+++ b/nova/api/openstack/compute/contrib/createserverext.py
@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License
 
-from nova.api.openstack import extensions
 from nova.api.openstack.compute import servers
 from nova.api.openstack.compute import views
+from nova.api.openstack import extensions
 
 
 authorize = extensions.soft_extension_authorizer('compute', 'createserverext')
diff --git a/nova/api/openstack/compute/contrib/flavorextradata.py b/nova/api/openstack/compute/contrib/flavorextradata.py
index 2e9e927f6..9a07270ce 100644
--- a/nova/api/openstack/compute/contrib/flavorextradata.py
+++ b/nova/api/openstack/compute/contrib/flavorextradata.py
@@ -24,11 +24,11 @@ attributes.  This extension adds to that list:
 - OS-FLV-EXT-DATA:ephemeral
 """
 
-from nova import exception
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import instance_types
+from nova import exception
 
 
 authorize = extensions.soft_extension_authorizer('compute', 'flavorextradata')
diff --git a/nova/api/openstack/compute/contrib/flavorextraspecs.py b/nova/api/openstack/compute/contrib/flavorextraspecs.py
index faae7c40b..77af25c9f 100644
--- a/nova/api/openstack/compute/contrib/flavorextraspecs.py
+++ b/nova/api/openstack/compute/contrib/flavorextraspecs.py
@@ -19,9 +19,9 @@
 
 from webob import exc
 
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.api.openstack import extensions
 from nova import db
 from nova import exception
 
diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py
index 7c5c11042..a8a7a2a23 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_dns.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_dns.py
@@ -18,9 +18,9 @@ import urllib
 
 import webob
 
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.api.openstack import extensions
 from nova import exception
 from nova import log as logging
 from nova import network
diff --git a/nova/api/openstack/compute/contrib/floating_ip_pools.py b/nova/api/openstack/compute/contrib/floating_ip_pools.py
index 9080f086e..7265d8611 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_pools.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_pools.py
@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License
 
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.api.openstack import extensions
 from nova import log as logging
 from nova import network
 
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index b93d3a48c..df41a54ce 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -19,9 +19,9 @@ import webob.exc
 from xml.dom import minidom
 from xml.parsers import expat
 
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.api.openstack import extensions
 from nova.compute import api as compute_api
 from nova import db
 from nova import exception
diff --git a/nova/api/openstack/compute/contrib/keypairs.py b/nova/api/openstack/compute/contrib/keypairs.py
index 186d836de..474673794 100644
--- a/nova/api/openstack/compute/contrib/keypairs.py
+++ b/nova/api/openstack/compute/contrib/keypairs.py
@@ -20,9 +20,9 @@
 import webob
 import webob.exc
 
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.api.openstack import extensions
 from nova.compute import api as compute_api
 from nova import exception
 
diff --git a/nova/api/openstack/compute/contrib/quota_classes.py b/nova/api/openstack/compute/contrib/quota_classes.py
index 5c8e07ba9..04d0841ef 100644
--- a/nova/api/openstack/compute/contrib/quota_classes.py
+++ b/nova/api/openstack/compute/contrib/quota_classes.py
@@ -15,9 +15,9 @@
 
 import webob
 
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.api.openstack import extensions
 from nova import db
 from nova import exception
 from nova import quota
diff --git a/nova/api/openstack/compute/contrib/quotas.py b/nova/api/openstack/compute/contrib/quotas.py
index cf42b434f..382649f4c 100644
--- a/nova/api/openstack/compute/contrib/quotas.py
+++ b/nova/api/openstack/compute/contrib/quotas.py
@@ -17,11 +17,11 @@
 
 import webob
 
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.api.openstack import extensions
-from nova.db.sqlalchemy import api as sqlalchemy_api
 from nova import db
+from nova.db.sqlalchemy import api as sqlalchemy_api
 from nova import exception
 from nova import quota
 
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py
index 6c35ac2f9..2a4886988 100644
--- a/nova/api/openstack/compute/contrib/security_groups.py
+++ b/nova/api/openstack/compute/contrib/security_groups.py
@@ -19,8 +19,8 @@
 import urllib
 from xml.dom import minidom
 
-from webob import exc
 import webob
+from webob import exc
 
 from nova.api.openstack import common
 from nova.api.openstack import extensions
diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py
index 004a667b1..e3357cf2b 100644
--- a/nova/api/openstack/compute/contrib/volumes.py
+++ b/nova/api/openstack/compute/contrib/volumes.py
@@ -15,12 +15,12 @@
 
 """The volumes extension."""
 
-from webob import exc
 import webob
+from webob import exc
 
 from nova.api.openstack import common
-from nova.api.openstack import extensions
 from nova.api.openstack.compute import servers
+from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
diff --git a/nova/api/openstack/compute/flavors.py b/nova/api/openstack/compute/flavors.py
index 6757d8b28..23c918924 100644
--- a/nova/api/openstack/compute/flavors.py
+++ b/nova/api/openstack/compute/flavors.py
@@ -17,8 +17,8 @@
 
 import webob
 
-from nova.api.openstack.compute.views import flavors as flavors_view
 from nova.api.openstack import common
+from nova.api.openstack.compute.views import flavors as flavors_view
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import instance_types
diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py
index 0551323ac..3afb206fa 100644
--- a/nova/api/openstack/compute/ips.py
+++ b/nova/api/openstack/compute/ips.py
@@ -22,8 +22,8 @@ from nova.api.openstack import common
 from nova.api.openstack.compute.views import addresses as view_addresses
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import log as logging
 from nova import flags
+from nova import log as logging
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 9aa637cc9..7bf3d59d0 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -19,8 +19,8 @@ import os
 import socket
 from xml.dom import minidom
 
-from webob import exc
 import webob
+from webob import exc
 
 from nova.api.openstack import common
 from nova.api.openstack.compute import ips
diff --git a/nova/api/openstack/urlmap.py b/nova/api/openstack/urlmap.py
index dc94a28c5..6f3c484ec 100644
--- a/nova/api/openstack/urlmap.py
+++ b/nova/api/openstack/urlmap.py
@@ -19,8 +19,8 @@ import paste.urlmap
 import re
 import urllib2
 
-from nova import log as logging
 from nova.api.openstack import wsgi
+from nova import log as logging
 
 
 _quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"'
diff --git a/nova/api/openstack/volume/__init__.py b/nova/api/openstack/volume/__init__.py
index f65fe8033..0f529980f 100644
--- a/nova/api/openstack/volume/__init__.py
+++ b/nova/api/openstack/volume/__init__.py
@@ -24,8 +24,8 @@ import nova.api.openstack
 from nova.api.openstack.volume import extensions
 from nova.api.openstack.volume import snapshots
 from nova.api.openstack.volume import types
-from nova.api.openstack.volume import volumes
 from nova.api.openstack.volume import versions
+from nova.api.openstack.volume import volumes
 from nova import log as logging
 
 
diff --git a/nova/api/openstack/volume/contrib/__init__.py b/nova/api/openstack/volume/contrib/__init__.py
index 1439f81ce..1eba0b4df 100644
--- a/nova/api/openstack/volume/contrib/__init__.py
+++ b/nova/api/openstack/volume/contrib/__init__.py
@@ -21,9 +21,9 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 """
 
+from nova.api.openstack import extensions
 from nova import flags
 from nova import log as logging
-from nova.api.openstack import extensions
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/api/openstack/volume/snapshots.py b/nova/api/openstack/volume/snapshots.py
index 317608a5e..11681f6e8 100644
--- a/nova/api/openstack/volume/snapshots.py
+++ b/nova/api/openstack/volume/snapshots.py
@@ -15,8 +15,8 @@
 
 """The volumes snapshots api."""
 
-from webob import exc
 import webob
+from webob import exc
 
 from nova.api.openstack import common
 from nova.api.openstack import wsgi
diff --git a/nova/api/openstack/volume/volumes.py b/nova/api/openstack/volume/volumes.py
index 5da007d13..4c50a6d2e 100644
--- a/nova/api/openstack/volume/volumes.py
+++ b/nova/api/openstack/volume/volumes.py
@@ -15,8 +15,8 @@
 
 """The volumes api."""
 
-from webob import exc
 import webob
+from webob import exc
 
 from nova.api.openstack import common
 from nova.api.openstack import wsgi
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index f65425246..2cc5654df 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -16,10 +16,10 @@
 #    under the License.
 
 import inspect
-from xml.dom import minidom
-from xml.parsers import expat
 import math
 import time
+from xml.dom import minidom
+from xml.parsers import expat
 
 from lxml import etree
 import webob