Reordered neutron import statements in files

Change-Id: Ie03bad22b58dc226fdfed4c9bcbd87ae4ecec875
This commit is contained in:
Susanne Balle 2014-12-15 22:36:55 -05:00
parent 56c85eed9f
commit 3db31d134b
21 changed files with 47 additions and 54 deletions

View File

@ -13,13 +13,6 @@
# under the License.
#
from oslo.db import exception
from oslo.utils import excutils
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc
from sqlalchemy.orm import validates
from neutron.api.v2 import attributes
from neutron.common import exceptions as n_exc
from neutron.db import common_db_mixin as base_db
@ -31,8 +24,14 @@ from neutron import manager
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants
from neutron_lbaas.services.loadbalancer import constants as lb_const
from oslo.db import exception
from oslo.utils import excutils
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc
from sqlalchemy.orm import validates
from neutron_lbaas.services.loadbalancer import constants as lb_const
LOG = logging.getLogger(__name__)

View File

@ -17,14 +17,14 @@ import sys
import eventlet
eventlet.monkey_patch()
from oslo.config import cfg
from neutron.agent.common import config
from neutron.agent.linux import interface
from neutron.common import config as common_config
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.openstack.common import service
from oslo.config import cfg
from neutron_lbaas.services.loadbalancer.agent import agent_manager as manager
OPTS = [

View File

@ -12,9 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo import messaging
from neutron.common import rpc as n_rpc
from oslo import messaging
class LbaasAgentApi(object):

View File

@ -12,10 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo import messaging
from oslo.utils import importutils
from neutron.agent import rpc as agent_rpc
from neutron.common import constants as n_const
from neutron.common import exceptions as n_exc
@ -27,6 +23,10 @@ from neutron.openstack.common import loopingcall
from neutron.openstack.common import periodic_task
from neutron.plugins.common import constants
from neutron.services import provider_configuration as provconfig
from oslo.config import cfg
from oslo import messaging
from oslo.utils import importutils
from neutron_lbaas.services.loadbalancer.agent import agent_api
LOG = logging.getLogger(__name__)

View File

@ -15,10 +15,6 @@
import random
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import joinedload
from neutron.common import constants
from neutron.db import agents_db
from neutron.db import agentschedulers_db
@ -26,6 +22,9 @@ from neutron.db import model_base
from neutron.extensions import lbaas_agentscheduler
from neutron.i18n import _LW
from neutron.openstack.common import log as logging
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import joinedload
LOG = logging.getLogger(__name__)

View File

@ -13,10 +13,10 @@
# under the License.
import a10_neutron_lbaas
from neutron.db import l3_db
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron_lbaas.db.loadbalancer import loadbalancer_db as lb_db
from neutron_lbaas.services.loadbalancer.drivers import abstract_driver

View File

@ -14,10 +14,6 @@
import uuid
from oslo.config import cfg
from oslo import messaging
from oslo.utils import importutils
from neutron.common import constants as q_const
from neutron.common import exceptions as n_exc
from neutron.common import rpc as n_rpc
@ -29,6 +25,10 @@ from neutron.i18n import _LW
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron.services import provider_configuration as provconf
from oslo.config import cfg
from oslo import messaging
from oslo.utils import importutils
from neutron_lbaas.db.loadbalancer import loadbalancer_db
from neutron_lbaas.services.loadbalancer.drivers import abstract_driver

View File

@ -13,9 +13,8 @@
# under the License.
import abc
import six
from neutron.plugins.common import constants
import six
@six.add_metaclass(abc.ABCMeta)

View File

@ -16,10 +16,10 @@
from eventlet import greenthread
from eventlet import queue
from heleosapi import exceptions as h_exc
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.embrane.common import contexts as ctx
from neutron_lbaas.services.loadbalancer.drivers.embrane.agent \
import lb_operations
from neutron_lbaas.services.loadbalancer.drivers.embrane \

View File

@ -16,9 +16,9 @@
import functools
from heleosapi import exceptions as h_exc
from neutron.i18n import _LW
from neutron.openstack.common import log as logging
from neutron_lbaas.services.loadbalancer import constants as lcon
from neutron_lbaas.services.loadbalancer.drivers.embrane \
import constants as econ

View File

@ -15,7 +15,6 @@
from heleosapi import constants as h_con
from heleosapi import exceptions as h_exc
from neutron.plugins.common import constants as ccon
DELETED = 'DELETED' # not visible status

View File

@ -14,6 +14,7 @@
# under the License.
from neutron.db import models_v2 as nmodel
from neutron_lbaas.services.loadbalancer.drivers.embrane import models

View File

@ -16,8 +16,6 @@
from heleosapi import backend_operations as h_op
from heleosapi import constants as h_con
from heleosapi import info as h_info
from oslo.config import cfg
from neutron.api.v2 import attributes
from neutron.common import exceptions as n_exc
from neutron.extensions import loadbalancer as lb_ext
@ -27,6 +25,8 @@ from neutron.plugins.common import constants as pcon
from neutron.plugins.embrane.common import contexts as embrane_ctx
from neutron.plugins.embrane.common import exceptions as h_exc
from neutron.plugins.embrane.common import utils
from oslo.config import cfg
from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb
from neutron_lbaas.services.loadbalancer import constants as lbcon
from neutron_lbaas.services.loadbalancer.drivers import abstract_driver

View File

@ -13,9 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import sqlalchemy as sql
from neutron.db import model_base
import sqlalchemy as sql
class PoolPort(model_base.BASEV2):

View File

@ -14,7 +14,6 @@
# under the License.
from heleosapi import exceptions as h_exc
from neutron import context
from neutron.db import servicetype_db as sdb
from neutron.i18n import _LE
@ -22,6 +21,7 @@ from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.plugins.common import constants as ccon
from neutron.plugins.embrane.common import contexts as embrane_ctx
from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb
from neutron_lbaas.services.loadbalancer.drivers.embrane \
import constants as econ

View File

@ -13,12 +13,11 @@
# under the License.
import itertools
from six import moves
from neutron.agent.linux import utils
from neutron.plugins.common import constants as qconstants
from neutron_lbaas.services.loadbalancer import constants
from six import moves
from neutron_lbaas.services.loadbalancer import constants
PROTOCOL_MAP = {
constants.PROTOCOL_TCP: 'tcp',

View File

@ -17,10 +17,6 @@ import shutil
import socket
import netaddr
from oslo.config import cfg
from oslo.utils import excutils
from oslo.utils import importutils
from neutron.agent.common import config
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
@ -29,6 +25,10 @@ from neutron.common import utils as n_utils
from neutron.i18n import _LE, _LW
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from oslo.config import cfg
from oslo.utils import excutils
from oslo.utils import importutils
from neutron_lbaas.services.loadbalancer.agent import agent_device_driver
from neutron_lbaas.services.loadbalancer import constants as lb_const
from neutron_lbaas.services.loadbalancer.drivers.haproxy import cfg as hacfg

View File

@ -14,12 +14,11 @@
import base64
from oslo.serialization import jsonutils
import requests
from neutron.common import exceptions as n_exc
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from oslo.serialization import jsonutils
import requests
LOG = logging.getLogger(__name__)

View File

@ -12,12 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from neutron.api.v2 import attributes
from neutron.i18n import _LI
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from oslo.config import cfg
from neutron_lbaas.db.loadbalancer import loadbalancer_db
from neutron_lbaas.services.loadbalancer.drivers import abstract_driver
from neutron_lbaas.services.loadbalancer.drivers.netscaler import ncc_client

View File

@ -23,11 +23,6 @@ import time
import eventlet
eventlet.monkey_patch(thread=True)
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo.utils import excutils
from six.moves import queue as Queue
from neutron.api.v2 import attributes
from neutron.common import log as call_log
from neutron import context
@ -35,6 +30,11 @@ from neutron.extensions import loadbalancer
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo.utils import excutils
from six.moves import queue as Queue
from neutron_lbaas.db.loadbalancer import loadbalancer_db as lb_db
from neutron_lbaas.services.loadbalancer.drivers import abstract_driver
from neutron_lbaas.services.loadbalancer.drivers.radware \

View File

@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.utils import excutils
from neutron.api.v2 import attributes as attrs
from neutron.common import exceptions as n_exc
from neutron import context
@ -25,6 +23,8 @@ from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron.services import provider_configuration as pconf
from neutron.services import service_base
from oslo.utils import excutils
from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb
from neutron_lbaas.services.loadbalancer import agent_scheduler