Merge "Use flake8-import-order plugin"

devstack/tools/nsxv3_cleanup.py

@@ -15,11 +15,11 @@
 
 import base64
 import optparse
-import requests
-import sqlalchemy as sa
 
 from oslo_serialization import jsonutils
+import requests
 import six.moves.urllib.parse as urlparse
+import sqlalchemy as sa
 from vmware_nsx.db import nsx_models
 
 

devstack/tools/nsxv_cleanup.py

@@ -51,12 +51,12 @@ Tong Liu <tongl@vmware.com>
 
 import base64
 import optparse
-import requests
-import sqlalchemy as sa
 import sys
 
-
 from oslo_serialization import jsonutils
+import requests
+import sqlalchemy as sa
+
 from vmware_nsx.db import nsx_models
 from vmware_nsx.db import nsxv_models
 

devstack/tools/nsxv_edge_resources.py

@@ -25,11 +25,11 @@ Usage:
 
 import base64
 import optparse
+import xml.etree.ElementTree as et
 
 from oslo_serialization import jsonutils
 import requests
 import six
-import xml.etree.ElementTree as et
 
 requests.packages.urllib3.disable_warnings()
 

devstack/tools/nsxv_fw_autodraft_setting.py

@@ -27,9 +27,9 @@ Usage:
 
 import base64
 import optparse
-import requests
 
 from oslo_serialization import jsonutils
+import requests
 
 requests.packages.urllib3.disable_warnings()
 

test-requirements.txt

@@ -5,6 +5,7 @@ hacking!=0.13.0,<0.14,>=0.12.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.1,>=1.5.1 # BSD

tox.ini

@@ -102,6 +102,7 @@ ignore = E125,E126,E128,E129,E265,H305,H307,H404,H405,H904,N530,N531
 show-source = true
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject
+import-order-style = pep8
 
 [hacking]
 import_exceptions = vmware_nsx._i18n,

vmware_nsx/common/utils.py

@@ -16,11 +16,11 @@
 from distutils import version
 import functools
 import hashlib
+import xml.etree.ElementTree as et
 
 import eventlet
 import six
 import tenacity
-import xml.etree.ElementTree as et
 
 from neutron import version as n_version
 from neutron_lib.api import validators

vmware_nsx/plugins/nsx_v/md_proxy.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import eventlet
 import hashlib
 import hmac
 
+import eventlet
 import netaddr
 from neutron_lib import constants
 from neutron_lib import context as neutron_context

vmware_nsx/plugins/nsx_v/plugin.py

@@ -14,16 +14,20 @@
 #    under the License.
 
 from distutils import version
-import six
 import uuid
 
 import netaddr
+from neutron_lib.api.definitions import extra_dhcp_opt as ext_edo
 from neutron_lib.api.definitions import network as net_def
 from neutron_lib.api.definitions import port as port_def
 from neutron_lib.api.definitions import port_security as psec
+from neutron_lib.api.definitions import portbindings as pbin
 from neutron_lib.api.definitions import provider_net as pnet
 from neutron_lib.api.definitions import subnet as subnet_def
 from neutron_lib.api import validators
+from neutron_lib.callbacks import events
+from neutron_lib.callbacks import registry
+from neutron_lib.callbacks import resources
 from neutron_lib import constants
 from neutron_lib import context as n_context
 from neutron_lib.db import constants as db_const
@@ -37,6 +41,7 @@ from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import netutils
 from oslo_utils import uuidutils
+import six
 from sqlalchemy.orm import exc as sa_exc
 
 from neutron.api import extensions as neutron_extensions
@@ -79,11 +84,6 @@ from neutron.plugins.common import utils
 from neutron.quota import resource_registry
 from neutron.services.flavors import flavors_plugin
 from neutron.services.qos import qos_consts
