Fixes import reorder nits
Fixes bug #1133080 Change-Id: I31e56cea9b7310cfd16c0340ba270c4a777c200c
This commit is contained in:
parent
20c9632e19
commit
02d12d8065
@ -20,9 +20,9 @@ import re
|
||||
import eventlet
|
||||
from oslo.config import cfg
|
||||
|
||||
from quantum.agent.common import config as agent_config
|
||||
from quantum.agent import dhcp_agent
|
||||
from quantum.agent import l3_agent
|
||||
from quantum.agent.common import config as agent_config
|
||||
from quantum.agent.linux import dhcp
|
||||
from quantum.agent.linux import ip_lib
|
||||
from quantum.agent.linux import ovs_lib
|
||||
|
@ -17,8 +17,8 @@
|
||||
|
||||
from oslo.config import cfg
|
||||
|
||||
from quantum.agent import l3_agent
|
||||
from quantum.agent.common import config as agent_config
|
||||
from quantum.agent import l3_agent
|
||||
from quantum.agent.linux import interface
|
||||
from quantum.agent.linux import ip_lib
|
||||
from quantum.agent.linux import ovs_lib
|
||||
|
@ -16,8 +16,8 @@
|
||||
#
|
||||
# @author: Kaiwei Fan, VMware, Inc
|
||||
|
||||
from sqlalchemy.orm import exc
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.orm import exc
|
||||
|
||||
from quantum.db import model_base
|
||||
from quantum.extensions import routerservicetype as rst
|
||||
|
@ -19,8 +19,8 @@
|
||||
import re
|
||||
import uuid
|
||||
|
||||
from quantum.plugins.nec.db import api as ndb
|
||||
from quantum.plugins.nec.common import ofc_client
|
||||
from quantum.plugins.nec.db import api as ndb
|
||||
from quantum.plugins.nec import ofc_driver_base
|
||||
|
||||
|
||||
|
@ -17,8 +17,8 @@
|
||||
# @author: Akihiro MOTOKI
|
||||
|
||||
from quantum.openstack.common import uuidutils
|
||||
from quantum.plugins.nec.db import api as ndb
|
||||
from quantum.plugins.nec.common import ofc_client
|
||||
from quantum.plugins.nec.db import api as ndb
|
||||
from quantum.plugins.nec import ofc_driver_base
|
||||
|
||||
|
||||
|
@ -19,8 +19,8 @@ from sqlalchemy.orm import exc
|
||||
|
||||
import quantum.db.api as db
|
||||
from quantum.openstack.common import log as logging
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import nicira_networkgw_db
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import nicira_models
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import nicira_networkgw_db
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -29,8 +29,8 @@ from quantum.common import exceptions
|
||||
from quantum.db import db_base_plugin_v2
|
||||
from quantum.db import model_base
|
||||
from quantum.db import models_v2
|
||||
from quantum.openstack.common import uuidutils
|
||||
from quantum.openstack.common import log as logging
|
||||
from quantum.openstack.common import uuidutils
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin.extensions import nvp_networkgw
|
||||
from quantum import policy
|
||||
|
||||
|
@ -36,11 +36,11 @@ from quantum.common import constants as q_const
|
||||
from quantum.common import topics
|
||||
from quantum.common import utils as q_utils
|
||||
from quantum import context
|
||||
from quantum.extensions import securitygroup as ext_sg
|
||||
from quantum.openstack.common import log as logging
|
||||
from quantum.openstack.common import loopingcall
|
||||
from quantum.openstack.common.rpc import dispatcher
|
||||
from quantum.plugins.openvswitch.common import config
|
||||
from quantum.extensions import securitygroup as ext_sg
|
||||
from quantum.plugins.openvswitch.common import constants
|
||||
|
||||
|
||||
|
@ -29,9 +29,9 @@ from quantum.db import api as db
|
||||
from quantum.db import db_base_plugin_v2
|
||||
from quantum.openstack.common import log as logging
|
||||
from quantum.plugins.plumgrid.common import exceptions as plum_excep
|
||||
from quantum.plugins.plumgrid.plumgrid_nos_plugin.plugin_ver import VERSION
|
||||
from quantum.plugins.plumgrid.plumgrid_nos_plugin import plumgrid_nos_snippets
|
||||
from quantum.plugins.plumgrid.plumgrid_nos_plugin import rest_connection
|
||||
from quantum.plugins.plumgrid.plumgrid_nos_plugin.plugin_ver import VERSION
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
@ -40,9 +40,9 @@ from quantum.common import config as logging_config
|
||||
from quantum.common import exceptions as q_exc
|
||||
from quantum.common import topics
|
||||
from quantum import context as q_context
|
||||
from quantum.extensions import securitygroup as ext_sg
|
||||
from quantum.openstack.common import log
|
||||
from quantum.openstack.common.rpc import dispatcher
|
||||
from quantum.extensions import securitygroup as ext_sg
|
||||
from quantum.plugins.ryu.common import config
|
||||
|
||||
|
||||
|
@ -20,9 +20,10 @@
|
||||
|
||||
from abc import abstractmethod
|
||||
|
||||
from quantum import manager, quota
|
||||
from quantum.api import extensions
|
||||
from quantum.api.v2 import base
|
||||
from quantum import manager
|
||||
from quantum import quota
|
||||
|
||||
|
||||
# Attribute Map
|
||||
|
@ -18,8 +18,8 @@
|
||||
import random
|
||||
import unittest
|
||||
|
||||
from quantum.openstack.common import uuidutils
|
||||
from quantum.db import api as db_api
|
||||
from quantum.openstack.common import uuidutils
|
||||
from quantum.plugins.nec.common import exceptions as nexc
|
||||
from quantum.plugins.nec.db import api as ndb
|
||||
from quantum.plugins.nec.db import models as nmodels
|
||||
|
@ -17,8 +17,8 @@ import contextlib
|
||||
|
||||
import mock
|
||||
import unittest2 as unittest
|
||||
import webtest
|
||||
from webob import exc
|
||||
import webtest
|
||||
|
||||
from quantum.api import extensions
|
||||
from quantum.api.extensions import PluginAwareExtensionManager
|
||||
|
@ -18,8 +18,8 @@ import logging
|
||||
import os
|
||||
|
||||
import mock
|
||||
from oslo.config import cfg
|
||||
import netaddr
|
||||
from oslo.config import cfg
|
||||
import webob.exc
|
||||
|
||||
from quantum.common import constants
|
||||
@ -35,10 +35,10 @@ from quantum.plugins.nicira.nicira_nvp_plugin.extensions import (nvp_qos
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import nvplib
|
||||
from quantum.tests.unit.nicira import fake_nvpapiclient
|
||||
import quantum.tests.unit.nicira.test_networkgw as test_l2_gw
|
||||
from quantum.tests.unit import test_extensions
|
||||
import quantum.tests.unit.test_db_plugin as test_plugin
|
||||
import quantum.tests.unit.test_extension_portsecurity as psec
|
||||
import quantum.tests.unit.test_extension_security_group as ext_sg
|
||||
from quantum.tests.unit import test_extensions
|
||||
import quantum.tests.unit.test_l3_plugin as test_l3_plugin
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
@ -21,10 +21,10 @@ import mock
|
||||
import unittest2 as unittest
|
||||
|
||||
from quantum.openstack.common import jsonutils as json
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import NvpApiClient
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import nvp_cluster
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import nvplib
|
||||
import quantum.plugins.nicira.nicira_nvp_plugin as nvp_plugin
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import nvp_cluster
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import NvpApiClient
|
||||
from quantum.plugins.nicira.nicira_nvp_plugin import nvplib
|
||||
from quantum.tests.unit.nicira import fake_nvpapiclient
|
||||
from quantum.tests.unit import test_api_v2
|
||||
|
||||
|
@ -21,8 +21,8 @@ import time
|
||||
from webob import exc
|
||||
|
||||
from quantum.common import constants
|
||||
from quantum.common import topics
|
||||
from quantum.common.test_lib import test_config
|
||||
from quantum.common import topics
|
||||
from quantum import context
|
||||
from quantum.db import agents_db
|
||||
from quantum.db import db_base_plugin_v2
|
||||
|
@ -25,8 +25,8 @@ import webob
|
||||
from webob import exc
|
||||
import webtest
|
||||
|
||||
from quantum.api.extensions import PluginAwareExtensionManager
|
||||
from quantum.api import api_common
|
||||
from quantum.api.extensions import PluginAwareExtensionManager
|
||||
from quantum.api.v2 import attributes
|
||||
from quantum.api.v2 import base
|
||||
from quantum.api.v2 import router
|
||||
|
@ -21,8 +21,8 @@ import unittest2
|
||||
import mock
|
||||
from oslo.config import cfg
|
||||
|
||||
from quantum.agent import l3_agent
|
||||
from quantum.agent.common import config as agent_config
|
||||
from quantum.agent import l3_agent
|
||||
from quantum.agent.linux import interface
|
||||
from quantum.common import config as base_config
|
||||
from quantum.common import constants as l3_constants
|
||||
|
@ -21,9 +21,9 @@ import quantum
|
||||
from quantum.api import extensions
|
||||
from quantum.api.v2 import router
|
||||
from quantum.common import config
|
||||
from quantum.db.loadbalancer import loadbalancer_db as lb_db
|
||||
from quantum.db import db_base_plugin_v2
|
||||
from quantum.db import l3_db
|
||||
from quantum.db.loadbalancer import loadbalancer_db as lb_db
|
||||
from quantum.db import routedserviceinsertion_db as rsi_db
|
||||
from quantum.db import routerservicetype_db as rst_db
|
||||
from quantum.db import servicetype_db as st_db
|
||||
|
Loading…
x
Reference in New Issue
Block a user