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
This commit is contained in:
parent
4c4591f2cd
commit
4c3b9c7f9a
|
@ -14,11 +14,10 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from oslo_log import log as logging
|
||||||
import webob.dec
|
import webob.dec
|
||||||
import webob.exc
|
import webob.exc
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from nova.i18n import _LW
|
from nova.i18n import _LW
|
||||||
from nova import wsgi
|
from nova import wsgi
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import jsonschema
|
import jsonschema
|
||||||
|
|
||||||
from webob import exc
|
from webob import exc
|
||||||
|
|
||||||
from nova.api.openstack import common
|
from nova.api.openstack import common
|
||||||
|
|
|
@ -81,10 +81,11 @@ inaccessible inside the container.
|
||||||
|
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
from nova.i18n import _
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from nova.i18n import _
|
||||||
|
|
||||||
NOBODY_ID = 65534
|
NOBODY_ID = 65534
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -17,10 +17,10 @@
|
||||||
Resource monitor API specification.
|
Resource monitor API specification.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import nova.conf
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from stevedore import enabled
|
from stevedore import enabled
|
||||||
|
|
||||||
|
import nova.conf
|
||||||
from nova.i18n import _LW
|
from nova.i18n import _LW
|
||||||
|
|
||||||
CONF = nova.conf.CONF
|
CONF = nova.conf.CONF
|
||||||
|
|
|
@ -22,10 +22,10 @@
|
||||||
|
|
||||||
import itertools
|
import itertools
|
||||||
|
|
||||||
from nova.conf import paths
|
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
|
from nova.conf import paths
|
||||||
|
|
||||||
# Downtime period in milliseconds
|
# Downtime period in milliseconds
|
||||||
LIVE_MIGRATION_DOWNTIME_MIN = 100
|
LIVE_MIGRATION_DOWNTIME_MIN = 100
|
||||||
# Step count
|
# Step count
|
||||||
|
|
|
@ -13,12 +13,12 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
|
from oslo_db.sqlalchemy import utils
|
||||||
from sqlalchemy import Column
|
from sqlalchemy import Column
|
||||||
from sqlalchemy import MetaData
|
from sqlalchemy import MetaData
|
||||||
from sqlalchemy import String
|
from sqlalchemy import String
|
||||||
|
|
||||||
from nova.db.sqlalchemy import api
|
from nova.db.sqlalchemy import api
|
||||||
from oslo_db.sqlalchemy import utils
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade(migrate_engine):
|
def upgrade(migrate_engine):
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from oslo_utils import uuidutils
|
from oslo_utils import uuidutils
|
||||||
|
|
||||||
from sqlalchemy.orm import contains_eager
|
from sqlalchemy.orm import contains_eager
|
||||||
from sqlalchemy.orm import joinedload
|
from sqlalchemy.orm import joinedload
|
||||||
|
|
||||||
|
|
|
@ -12,8 +12,9 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_versionedobjects import fields
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
from oslo_versionedobjects import fields
|
||||||
import six
|
import six
|
||||||
|
|
||||||
# TODO(berrange) Temporary import for Arch class
|
# TODO(berrange) Temporary import for Arch class
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from six.moves import urllib
|
from six.moves import urllib
|
||||||
|
|
||||||
from nova import context
|
from nova import context
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
from nova.conductor import manager as conductor_manager
|
from nova.conductor import manager as conductor_manager
|
||||||
|
|
Loading…
Reference in New Issue