-from neutron_lib.api.definitions import extra_dhcp_opt as ext_edo
-from neutron_lib.api.definitions import portbindings as pbin
-from neutron_lib.callbacks import events
-from neutron_lib.callbacks import registry
-from neutron_lib.callbacks import resources
 from vmware_nsx.dvs import dvs
 from vmware_nsx.services.qos.common import utils as qos_com_utils
 from vmware_nsx.services.qos.nsx_v import driver as qos_driver

vmware_nsx/plugins/nsx_v/vshield/common/VcnsApiClient.py

@@ -13,11 +13,11 @@
 #    under the License.
 
 import base64
+import xml.etree.ElementTree as et
 
 from oslo_serialization import jsonutils
 import requests
 import six
-import xml.etree.ElementTree as et
 
 from vmware_nsx.plugins.nsx_v.vshield.common import exceptions
 

vmware_nsx/plugins/nsx_v/vshield/edge_utils.py

@@ -14,29 +14,27 @@
 #    under the License.
 
 from distutils import version
-import eventlet
-import netaddr
 import os
 import random
-import six
-from sqlalchemy import exc as db_base_exc
 import time
 
+import eventlet
+import netaddr
+from neutron.extensions import l3
+from neutron_lib.api.definitions import extra_dhcp_opt as ext_edo
+from neutron_lib.api import validators
+from neutron_lib import constants
 from neutron_lib import context as q_context
+from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
+import six
 from six import moves
-
-from neutron.extensions import l3
-
-from neutron_lib.api.definitions import extra_dhcp_opt as ext_edo
-from neutron_lib.api import validators
-from neutron_lib import constants
-from neutron_lib import exceptions as n_exc
+from sqlalchemy import exc as db_base_exc
 
 from vmware_nsx._i18n import _
 from vmware_nsx.common import config as conf

vmware_nsx/plugins/nsx_v/vshield/vcns.py

@@ -13,13 +13,13 @@
 #    under the License.
 
 import time
+import xml.etree.ElementTree as et
 
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import six
-import xml.etree.ElementTree as et
 
 from vmware_nsx.common import nsxv_constants
 from vmware_nsx.common import utils

vmware_nsx/plugins/nsx_v3/cert_utils.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import base64
-from cryptography import fernet
 import hashlib
 
+from cryptography import fernet
 from oslo_config import cfg
 from oslo_log import log as logging
 

vmware_nsx/services/ipam/common/driver.py

@@ -15,7 +15,6 @@
 #    under the License.
 
 import abc
-import six
 
 from neutron.ipam import driver as ipam_base
 from neutron.ipam.drivers.neutrondb_ipam import driver as neutron_driver
@@ -23,6 +22,7 @@ from neutron.ipam import exceptions as ipam_exc
 from neutron.ipam import requests as ipam_req
 from neutron.ipam import subnet_alloc
 from neutron_lib.plugins import directory
+import six
 
 from vmware_nsx.db import db as nsx_db
 

vmware_nsx/services/ipam/nsx_v/driver.py

@@ -14,17 +14,16 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import netaddr
 import xml.etree.ElementTree as et
 
-from oslo_log import log as logging
-
+import netaddr
 from neutron.extensions import external_net as ext_net_extn
 from neutron.extensions import multiprovidernet as mpnet
 from neutron.ipam import exceptions as ipam_exc
 from neutron.ipam import requests as ipam_req
 from neutron_lib.api.definitions import provider_net as pnet
 from neutron_lib.api import validators
+from oslo_log import log as logging
 
 from vmware_nsx._i18n import _
 from vmware_nsx.plugins.nsx_v.vshield.common import constants

vmware_nsx/shell/admin/plugins/common/utils.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 import sys
 
+import six
 from vmware_nsx._i18n import _
 from vmware_nsx.shell import resources as nsxadmin
 

vmware_nsx/shell/admin/plugins/nsxv/resources/networks.py

@@ -12,13 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_log import log as logging
-from oslo_serialization import jsonutils
 import re
 import xml.etree.ElementTree as et
 
 from neutron_lib.callbacks import registry
 from neutron_lib import context
