Fixes import order errors
Change-Id: I3df7bfb2e0812b006fa41bd76fb6156ebcd74362
This commit is contained in:
parent
9ea39353b4
commit
f5f7e7191e
@ -20,8 +20,8 @@ Quantum base exception handling.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
from quantum.openstack.common.exception import Error
|
from quantum.openstack.common.exception import Error
|
||||||
from quantum.openstack.common.exception import OpenstackException
|
|
||||||
from quantum.openstack.common.exception import InvalidContentType
|
from quantum.openstack.common.exception import InvalidContentType
|
||||||
|
from quantum.openstack.common.exception import OpenstackException
|
||||||
|
|
||||||
|
|
||||||
class QuantumException(OpenstackException):
|
class QuantumException(OpenstackException):
|
||||||
|
@ -16,8 +16,8 @@
|
|||||||
#
|
#
|
||||||
# @author: Aaron Rosen, Nicira, Inc
|
# @author: Aaron Rosen, Nicira, Inc
|
||||||
|
|
||||||
from sqlalchemy.orm import exc
|
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
|
from sqlalchemy.orm import exc
|
||||||
|
|
||||||
from quantum.db import model_base
|
from quantum.db import model_base
|
||||||
from quantum.extensions import portsecurity as psec
|
from quantum.extensions import portsecurity as psec
|
||||||
|
@ -21,9 +21,9 @@ from quantum import context
|
|||||||
from quantum.db import dhcp_rpc_base
|
from quantum.db import dhcp_rpc_base
|
||||||
from quantum.db import l3_db
|
from quantum.db import l3_db
|
||||||
from quantum.db import l3_rpc_base
|
from quantum.db import l3_rpc_base
|
||||||
from quantum.extensions import portbindings
|
|
||||||
#NOTE(amotoki): quota_db cannot be removed, it is for db model
|
#NOTE(amotoki): quota_db cannot be removed, it is for db model
|
||||||
from quantum.db import quota_db
|
from quantum.db import quota_db
|
||||||
|
from quantum.extensions import portbindings
|
||||||
from quantum.openstack.common import log as logging
|
from quantum.openstack.common import log as logging
|
||||||
from quantum.openstack.common import rpc
|
from quantum.openstack.common import rpc
|
||||||
from quantum.plugins.nec.common import config
|
from quantum.plugins.nec.common import config
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from quantum.extensions import portbindings
|
from quantum.extensions import portbindings
|
||||||
from quantum.tests.unit import test_db_plugin as test_plugin
|
|
||||||
from quantum.tests.unit import _test_extension_portbindings as test_bindings
|
from quantum.tests.unit import _test_extension_portbindings as test_bindings
|
||||||
|
from quantum.tests.unit import test_db_plugin as test_plugin
|
||||||
|
|
||||||
|
|
||||||
class NecPluginV2TestCase(test_plugin.QuantumDbPluginV2TestCase):
|
class NecPluginV2TestCase(test_plugin.QuantumDbPluginV2TestCase):
|
||||||
|
@ -42,8 +42,8 @@ from quantum.extensions import l3
|
|||||||
from quantum import manager
|
from quantum import manager
|
||||||
from quantum.openstack.common import cfg
|
from quantum.openstack.common import cfg
|
||||||
from quantum.openstack.common import log as logging
|
from quantum.openstack.common import log as logging
|
||||||
from quantum.openstack.common.notifier import test_notifier
|
|
||||||
from quantum.openstack.common.notifier import api as notifier_api
|
from quantum.openstack.common.notifier import api as notifier_api
|
||||||
|
from quantum.openstack.common.notifier import test_notifier
|
||||||
from quantum.openstack.common import uuidutils
|
from quantum.openstack.common import uuidutils
|
||||||
from quantum.tests.unit import test_api_v2
|
from quantum.tests.unit import test_api_v2
|
||||||
from quantum.tests.unit import test_db_plugin
|
from quantum.tests.unit import test_db_plugin
|
||||||
|
@ -20,8 +20,8 @@ import socket
|
|||||||
|
|
||||||
import unittest2 as unittest
|
import unittest2 as unittest
|
||||||
|
|
||||||
from quantum import wsgi
|
|
||||||
from quantum.common import exceptions as exception
|
from quantum.common import exceptions as exception
|
||||||
|
from quantum import wsgi
|
||||||
|
|
||||||
|
|
||||||
class TestWSGIServer(unittest.TestCase):
|
class TestWSGIServer(unittest.TestCase):
|
||||||
|
Loading…
Reference in New Issue
Block a user