Merge "Fix invalid import order"
This commit is contained in:
commit
60c3ebd4c4
|
@ -18,19 +18,19 @@ Websocket proxy that is compatible with OpenStack Nova.
|
|||
Leverages websockify.py by Joel Martin
|
||||
'''
|
||||
|
||||
from six.moves import http_cookies as Cookie
|
||||
import six.moves.urllib.parse as urlparse
|
||||
import socket
|
||||
import sys
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from six.moves import http_cookies as Cookie
|
||||
import six.moves.urllib.parse as urlparse
|
||||
import websockify
|
||||
|
||||
from nova.consoleauth import rpcapi as consoleauth_rpcapi
|
||||
from nova import context
|
||||
from nova import exception
|
||||
from nova.i18n import _
|
||||
from oslo_config import cfg
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -13,12 +13,12 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
|
||||
from ironicclient import exc as ironic_exc
|
||||
import mock
|
||||
import six
|
||||
from webob import exc
|
||||
|
||||
from ironicclient import exc as ironic_exc
|
||||
|
||||
from nova.api.openstack.compute import baremetal_nodes \
|
||||
as b_nodes_v21
|
||||
from nova.api.openstack.compute.legacy_v2.contrib import baremetal_nodes \
|
||||
|
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
import copy
|
||||
import datetime
|
||||
import six
|
||||
import uuid
|
||||
|
||||
import mock
|
||||
from oslo_config import cfg
|
||||
from oslo_serialization import jsonutils
|
||||
from oslo_utils import timeutils
|
||||
import six
|
||||
|
||||
from nova.compute.monitors import base as monitor_base
|
||||
from nova.compute import resource_tracker
|
||||
|
|
|
@ -12,9 +12,9 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
import mock
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from nova import exception
|
||||
from nova.image.download import file as tm_file
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# under the License.
|
||||
|
||||
import os
|
||||
|
||||
from six.moves import StringIO
|
||||
|
||||
from nova.virt.libvirt import utils as libvirt_utils
|
||||
|
|
|
@ -12,12 +12,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from nova import test
|
||||
|
||||
from lxml import etree
|
||||
import six
|
||||
|
||||
from nova.compute import arch
|
||||
from nova import test
|
||||
import nova.tests.unit.virt.libvirt.fakelibvirt as libvirt
|
||||
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
|
||||
from eventlet import greenthread
|
||||
import mock
|
||||
|
||||
import six
|
||||
|
||||
from nova import exception
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import six
|
||||
|
||||
from oslo_concurrency import processutils
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
import six
|
||||
|
||||
from nova.i18n import _LE, _LW
|
||||
from nova import paths
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import six
|
||||
|
||||
from oslo_concurrency import processutils
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
import six
|
||||
|
||||
from nova.i18n import _LE, _LW
|
||||
from nova import paths
|
||||
|
|
|
@ -15,12 +15,12 @@
|
|||
|
||||
import errno
|
||||
import os
|
||||
import six
|
||||
|
||||
from oslo_concurrency import processutils
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import fileutils
|
||||
import six
|
||||
|
||||
from nova import exception as nova_exception
|
||||
from nova.i18n import _
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
# under the License.
|
||||
|
||||
import functools
|
||||
import six
|
||||
import sys
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
import six
|
||||
|
||||
from nova.compute import utils as compute_utils
|
||||
from nova import exception
|
||||
|
|
|
@ -19,7 +19,6 @@ and storage repositories
|
|||
"""
|
||||
|
||||
import re
|
||||
import six
|
||||
import string
|
||||
import uuid
|
||||
|
||||
|
@ -28,6 +27,7 @@ from oslo_config import cfg
|
|||
from oslo_log import log as logging
|
||||
from oslo_utils import strutils
|
||||
from oslo_utils import versionutils
|
||||
import six
|
||||
|
||||
from nova import exception
|
||||
from nova.i18n import _, _LE, _LW
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
|
||||
|
||||
import abc
|
||||
|
||||
import six
|
||||
|
||||
from nova import keymgr
|
||||
|
|
Loading…
Reference in New Issue