+from oslo_log import log as logging
+from oslo_serialization import jsonutils
 
 from vmware_nsx.db import db as nsx_db
 from vmware_nsx.plugins.nsx_v.vshield.common import exceptions

vmware_nsx/shell/nsx_instance_if_migrate.py

@@ -14,7 +14,6 @@
 #    under the License.
 
 import getopt
-import libvirt
 import logging
 import re
 import sys
@@ -22,6 +21,7 @@ import xml.etree.ElementTree as et
 
 from keystoneauth1 import identity
 from keystoneauth1 import session
+import libvirt
 from neutronclient.v2_0 import client
 import nova.conf
 

vmware_nsx/shell/nsxadmin.py

@@ -24,19 +24,17 @@ TODO: Add support for other resources, ports, logical switches etc.
 TODO: Autocomplete command line args
 """
 
-import requests
 import sys
 
 from neutron.common import config as neutron_config
 from neutron.conf import common as neutron_common_config
 from neutron_lib.callbacks import registry
-
-from vmware_nsx.common import config  # noqa
-
 from oslo_config import cfg
 from oslo_log import _options
 from oslo_log import log as logging
+import requests
 
+from vmware_nsx.common import config  # noqa
 from vmware_nsx.shell.admin.plugins.common import constants
 from vmware_nsx.shell.admin import version
 from vmware_nsx.shell import resources

vmware_nsx/tests/unit/__init__.py

@@ -14,11 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import eventlet
-import mock
 import os
 import time
 
+import eventlet
+import mock
+
 from vmware_nsx.api_client import client as nsx_client
 from vmware_nsx.api_client import eventlet_client
 from vmware_nsx import extensions

vmware_nsx/tests/unit/extensions/test_networkgw.py

@@ -13,12 +13,8 @@
 #    under the License.
 
 import contextlib
+
 import mock
-
-from oslo_config import cfg
-from webob import exc
-import webtest
-
 from neutron.api import extensions
 from neutron.api.v2 import attributes
 from neutron.db import api as db_api
@@ -31,6 +27,9 @@ from neutron.tests.unit.db import test_db_base_plugin_v2 as test_db_plugin
 from neutron_lib import context
 from neutron_lib.plugins import constants
 from neutron_lib.plugins import directory
+from oslo_config import cfg
+from webob import exc
+import webtest
 
 from vmware_nsx.api_client import exception as api_exc
 from vmware_nsx.common import exceptions as nsx_exc

vmware_nsx/tests/unit/nsx_v/test_fwaas_driver.py

@@ -14,10 +14,10 @@
 #    under the License.
 
 import copy
-import mock
-from oslo_utils import uuidutils
 
+import mock
 from neutron_fwaas.extensions import firewall as exceptions
+from oslo_utils import uuidutils
 
 from vmware_nsx.services.fwaas.nsx_v import edge_fwaas_driver
 from vmware_nsx.tests.unit.nsx_v import test_plugin as test_v_plugin

vmware_nsx/tests/unit/nsx_v/test_plugin.py

@@ -15,10 +15,10 @@
 
 import contextlib
 import copy
+
 from eventlet import greenthread
 import mock
 import netaddr
-
 from neutron.api.v2 import attributes
 from neutron.extensions import address_scope
 from neutron.extensions import allowedaddresspairs as addr_pair

vmware_nsx/tests/unit/nsx_v/vshield/fake_vcns.py

@@ -13,12 +13,12 @@
 #    under the License.
 
 import copy
-import netaddr
+import xml.etree.ElementTree as ET
 
+import netaddr
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils
 import six
-import xml.etree.ElementTree as ET
 
 from vmware_nsx._i18n import _
 from vmware_nsx.plugins.nsx_v.vshield.common import constants

vmware_nsx/tests/unit/nsx_v3/test_client_cert.py

@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import os
 import unittest
 
+import mock
 from oslo_config import cfg
 
 from vmware_nsx.common import exceptions as nsx_exc

vmware_nsx/tests/unit/nsx_v3/test_fwaas_driver.py

@@ -14,11 +14,12 @@
 #    under the License.
 
 import copy
+
 import mock
+from vmware_nsxlib.v3 import nsx_constants as consts
 
 from vmware_nsx.services.fwaas.nsx_v3 import edge_fwaas_driver
 from vmware_nsx.tests.unit.nsx_v3 import test_plugin as test_v3_plugin
-from vmware_nsxlib.v3 import nsx_constants as consts
 
 FAKE_FW_ID = 'fake_fw_uuid'
 FAKE_ROUTER_ID = 'fake_rtr_uuid'

vmware_nsx/tests/unit/nsxlib/mh/test_switch.py

@@ -15,8 +15,8 @@
 #
 
 import hashlib
-import mock
 
+import mock
 from neutron.tests.unit.api.v2 import test_base
 from neutron_lib import constants
 from neutron_lib import exceptions

vmware_nsx/tests/unit/osc/v2/test_port.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import re
 
+import mock
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 from openstackclient.tests.unit.network.v2 import test_port
 from openstackclient.tests.unit import utils as tests_utils

vmware_nsx/tests/unit/osc/v2/test_router.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import re
 
+import mock
 from openstackclient.tests.unit.network.v2 import test_router
 from openstackclient.tests.unit import utils as tests_utils
 

vmware_nsx/tests/unit/osc/v2/test_security_group.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import re
 
+import mock
 from openstackclient.tests.unit.network.v2 import (
     test_security_group_network as test_security_group)
 from openstackclient.tests.unit import utils as tests_utils

vmware_nsx/tests/unit/osc/v2/test_subnet.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import re
 
+import mock
 from openstackclient.tests.unit.network.v2 import test_subnet
 from openstackclient.tests.unit import utils as tests_utils
 

vmware_nsx/tests/unit/services/dynamic_routing/test_nsxv_bgp_driver.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import contextlib
-import mock
 
+import mock
 from neutron.api import extensions
 from neutron.extensions import address_scope
 from neutron_dynamic_routing.db import bgp_db  # noqa

vmware_nsx/tests/unit/services/qos/test_nsxv_notification.py

@@ -13,18 +13,17 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import copy
+
 import mock
-
-from neutron_lib import context
-from oslo_config import cfg
-from oslo_utils import uuidutils
-
 from neutron.objects.qos import policy as policy_object
 from neutron.objects.qos import rule as rule_object
 from neutron.services.qos import qos_consts
 from neutron.services.qos import qos_plugin
 from neutron.tests.unit.services.qos import base
+from neutron_lib import context
 from neutron_lib.plugins import directory
+from oslo_config import cfg
+from oslo_utils import uuidutils
 
 from vmware_nsx.dvs import dvs
 from vmware_nsx.dvs import dvs_utils

vmware_nsx/tests/unit/shell/test_admin_utils.py

@@ -14,19 +14,19 @@
 #    under the License.
 
 import abc
+
 import mock
-import six
-
-from oslo_config import cfg
-from oslo_log import _options
-from oslo_log import log as logging
-from oslo_utils import uuidutils
-
 from neutron.common import config as neutron_config
 from neutron.db import servicetype_db  # noqa
 from neutron.quota import resource_registry
 from neutron.tests import base
 from neutron_lib.callbacks import registry
+from oslo_config import cfg
+from oslo_log import _options
+from oslo_log import log as logging
+from oslo_utils import uuidutils
+import six
+from vmware_nsxlib.v3 import resources as nsx_v3_resources
 
 from vmware_nsx._i18n import _
 from vmware_nsx.common import config  # noqa
@@ -38,7 +38,6 @@ from vmware_nsx.shell import resources
 from vmware_nsx.tests import unit as vmware
 from vmware_nsx.tests.unit.nsx_v import test_plugin as test_v_plugin
 from vmware_nsx.tests.unit.nsx_v3 import test_plugin as test_v3_plugin
-from vmware_nsxlib.v3 import resources as nsx_v3_resources
 
 LOG = logging.getLogger(__name__)
 NSX_INI_PATH = vmware.get_fake_conf('nsx.ini.test')

vmware_nsx_tempest/services/nsxv3_client.py

@@ -14,11 +14,11 @@
 #    under the License.
 
 import base64
+from copy import deepcopy
+
 import requests
 import six.moves.urllib.parse as urlparse
 
-from copy import deepcopy
-
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 

vmware_nsx_tempest/services/nsxv_client.py

@@ -11,12 +11,11 @@
 #    under the License.
 
 import base64
+import re
 
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
-import re
 import requests
-
 from tempest import config
 
 import vmware_nsx_tempest.services.utils as utils

vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py

@@ -14,15 +14,15 @@
 #    under the License.
 
 import re
-import six
 
+import base_provider as base
+import six
+from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
-
-import base_provider as base
-from tempest import config
 from tempest import test
+
 from vmware_nsx_tempest.services import nsxv_client
 
 CONF = config.CONF

vmware_nsx_tempest/tests/nsxv/api/test_provider_sec_group.py

@@ -12,10 +12,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-
-from oslo_log import log as logging
 import re
 
+from oslo_log import log as logging
 from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils

vmware_nsx_tempest/tests/nsxv/api/test_tenant_delete.py

@@ -14,17 +14,16 @@
 #    under the License.
 
 import os
-from oslo_log import log as logging
-import six
 import subprocess
 
+import base_provider as base
+from oslo_log import log as logging
+import six
 from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 
-import base_provider as base
-
 CONF = config.CONF
 LOG = logging.getLogger(__name__)
 

vmware_nsx_tempest/tests/nsxv/api/test_v1_fwaas.py

@@ -13,10 +13,10 @@
 #    under the License.
 
 import re
-import six
 import time
 
 from neutron_lib import constants as nl_constants
+import six
 from tempest.api.network import base
 from tempest import config
 from tempest.lib.common.utils import data_utils

vmware_nsx_tempest/tests/nsxv/scenario/test_admin_policy_basic_ops.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 import time
 
+import six
 from tempest.common import waiters
 from tempest import config
 from tempest.lib.common.utils import data_utils

vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py

@@ -14,13 +14,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import netaddr
 import re
 import socket
 import struct
 import sys
 import time
 
+import netaddr
 from tempest.common.utils.linux import remote_client
 from tempest import config
 from tempest.lib.common.utils import data_utils

vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_round_robin_ops.py

@@ -11,7 +11,6 @@
 #    under the License.
 import tempfile
 import time
-import urllib3
 
 from tempest.common import waiters
 from tempest import config
@@ -19,6 +18,7 @@ from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 from tempest import test
+import urllib3
 
 from vmware_nsx_tempest.services.lbaas import health_monitors_client
 from vmware_nsx_tempest.services.lbaas import listeners_client

vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py

@@ -14,8 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import re
-import six
 
+import six
 from tempest.common import waiters
 from tempest import config
 from tempest.lib.common.utils import data_utils

vmware_nsx_tempest/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py

@@ -11,11 +11,11 @@
 #    under the License.
 
 import os
-import paramiko
 import re
 import time
 
 from neutron_lib import constants as nl_constants
+import paramiko
 from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils

vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py

@@ -14,12 +14,12 @@
 #    under the License.
 
 import shlex
-import six
 import subprocess
 import tempfile
 import time
 import urllib2
 
+import six
 from tempest import config
 from tempest import exceptions
 from tempest.lib.common.utils import data_utils

vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py

@@ -14,10 +14,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_log import log as logging
-import six
 import time
 
+from oslo_log import log as logging
+import six
 from tempest.api.network import base_security_groups as base
 from tempest import config
 from tempest.lib.common.utils import data_utils

vmware_nsx_tempest/tests/nsxv3/scenario/test_allowed_address_pair.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import collections
-from oslo_log import log as logging
 import time
 
+from oslo_log import log as logging
 from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils