Fix invalid import order

Made corrections in import order as per OpenStack import standards [1].

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

TrivialFix

Change-Id: I58f20cda288d1332c3e7cd694a0413486b6302e8

nova/api/ec2/__init__.py

@@ -14,11 +14,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 import webob.dec
 import webob.exc
 
-from oslo_log import log as logging
-
 from nova.i18n import _LW
 from nova import wsgi
 

nova/api/openstack/compute/server_tags.py

@@ -11,7 +11,6 @@
 #    under the License.
 
 import jsonschema
-
 from webob import exc
 
 from nova.api.openstack import common

nova/cmd/idmapshift.py

@@ -81,10 +81,11 @@ inaccessible inside the container.
 
 
 import argparse
-from nova.i18n import _
 import os
 import sys
 
+from nova.i18n import _
+
 NOBODY_ID = 65534
 
 

nova/compute/monitors/__init__.py

@@ -17,10 +17,10 @@
 Resource monitor API specification.
 """
 
-import nova.conf
 from oslo_log import log as logging
 from stevedore import enabled
 
+import nova.conf
 from nova.i18n import _LW
 
 CONF = nova.conf.CONF

nova/conf/libvirt.py

@@ -22,10 +22,10 @@
 
 import itertools
 
-from nova.conf import paths
-
 from oslo_config import cfg
 
+from nova.conf import paths
+
 # Downtime period in milliseconds
 LIVE_MIGRATION_DOWNTIME_MIN = 100
 # Step count

nova/db/sqlalchemy/migrate_repo/versions/331_add_tag_to_vifs_and_bdm.py

@@ -13,12 +13,12 @@
 #    under the License.
 
 
+from oslo_db.sqlalchemy import utils
 from sqlalchemy import Column
 from sqlalchemy import MetaData
 from sqlalchemy import String
 
 from nova.db.sqlalchemy import api
-from oslo_db.sqlalchemy import utils
 
 
 def upgrade(migrate_engine):

nova/objects/aggregate.py

@@ -14,7 +14,6 @@
 
 from oslo_log import log as logging
 from oslo_utils import uuidutils
-
 from sqlalchemy.orm import contains_eager
 from sqlalchemy.orm import joinedload
 

nova/objects/fields.py

@@ -12,8 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_versionedobjects import fields
 import re
+
+from oslo_versionedobjects import fields
 import six
 
 # TODO(berrange) Temporary import for Arch class

nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from datetime import datetime
+
 from six.moves import urllib
 
 from nova import context

nova/tests/functional/api_sample_tests/test_server_migrations.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import datetime
+
 import mock
 
 from nova.conductor import manager as conductor_manager