diff --git a/test-requirements.txt b/test-requirements.txt index 9ba63d75..91375e83 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,6 +6,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 sphinx>=1.6.2 # BSD diff --git a/tox.ini b/tox.ini index 518a0aec..54b3b4b3 100644 --- a/tox.ini +++ b/tox.ini @@ -88,6 +88,7 @@ ignore = N530,E125,E129,N531 show-source = true builtins = _ exclude = build,dist +import-order-style = pep8 [hacking] import_exceptions = vmware_nsxlib._i18n, diff --git a/vmware_nsxlib/tests/unit/v3/nsxlib_testcase.py b/vmware_nsxlib/tests/unit/v3/nsxlib_testcase.py index 394acdb7..76f4a828 100644 --- a/vmware_nsxlib/tests/unit/v3/nsxlib_testcase.py +++ b/vmware_nsxlib/tests/unit/v3/nsxlib_testcase.py @@ -14,9 +14,9 @@ # limitations under the License. # import copy -import mock import unittest +import mock from oslo_serialization import jsonutils from oslo_utils import uuidutils from requests import exceptions as requests_exceptions diff --git a/vmware_nsxlib/tests/unit/v3/test_client.py b/vmware_nsxlib/tests/unit/v3/test_client.py index f132d859..9c35c0f7 100644 --- a/vmware_nsxlib/tests/unit/v3/test_client.py +++ b/vmware_nsxlib/tests/unit/v3/test_client.py @@ -14,10 +14,10 @@ # under the License. # import copy -import requests from oslo_log import log from oslo_serialization import jsonutils +import requests from vmware_nsxlib.tests.unit.v3 import mocks from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase diff --git a/vmware_nsxlib/tests/unit/v3/test_cluster.py b/vmware_nsxlib/tests/unit/v3/test_cluster.py index 0c30cba6..342180a4 100644 --- a/vmware_nsxlib/tests/unit/v3/test_cluster.py +++ b/vmware_nsxlib/tests/unit/v3/test_cluster.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -import mock -import six.moves.urllib.parse as urlparse import unittest +import mock from oslo_serialization import jsonutils from requests import exceptions as requests_exceptions +import six.moves.urllib.parse as urlparse from vmware_nsxlib.tests.unit.v3 import mocks from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase diff --git a/vmware_nsxlib/tests/unit/v3/test_policy_resources.py b/vmware_nsxlib/tests/unit/v3/test_policy_resources.py index df8516c3..96532abf 100644 --- a/vmware_nsxlib/tests/unit/v3/test_policy_resources.py +++ b/vmware_nsxlib/tests/unit/v3/test_policy_resources.py @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. # -import mock import unittest +import mock + from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib import v3 from vmware_nsxlib.v3 import policy_constants diff --git a/vmware_nsxlib/tests/unit/v3/test_qos_switching_profile.py b/vmware_nsxlib/tests/unit/v3/test_qos_switching_profile.py index fdfec45a..a0fe17ee 100644 --- a/vmware_nsxlib/tests/unit/v3/test_qos_switching_profile.py +++ b/vmware_nsxlib/tests/unit/v3/test_qos_switching_profile.py @@ -14,8 +14,8 @@ # limitations under the License. # import copy -import mock +import mock from oslo_log import log from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase diff --git a/vmware_nsxlib/v3/__init__.py b/vmware_nsxlib/v3/__init__.py index 112984b0..08808cbf 100644 --- a/vmware_nsxlib/v3/__init__.py +++ b/vmware_nsxlib/v3/__init__.py @@ -14,10 +14,10 @@ # under the License. import abc -import six - from distutils import version + from oslo_log import log +import six from vmware_nsxlib._i18n import _ from vmware_nsxlib.v3 import client diff --git a/vmware_nsxlib/v3/client.py b/vmware_nsxlib/v3/client.py index 45e51cb7..7dd0c87e 100644 --- a/vmware_nsxlib/v3/client.py +++ b/vmware_nsxlib/v3/client.py @@ -14,12 +14,12 @@ # under the License. # import re -import requests -import six.moves.urllib.parse as urlparse import time from oslo_log import log from oslo_serialization import jsonutils +import requests +import six.moves.urllib.parse as urlparse from vmware_nsxlib._i18n import _ from vmware_nsxlib.v3 import exceptions from vmware_nsxlib.v3 import utils diff --git a/vmware_nsxlib/v3/client_cert.py b/vmware_nsxlib/v3/client_cert.py index c46e6ab2..b722acf6 100644 --- a/vmware_nsxlib/v3/client_cert.py +++ b/vmware_nsxlib/v3/client_cert.py @@ -14,11 +14,11 @@ # under the License. import datetime -from OpenSSL import crypto from time import time import uuid from neutron_lib import exceptions +from OpenSSL import crypto from oslo_log import log from vmware_nsxlib._i18n import _ diff --git a/vmware_nsxlib/v3/cluster.py b/vmware_nsxlib/v3/cluster.py index a6e664c5..6de60c69 100644 --- a/vmware_nsxlib/v3/cluster.py +++ b/vmware_nsxlib/v3/cluster.py @@ -17,20 +17,21 @@ import abc import contextlib import copy import datetime -import eventlet import itertools import logging + +import eventlet +from eventlet import greenpool +from eventlet import pools import OpenSSL +from oslo_log import log +from oslo_service import loopingcall import requests +from requests import adapters +from requests import exceptions as requests_exceptions import six import six.moves.urllib.parse as urlparse -from eventlet import greenpool -from eventlet import pools -from oslo_log import log -from oslo_service import loopingcall -from requests import adapters -from requests import exceptions as requests_exceptions from vmware_nsxlib._i18n import _ from vmware_nsxlib.v3 import client as nsx_client from vmware_nsxlib.v3 import exceptions diff --git a/vmware_nsxlib/v3/policy_defs.py b/vmware_nsxlib/v3/policy_defs.py index a3afa311..8d74baa0 100644 --- a/vmware_nsxlib/v3/policy_defs.py +++ b/vmware_nsxlib/v3/policy_defs.py @@ -15,6 +15,7 @@ # import abc + import six from vmware_nsxlib.v3 import policy_constants diff --git a/vmware_nsxlib/v3/policy_resources.py b/vmware_nsxlib/v3/policy_resources.py index 5510db46..b20c41eb 100644 --- a/vmware_nsxlib/v3/policy_resources.py +++ b/vmware_nsxlib/v3/policy_resources.py @@ -15,10 +15,10 @@ # import abc -import six import uuid from oslo_log import log as logging +import six from vmware_nsxlib._i18n import _ from vmware_nsxlib.v3 import exceptions diff --git a/vmware_nsxlib/v3/utils.py b/vmware_nsxlib/v3/utils.py index 15373e88..d1cc221a 100644 --- a/vmware_nsxlib/v3/utils.py +++ b/vmware_nsxlib/v3/utils.py @@ -14,10 +14,10 @@ # under the License. import abc -import tenacity from neutron_lib import exceptions from oslo_log import log +import tenacity from vmware_nsxlib._i18n import _ from vmware_nsxlib.v3 import exceptions as nsxlib_exceptions