pep8: Configure flake8-import-order properly
Closes-Bug: #1703554 Change-Id: Id77c5fafaf4ccf168903914975004915507886ea
This commit is contained in:
parent
a0735ac47f
commit
8dccb738db
|
@ -13,13 +13,12 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonetclient import client
|
||||
from oslo_log import log as logging
|
||||
|
||||
from midonet.neutron.client import base
|
||||
from midonet.neutron.common import utils
|
||||
|
||||
from midonetclient import client
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
|
@ -13,11 +13,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import neutron.db.api as db
|
||||
|
||||
from midonet.neutron.client import base
|
||||
from midonet.neutron.db import task_db as task
|
||||
|
||||
import neutron.db.api as db
|
||||
|
||||
|
||||
class MidonetClusterClient(base.MidonetClientBase):
|
||||
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from neutron_dynamic_routing.db import bgp_db
|
||||
from neutron_lib.plugins import constants
|
||||
from neutron_lib.plugins import directory
|
||||
|
||||
from neutron.ipam import utils as ipam_utils
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
|
||||
from neutron.ipam import utils as ipam_utils
|
||||
from neutron_dynamic_routing.db import bgp_db
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
|
@ -13,12 +13,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonet.neutron.db import bgp_speaker_router_insertion_model as model
|
||||
from midonet.neutron.extensions import bgp_speaker_router_insertion as bsri
|
||||
|
||||
from neutron.db import api as db_api
|
||||
from neutron.extensions import l3
|
||||
from neutron_dynamic_routing.db import bgp_db as bdb
|
||||
from neutron_lib.callbacks import events
|
||||
from neutron_lib.callbacks import registry
|
||||
from neutron_lib.callbacks import resources
|
||||
|
@ -28,6 +22,13 @@ from oslo_log import helpers as log_helpers
|
|||
from oslo_log import log as logging
|
||||
from sqlalchemy.orm import exc
|
||||
|
||||
from neutron.db import api as db_api
|
||||
from neutron.extensions import l3
|
||||
from neutron_dynamic_routing.db import bgp_db as bdb
|
||||
|
||||
from midonet.neutron.db import bgp_speaker_router_insertion_model as model
|
||||
from midonet.neutron.extensions import bgp_speaker_router_insertion as bsri
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -13,10 +13,12 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonet.neutron.common import exceptions as exc
|
||||
from neutron_lib.db import model_base
|
||||
import sqlalchemy as sa
|
||||
|
||||
from neutron_lib.db import model_base
|
||||
|
||||
from midonet.neutron.common import exceptions as exc
|
||||
|
||||
|
||||
DATA_STATE_TABLE = 'midonet_data_state'
|
||||
|
||||
|
|
|
@ -21,9 +21,6 @@ from neutron_lib.db import model_base
|
|||
from neutron_lib import exceptions as n_exc
|
||||
from neutron_lib.plugins import constants
|
||||
from neutron_lib.plugins import directory
|
||||
|
||||
from neutron.db import common_db_mixin
|
||||
from neutron.extensions import l3
|
||||
from oslo_db import exception as db_exc
|
||||
from oslo_utils import uuidutils
|
||||
import sqlalchemy as sa
|
||||
|
@ -31,6 +28,9 @@ from sqlalchemy.ext import declarative
|
|||
from sqlalchemy import orm
|
||||
from sqlalchemy.orm import exc
|
||||
|
||||
from neutron.db import common_db_mixin
|
||||
from neutron.extensions import l3
|
||||
|
||||
from midonet.neutron.extensions import gateway_device as gw_device_ext
|
||||
|
||||
GATEWAY_DEVICES = 'midonet_gateway_devices'
|
||||
|
|
|
@ -13,15 +13,17 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonet.neutron.common import constants as midonet_const
|
||||
from midonet.neutron.services.l2gateway.common import l2gw_midonet_validators
|
||||
from midonet.neutron.services.l2gateway import exceptions
|
||||
from neutron_lib.plugins import directory
|
||||
|
||||
from networking_l2gw.db.l2gateway import l2gateway_db
|
||||
from networking_l2gw.db.l2gateway import l2gateway_models as models
|
||||
from networking_l2gw.services.l2gateway.common import constants
|
||||
from networking_l2gw.services.l2gateway import exceptions as l2gw_exc
|
||||
from neutron.api import extensions as neutron_extensions
|
||||
from neutron_lib.plugins import directory
|
||||
|
||||
from midonet.neutron.common import constants as midonet_const
|
||||
from midonet.neutron.services.l2gateway.common import l2gw_midonet_validators
|
||||
from midonet.neutron.services.l2gateway import exceptions
|
||||
|
||||
|
||||
class MidonetL2GatewayMixin(l2gateway_db.L2GatewayMixin):
|
||||
|
|
|
@ -13,17 +13,17 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonet.neutron.db import logging_resource_model as model
|
||||
from midonet.neutron.extensions import logging_resource as log_res_ext
|
||||
from neutron.db import common_db_mixin
|
||||
from neutron_lib.exceptions import firewall_v1 as fw_exc
|
||||
|
||||
from oslo_db import exception as db_exc
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_utils import uuidutils
|
||||
|
||||
from sqlalchemy.orm import exc
|
||||
|
||||
from neutron.db import common_db_mixin
|
||||
|
||||
from midonet.neutron.db import logging_resource_model as model
|
||||
from midonet.neutron.extensions import logging_resource as log_res_ext
|
||||
|
||||
|
||||
class LoggingResourceDbMixin(log_res_ext.LoggingResourcePluginBase,
|
||||
common_db_mixin.CommonDbMixin):
|
||||
|
|
|
@ -15,14 +15,15 @@
|
|||
from logging import config as logging_config
|
||||
|
||||
from alembic import context
|
||||
from neutron.db.migration.alembic_migrations import external
|
||||
from neutron.db.migration.models import head # noqa
|
||||
from neutron_lib.db import model_base
|
||||
from oslo_config import cfg
|
||||
from oslo_db.sqlalchemy import session
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy import event
|
||||
|
||||
from neutron.db.migration.alembic_migrations import external
|
||||
from neutron.db.migration.models import head # noqa
|
||||
|
||||
from midonet.neutron.db.migration.models import head # noqa
|
||||
|
||||
|
||||
|
|
|
@ -15,16 +15,18 @@
|
|||
import os
|
||||
|
||||
from alembic import config as alembic_config
|
||||
from midonet.neutron._i18n import _
|
||||
import midonet.neutron.db.data_state_db as ds_db
|
||||
import midonet.neutron.db.data_version_db as dv_db
|
||||
from midonet.neutron.db import task_db
|
||||
from neutron.db.migration import cli as n_cli
|
||||
from oslo_config import cfg
|
||||
from oslo_serialization import jsonutils
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
from neutron.db.migration import cli as n_cli
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
import midonet.neutron.db.data_state_db as ds_db
|
||||
import midonet.neutron.db.data_version_db as dv_db
|
||||
from midonet.neutron.db import task_db
|
||||
|
||||
|
||||
CONF = n_cli.CONF
|
||||
|
||||
|
|
|
@ -18,11 +18,11 @@ from neutron_lib.api import validators
|
|||
from neutron_lib.db import model_base
|
||||
from neutron_lib import exceptions as n_exc
|
||||
from neutron_lib.plugins import directory
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy import orm
|
||||
|
||||
from neutron.db import _resource_extend as resource_extend
|
||||
from neutron.db import models_v2
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy import orm
|
||||
|
||||
|
||||
class PortBindingInfo(model_base.BASEV2):
|
||||
|
|
|
@ -16,14 +16,15 @@ from neutron_lib.api.definitions import provider_net as pnet
|
|||
from neutron_lib.api import validators
|
||||
from neutron_lib.db import model_base
|
||||
from neutron_lib import exceptions as n_exc
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
from midonet.neutron.common import constants as m_const
|
||||
from neutron.db import models_v2
|
||||
from oslo_log import log as logging
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy import orm
|
||||
|
||||
from neutron.db import models_v2
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
from midonet.neutron.common import constants as m_const
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -20,14 +20,15 @@ from neutron_lib.api import validators
|
|||
from neutron_lib.db import constants as db_const
|
||||
from neutron_lib import exceptions as nexception
|
||||
from neutron_lib.plugins import directory
|
||||
from oslo_log import log as logging
|
||||
import six
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
from midonet.neutron.common import constants
|
||||
from neutron.api import extensions
|
||||
from neutron.api.v2 import base
|
||||
from neutron.api.v2 import resource_helper
|
||||
from oslo_log import log as logging
|
||||
import six
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
from midonet.neutron.common import constants
|
||||
|
||||
|
||||
class GatewayDeviceNotFound(nexception.NotFound):
|
||||
|
|
|
@ -17,6 +17,9 @@ from neutron_lib.api.definitions import portbindings
|
|||
from neutron_lib import constants as n_const
|
||||
from neutron_lib import exceptions as n_exc
|
||||
from neutron_lib.plugins.ml2 import api
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
from midonet.neutron.client import base as c_base
|
||||
|
@ -28,10 +31,6 @@ from midonet.neutron.ml2 import sg_callback
|
|||
from midonet.neutron.ml2 import util as m_util
|
||||
from midonet.neutron.services.qos import driver as qos_driver
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
|
@ -13,11 +13,12 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from neutron.plugins.ml2 import driver_api
|
||||
from neutron_lib import exceptions as exc
|
||||
from neutron_lib.plugins.ml2 import api
|
||||
from oslo_log import log
|
||||
|
||||
from neutron.plugins.ml2 import driver_api
|
||||
|
||||
from midonet.neutron.common import constants as const
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
|
|
@ -15,9 +15,10 @@
|
|||
|
||||
import functools
|
||||
|
||||
from neutron.plugins.ml2 import driver_context as ctx
|
||||
from neutron_lib.api.definitions import provider_net
|
||||
|
||||
from neutron.plugins.ml2 import driver_context as ctx
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
from midonet.neutron.common import constants as const
|
||||
|
||||
|
|
|
@ -15,11 +15,8 @@
|
|||
|
||||
from neutron_lib.api.definitions import portbindings
|
||||
from neutron_lib import constants as n_const
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
from midonet.neutron.common import config # noqa
|
||||
from midonet.neutron.common import constants as const
|
||||
from midonet.neutron import extensions
|
||||
from oslo_config import cfg
|
||||
from oslo_utils import importutils
|
||||
|
||||
from neutron.api import extensions as neutron_extensions
|
||||
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
|
||||
|
@ -35,8 +32,10 @@ from neutron.db import extradhcpopt_db
|
|||
from neutron.db import portbindings_db
|
||||
from neutron.db import securitygroups_db
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_utils import importutils
|
||||
from midonet.neutron.client import base as c_base
|
||||
from midonet.neutron.common import config # noqa
|
||||
from midonet.neutron.common import constants as const
|
||||
from midonet.neutron import extensions
|
||||
|
||||
|
||||
class MidonetMixinBase(db_base_plugin_v2.NeutronDbPluginV2,
|
||||
|
|
|
@ -28,6 +28,18 @@ from neutron_lib import exceptions as n_exc
|
|||
from neutron_lib.exceptions import port_security as psec_exc
|
||||
from neutron_lib.plugins import constants as plugin_constants
|
||||
from neutron_lib.plugins import directory
|
||||
from oslo_db import exception as oslo_db_exc
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from neutron.db import _resource_extend as resource_extend
|
||||
from neutron.db import allowedaddresspairs_db as addr_pair_db
|
||||
from neutron.db import api as db_api
|
||||
from neutron.db import portsecurity_db as ps_db
|
||||
from neutron.extensions import allowedaddresspairs as addr_pair
|
||||
from neutron.extensions import providernet as pnet
|
||||
from neutron.extensions import securitygroup as ext_sg
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
from midonet.neutron.common import utils as c_utils
|
||||
|
@ -38,18 +50,6 @@ from midonet.neutron.ml2 import sg_callback
|
|||
from midonet.neutron import plugin
|
||||
from midonet.neutron.services.qos import driver as qos_driver
|
||||
|
||||
from neutron.db import _resource_extend as resource_extend
|
||||
from neutron.db import allowedaddresspairs_db as addr_pair_db
|
||||
from neutron.db import api as db_api
|
||||
from neutron.db import portsecurity_db as ps_db
|
||||
from neutron.extensions import allowedaddresspairs as addr_pair
|
||||
from neutron.extensions import providernet as pnet
|
||||
from neutron.extensions import securitygroup as ext_sg
|
||||
from oslo_db import exception as oslo_db_exc
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -16,11 +16,12 @@
|
|||
import socket
|
||||
import uuid
|
||||
|
||||
from midonet.neutron.common import exceptions as mexc
|
||||
from midonetclient import topology # noqa
|
||||
from midonetclient.topology import hosts
|
||||
from midonetclient.topology import pool_members
|
||||
|
||||
from midonet.neutron.common import exceptions as mexc
|
||||
|
||||
|
||||
MIDO_AGENT_NAME = 'Midonet Agent'
|
||||
MIDO_BINARY = 'midolman'
|
||||
|
|
|
@ -15,18 +15,17 @@
|
|||
|
||||
import itertools
|
||||
|
||||
from neutron_lib import exceptions as nexception
|
||||
from neutron_lib.plugins import directory
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from neutron_dynamic_routing import extensions as bgp_extensions
|
||||
from neutron_dynamic_routing.extensions import bgp
|
||||
|
||||
from neutron.api import extensions as neutron_extensions
|
||||
from neutron.db import api as db_api
|
||||
from neutron_lib import exceptions as nexception
|
||||
from neutron_lib.plugins import directory
|
||||
from neutron_dynamic_routing import extensions as bgp_extensions
|
||||
from neutron_dynamic_routing.extensions import bgp
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
from midonet.neutron.common import constants as m_const
|
||||
|
|
|
@ -13,19 +13,18 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
from neutron_lib import constants
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from neutron.api import extensions as neutron_extensions
|
||||
from neutron_fwaas.db.firewall import firewall_db
|
||||
from neutron_fwaas import extensions
|
||||
from neutron_fwaas.services.firewall import fwaas_plugin as fw_plugin
|
||||
|
||||
from neutron_lib import constants
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
from midonet.neutron.client import base as c_base
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -13,6 +13,13 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from neutron.api import extensions as neutron_extensions
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
from midonet.neutron.common import config # noqa
|
||||
from midonet.neutron.common import constants as midonet_const
|
||||
|
@ -20,12 +27,6 @@ from midonet.neutron.db import gateway_device as gateway_device_db
|
|||
from midonet.neutron import extensions
|
||||
from midonet.neutron.extensions import gateway_device
|
||||
|
||||
from neutron.api import extensions as neutron_extensions
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
|
@ -16,11 +16,12 @@
|
|||
from neutron_lib.api import validators
|
||||
from neutron_lib import exceptions
|
||||
|
||||
from networking_l2gw.services.l2gateway.common import constants as l2gw_const
|
||||
from networking_l2gw.services.l2gateway.common import l2gw_validators
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
from midonet.neutron.common import constants
|
||||
from midonet.neutron.extensions import gateway_device
|
||||
from networking_l2gw.services.l2gateway.common import constants as l2gw_const
|
||||
from networking_l2gw.services.l2gateway.common import l2gw_validators
|
||||
|
||||
|
||||
def validate_gwdevice_list(data, valid_values=None):
|
||||
|
|
|
@ -14,17 +14,18 @@
|
|||
# under the License.
|
||||
|
||||
from neutron_lib.api import validators
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from midonet.neutron.common import constants as mido_const
|
||||
from midonet.neutron.db import l2gateway_midonet as l2gw_db
|
||||
from midonet.neutron.services.l2gateway.common import l2gw_midonet_validators
|
||||
from networking_l2gw import extensions as l2gateway_ext
|
||||
from networking_l2gw.services.l2gateway.common import l2gw_validators
|
||||
from networking_l2gw.services.l2gateway import plugin as l2gw_plugin
|
||||
from neutron.api import extensions as neutron_extensions
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from midonet.neutron.common import constants as mido_const
|
||||
from midonet.neutron.db import l2gateway_midonet as l2gw_db
|
||||
from midonet.neutron.services.l2gateway.common import l2gw_midonet_validators
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -15,16 +15,15 @@
|
|||
|
||||
import abc
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
import six
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
|
||||
from networking_l2gw.services.l2gateway.common import constants
|
||||
from networking_l2gw.services.l2gateway import service_drivers
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
from midonet.neutron.client import base as c_base
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -20,13 +20,10 @@ from neutron_lib.callbacks import resources
|
|||
from neutron_lib import constants as n_const
|
||||
from neutron_lib import exceptions as n_exc
|
||||
from neutron_lib.plugins import constants as plugin_constants
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
from midonet.neutron.common import config # noqa
|
||||
from midonet.neutron.common import constants as m_const
|
||||
from midonet.neutron.db import l3_db_midonet
|
||||
from midonet.neutron import extensions
|
||||
from midonet.neutron.extensions import routerinterfacefip
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from neutron.api import extensions as neutron_extensions
|
||||
from neutron.db import api as db_api
|
||||
|
@ -36,10 +33,13 @@ from neutron.db import extraroute_db
|
|||
from neutron.db import l3_dvr_db # noqa
|
||||
from neutron.extensions import l3
|
||||
from neutron.extensions import multiprovidernet as mpnet
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
from midonet.neutron.common import config # noqa
|
||||
from midonet.neutron.common import constants as m_const
|
||||
from midonet.neutron.db import l3_db_midonet
|
||||
from midonet.neutron import extensions
|
||||
from midonet.neutron.extensions import routerinterfacefip
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -13,18 +13,18 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
from midonet.neutron.common import constants as midonet_const
|
||||
from midonet.neutron.db import logging_resource_db as log_res_db
|
||||
|
||||
from neutron_lib.plugins import constants as const
|
||||
from neutron_lib.plugins import directory
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from neutron_lib.plugins import constants as const
|
||||
from neutron_lib.plugins import directory
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
from midonet.neutron.common import constants as midonet_const
|
||||
from midonet.neutron.db import logging_resource_db as log_res_db
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
|
@ -13,15 +13,15 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
|
||||
from neutron_taas.services.taas import service_drivers as taas_service_drivers
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import helpers as log_helpers
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from neutron_taas.services.taas import service_drivers as taas_service_drivers
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
|
@ -13,17 +13,16 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonet.neutron.client import base as c_base
|
||||
|
||||
from neutron_lib import constants as const
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from neutron_vpnaas.services.vpn import plugin
|
||||
from neutron_vpnaas.services.vpn.service_drivers import base_ipsec
|
||||
from neutron_vpnaas.services.vpn.service_drivers import ipsec_validator
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
from midonet.neutron.client import base as c_base
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -12,13 +12,15 @@
|
|||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import sys
|
||||
|
||||
from neutronclient import shell
|
||||
|
||||
from midonet.neutron.extensions import logging_resource as log_res_ext
|
||||
from midonet.neutron.tests.unit.neutronclient_ext import test_cli20
|
||||
from midonet.neutron.tests.unit import test_extension_logging_resource as telr
|
||||
from midonet.neutronclient.logging_resource_extension import _firewall_log
|
||||
from neutronclient import shell
|
||||
|
||||
RESOURCE = 'firewall_log'
|
||||
RESOURCES = 'firewall_logs'
|
||||
|
|
|
@ -12,11 +12,13 @@
|
|||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import sys
|
||||
|
||||
from neutronclient import shell
|
||||
|
||||
from midonet.neutron.tests.unit.neutronclient_ext import test_cli20
|
||||
from midonet.neutronclient.gateway_device_extension import _gateway_device
|
||||
from neutronclient import shell
|
||||
|
||||
|
||||
class CLITestV20GatewayDeviceJSON(test_cli20.CLIExtTestV20Base):
|
||||
|
|
|
@ -12,11 +12,13 @@
|
|||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import sys
|
||||
|
||||
from neutronclient import shell
|
||||
|
||||
from midonet.neutron.tests.unit.neutronclient_ext import test_cli20
|
||||
from midonet.neutronclient.l2gateway_extension import _l2_gateway
|
||||
from neutronclient import shell
|
||||
|
||||
|
||||
class CLITestV20L2gatewayJSON(test_cli20.CLIExtTestV20Base):
|
||||
|
|
|
@ -12,13 +12,15 @@
|
|||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import sys
|
||||
|
||||
from neutronclient import shell
|
||||
|
||||
from midonet.neutron.extensions import logging_resource as log_res_ext
|
||||
from midonet.neutron.tests.unit.neutronclient_ext import test_cli20
|
||||
from midonet.neutron.tests.unit import test_extension_logging_resource as telr
|
||||
from midonet.neutronclient.logging_resource_extension import _logging_resource
|
||||
from neutronclient import shell
|
||||
|
||||
RESOURCE = 'logging_resource'
|
||||
RESOURCES = 'logging_resources'
|
||||
|
|
|
@ -12,11 +12,13 @@
|
|||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import sys
|
||||
|
||||
from neutronclient import shell
|
||||
|
||||
from midonet.neutron.tests.unit.neutronclient_ext import test_cli20
|
||||
from midonet.neutronclient.gateway_device_extension import _remote_mac_entry
|
||||
from neutronclient import shell
|
||||
|
||||
|
||||
class CLITestV20RemoteMacEntryJSON(test_cli20.CLIExtTestV20Base):
|
||||
|
|
|
@ -15,22 +15,20 @@
|
|||
|
||||
import contextlib
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
import webob.exc
|
||||
|
||||
from neutron.tests.unit.api import test_extensions as test_ex
|
||||
from neutron.tests.unit.extensions import test_extraroute
|
||||
from neutron.tests.unit.extensions import test_l3
|
||||
from neutron_dynamic_routing.extensions import bgp
|
||||
|
||||
from midonet.neutron.common import constants as m_const
|
||||
from midonet.neutron import extensions as midoextensions
|
||||
from midonet.neutron.extensions import bgp_speaker_router_insertion as bsri
|
||||
from midonet.neutron.services.bgp import plugin as bgp_plugin
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
|
||||
from neutron_dynamic_routing.extensions import bgp
|
||||
|
||||
from neutron.tests.unit.api import test_extensions as test_ex
|
||||
from neutron.tests.unit.extensions import test_extraroute
|
||||
from neutron.tests.unit.extensions import test_l3
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
|
||||
FAKE_SPEAKER_NAME = "bgp_spaeker_1"
|
||||
FAKE_LOCAL_AS = 65000
|
||||
FAKE_REMOTE_AS = 65001
|
||||
|
|
|
@ -13,10 +13,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from neutron_lib import constants as n_const
|
||||
|
||||
from neutron_fwaas.tests.unit.services.firewall import test_fwaas_plugin as tfp
|
||||
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
from neutron_fwaas.tests.unit.services.firewall import test_fwaas_plugin as tfp
|
||||
from neutron_lib import constants as n_const
|
||||
|
||||
# Overwrite the FWaaS plugin constant so that the MidoNet FWaaS plugin gets
|
||||
# loaded when the tests run.
|
||||
|
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
import contextlib
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
import webob.exc
|
||||
|
||||
from neutron.tests.unit.api import test_extensions as test_ex
|
||||
from neutron.tests.unit.extensions import test_l3
|
||||
|
||||
from midonet.neutron import extensions as midoextensions
|
||||
from midonet.neutron.extensions import gateway_device
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_ml2 as test_mn_ml2
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
from neutron.tests.unit.api import test_extensions as test_ex
|
||||
from neutron.tests.unit.extensions import test_l3
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
|
||||
FAKE_MANAGEMENT_IP = '10.0.0.3'
|
||||
FAKE_MANAGEMENT_PORT = 5672
|
||||
|
|
|
@ -16,11 +16,9 @@
|
|||
import contextlib
|
||||
|
||||
import mock
|
||||
from oslo_utils import uuidutils
|
||||
import webob.exc
|
||||
|
||||
from midonet.neutron.common import constants as mido_const
|
||||
from midonet.neutron.tests.unit import test_extension_gateway_device as test_gw
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
from networking_l2gw.extensions import l2gateway
|
||||
from networking_l2gw.extensions import l2gatewayconnection
|
||||
from networking_l2gw.services.l2gateway.common import constants as l2gw_consts
|
||||
|
@ -29,7 +27,9 @@ from neutron.services import provider_configuration as provconf
|
|||
from neutron.tests.unit.api import test_extensions as test_ex
|
||||
from neutron.tests.unit.extensions import test_l3
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
from midonet.neutron.common import constants as mido_const
|
||||
from midonet.neutron.tests.unit import test_extension_gateway_device as test_gw
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
|
||||
L2_GW_NAME = 'l2_gw1'
|
||||
L2_GW_NAME2 = 'l2_gw2'
|
||||
|
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
import contextlib
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
import webob.exc
|
||||
|
||||
from midonet.neutron import extensions as midoextensions
|
||||
from midonet.neutron.extensions import logging_resource as log_res_ext
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
from neutron.tests.unit.api import test_extensions as test_ex
|
||||
from neutron.tests.unit.extensions import test_l3
|
||||
from neutron_fwaas.tests.unit.services.firewall import test_fwaas_plugin as tfp
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
from midonet.neutron import extensions as midoextensions
|
||||
from midonet.neutron.extensions import logging_resource as log_res_ext
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
|
||||
|
||||
LOGGING_PLUGIN_KLASS = 'midonet_logging_resource'
|
||||
|
|
|
@ -16,19 +16,17 @@
|
|||
import contextlib
|
||||
|
||||
import mock
|
||||
from oslo_utils import uuidutils
|
||||
import webob.exc
|
||||
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
|
||||
from neutron.db import servicetype_db as sdb
|
||||
from neutron.services import provider_configuration as provconf
|
||||
from neutron.tests.unit.api import test_extensions as test_ex
|
||||
|
||||
from neutron_taas.common import constants as taas_const
|
||||
from neutron_taas.extensions import taas as ext_taas
|
||||
from neutron_taas.tests.unit.services.taas import test_taas_plugin # noqa
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
|
||||
# Generate uuids
|
||||
TENANT1 = uuidutils.generate_uuid()
|
||||
|
|
|
@ -14,19 +14,19 @@
|
|||
# under the License.
|
||||
|
||||
import mock
|
||||
from neutron_lib import constants
|
||||
from neutron_lib.plugins import constants as plugin_const
|
||||
import webob.exc
|
||||
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
|
||||
from neutron.db import servicetype_db as sdb
|
||||
from neutron import extensions as nextensions
|
||||
from neutron.services import provider_configuration as provconf
|
||||
from neutron.tests.unit.extensions import test_l3 as test_l3_plugin
|
||||
from neutron_lib import constants
|
||||
from neutron_lib.plugins import constants as plugin_const
|
||||
from neutron_vpnaas import extensions
|
||||
from neutron_vpnaas.tests.unit.db.vpn import test_vpn_db
|
||||
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn
|
||||
|
||||
|
||||
MN_DRIVER_KLASS = ('midonet.neutron.services.vpn.service_drivers.'
|
||||
'midonet_ipsec.MidonetIPsecVPNDriver')
|
||||
|
|
|
@ -28,9 +28,8 @@ from neutron_lib import constants as n_const
|
|||
from neutron_lib import context
|
||||
from neutron_lib.plugins import constants as plugin_const
|
||||
from neutron_lib.plugins import directory
|
||||
from oslo_config import cfg
|
||||
|
||||
from midonet.neutron.common import constants as m_const
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin as test_mn_plugin
|
||||
from networking_l2gw.db.l2gateway import l2gateway_models # noqa
|
||||
from neutron.extensions import securitygroup as sg
|
||||
from neutron.tests.unit import _test_extension_portbindings as test_bindings
|
||||
|
@ -42,7 +41,8 @@ from neutron.tests.unit.extensions import test_l3_ext_gw_mode as test_gw_mode
|
|||
from neutron.tests.unit.extensions import test_portsecurity as test_psec
|
||||
from neutron.tests.unit.extensions import test_securitygroup as test_sg
|
||||
|
||||
from oslo_config import cfg
|
||||
from midonet.neutron.common import constants as m_const
|
||||
from midonet.neutron.tests.unit import test_midonet_plugin as test_mn_plugin
|
||||
|
||||
|
||||
load_tests = testscenarios.load_tests_apply_scenarios
|
||||
|
|
|
@ -16,11 +16,11 @@
|
|||
from neutron_lib import exceptions as exc
|
||||
from neutron_lib.plugins.ml2 import api
|
||||
|
||||
from neutron.tests import base
|
||||
|
||||
from midonet.neutron.common import constants as const
|
||||
from midonet.neutron.ml2 import type_midonet
|
||||
|
||||
from neutron.tests import base
|
||||
|
||||
|
||||
class MidonetTypeTest(base.BaseTestCase):
|
||||
|
||||
|
|
|
@ -13,12 +13,13 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
from midonet.neutron._i18n import _
|
||||
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
from neutronclient.common import extension
|
||||
from neutronclient.neutron import v2_0 as gw_deviceV20
|
||||
|
||||
from oslo_serialization import jsonutils
|
||||
from midonet.neutron._i18n import _
|
||||
|
||||
|
||||
def add_name_and_tunnel_ips_to_arguments(parser):
|
||||
|
|
|
@ -13,13 +13,14 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
from midonet.neutron._i18n import _
|
||||
|
||||
from neutron_lib.utils import helpers
|
||||
|
||||
from networking_l2gw.l2gatewayclient.l2gw_client_ext import _l2_gateway
|
||||
from neutronclient.common import extension
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
|
||||
|
||||
def add_known_arguments(self, parser):
|
||||
parser.add_argument(
|
||||
|
|
|
@ -13,12 +13,12 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from midonet.neutron._i18n import _
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
from neutronclient.common import extension
|
||||
from neutronclient.neutron import v2_0 as loggingV20
|
||||
|
||||
from oslo_serialization import jsonutils
|
||||
from midonet.neutron._i18n import _
|
||||
|
||||
|
||||
def add_common_paramaters_to_arguments(parser):
|
||||
|
|
6
tox.ini
6
tox.ini
|
@ -76,7 +76,13 @@ ignore = N530
|
|||
enable-extensions=H106,H203,H904
|
||||
show-source = true
|
||||
exclude = ./.*,build,dist,rally-jobs/plugins
|
||||
# flake8-import-order configurations
|
||||
import-order-style = pep8
|
||||
application-import-names = midonet
|
||||
# REVISIT(yamamoto): The pep8 style ignores application-package-names.
|
||||
# Right now this is only for documentation purpose.
|
||||
# https://github.com/PyCQA/flake8-import-order/pull/108
|
||||
application-package-names = neutron,neutronclient,networking_l2gw,neutron_fwaas,neutron_lbaas,neutron_vpnaas,neutron_taas,neutron_dynamic_routing
|
||||
|
||||
[hacking]
|
||||
import_exceptions = midonet.neutron._i18n
|
||||
|
|
Loading…
Reference in New Issue