diff --git a/neutron_dynamic_routing/__init__.py b/neutron_dynamic_routing/__init__.py index fa7a241e..208ffbf1 100644 --- a/neutron_dynamic_routing/__init__.py +++ b/neutron_dynamic_routing/__init__.py @@ -14,6 +14,7 @@ # under the License. import gettext + import six diff --git a/neutron_dynamic_routing/db/bgp_db.py b/neutron_dynamic_routing/db/bgp_db.py index c097d110..a4498d93 100644 --- a/neutron_dynamic_routing/db/bgp_db.py +++ b/neutron_dynamic_routing/db/bgp_db.py @@ -13,21 +13,9 @@ # under the License. import itertools + import netaddr -from oslo_db import exception as oslo_db_exc -from oslo_utils import uuidutils -import sqlalchemy as sa -from sqlalchemy import and_ -from sqlalchemy import orm -from sqlalchemy.orm import aliased -from sqlalchemy.orm import exc as sa_exc - -from neutron_lib.api import validators -from neutron_lib import constants as lib_consts -from neutron_lib.db import model_base -from neutron_lib import exceptions as n_exc - from neutron.db import api as db_api from neutron.db import common_db_mixin as common_db from neutron.db import l3_dvr_db @@ -38,6 +26,18 @@ from neutron.db import models_v2 from neutron.extensions import l3 as l3_ext from neutron.plugins.ml2 import models as ml2_models +from neutron_lib.api import validators +from neutron_lib import constants as lib_consts +from neutron_lib.db import model_base +from neutron_lib import exceptions as n_exc +from oslo_db import exception as oslo_db_exc +from oslo_utils import uuidutils +import sqlalchemy as sa +from sqlalchemy import and_ +from sqlalchemy import orm +from sqlalchemy.orm import aliased +from sqlalchemy.orm import exc as sa_exc + from neutron_dynamic_routing._i18n import _ from neutron_dynamic_routing.extensions import bgp as bgp_ext diff --git a/neutron_dynamic_routing/extensions/bgp_dragentscheduler.py b/neutron_dynamic_routing/extensions/bgp_dragentscheduler.py index 52e42b48..bae4c65d 100644 --- a/neutron_dynamic_routing/extensions/bgp_dragentscheduler.py +++ b/neutron_dynamic_routing/extensions/bgp_dragentscheduler.py @@ -14,19 +14,18 @@ # under the License. import abc -import six -import webob - -from neutron_lib.api import extensions as api_extensions -from neutron_lib import exceptions as n_exc -from neutron_lib.plugins import directory -from oslo_log import log as logging from neutron.api import extensions from neutron.api.v2 import base from neutron.api.v2 import resource from neutron.extensions import agent from neutron import wsgi +from neutron_lib.api import extensions as api_extensions +from neutron_lib import exceptions as n_exc +from neutron_lib.plugins import directory +from oslo_log import log as logging +import six +import webob from neutron_dynamic_routing._i18n import _, _LE from neutron_dynamic_routing.extensions import bgp as bgp_ext diff --git a/neutron_dynamic_routing/services/bgp/agent/driver/base.py b/neutron_dynamic_routing/services/bgp/agent/driver/base.py index 128651b7..d8e0c552 100644 --- a/neutron_dynamic_routing/services/bgp/agent/driver/base.py +++ b/neutron_dynamic_routing/services/bgp/agent/driver/base.py @@ -14,6 +14,7 @@ # limitations under the License. import abc + import six diff --git a/neutron_dynamic_routing/tests/unit/db/test_bgp_db.py b/neutron_dynamic_routing/tests/unit/db/test_bgp_db.py index 3696b7ad..c337a754 100644 --- a/neutron_dynamic_routing/tests/unit/db/test_bgp_db.py +++ b/neutron_dynamic_routing/tests/unit/db/test_bgp_db.py @@ -13,22 +13,21 @@ # under the License. import contextlib + import mock import netaddr -from oslo_config import cfg - +from neutron.db import l3_dvr_ha_scheduler_db +from neutron.extensions import external_net +from neutron.tests.unit.extensions import test_l3 +from neutron.tests.unit.plugins.ml2 import test_plugin 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 import constants as plugin_constants from neutron_lib.plugins import directory +from oslo_config import cfg from oslo_utils import uuidutils -from neutron.db import l3_dvr_ha_scheduler_db -from neutron.extensions import external_net -from neutron.tests.unit.extensions import test_l3 -from neutron.tests.unit.plugins.ml2 import test_plugin - from neutron_dynamic_routing.extensions import bgp from neutron_dynamic_routing.services.bgp import bgp_plugin diff --git a/test-requirements.txt b/test-requirements.txt index 4373a612..59641c97 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,6 +5,7 @@ hacking<0.12,>=0.11.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD +flake8-import-order==0.12 # LGPLv3 mock>=2.0 # BSD python-subunit>=0.0.18 # Apache-2.0/BSD requests-mock>=1.1 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 80e0067a..8a9f6c13 100644 --- a/tox.ini +++ b/tox.ini @@ -82,6 +82,7 @@ commands = python setup.py build_sphinx ignore = E125,E126,E128,E129,E265,H404,H405,N530,N537 show-source = true exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,.ropeproject,rally-scenarios +import-order-style = pep8 [testenv:pylint] deps =