Merge "Use flake8-import-order plugin"

This commit is contained in:
Jenkins 2017-09-20 21:47:10 +00:00 committed by Gerrit Code Review
commit 1421d451ee
19 changed files with 20 additions and 18 deletions

View File

@ -12,12 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.
import ipaddress
import os
import re
import socket
import subprocess
import ipaddress
import netifaces
import pyroute2
import six

View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import ipaddress
import logging
import os
import platform
@ -19,7 +20,6 @@ import shutil
import stat
import subprocess
import ipaddress
import jinja2
from oslo_config import cfg
import six

View File

@ -13,13 +13,13 @@
# License for the specific language governing permissions and limitations
# under the License.
import ipaddress
import logging
import os
import socket
import stat
import subprocess
import ipaddress
import jinja2
import netifaces
from oslo_config import cfg

View File

@ -12,15 +12,14 @@
# 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 functools
import hashlib
import simplejson
import time
import warnings
from oslo_log import log as logging
import requests
import simplejson
import six
from stevedore import driver as stevedore_driver

View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from concurrent import futures
import socket
from concurrent import futures
from oslo_config import cfg
from oslo_log import log as logging

View File

@ -18,10 +18,10 @@ Common classes for Barbican certificate handling
"""
import abc
import six
from barbicanclient import client as barbican_client
from oslo_utils import encodeutils
import six
from octavia.certificates.common import cert
from octavia.common.tls_utils import cert_parser

View File

@ -14,6 +14,7 @@
#
import concurrent.futures
from oslo_config import cfg
from taskflow import engines as tf_engines

View File

@ -15,8 +15,8 @@
# under the License.
import re
import six
import six
from sqlalchemy.orm import collections
from octavia.common import constants

View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from concurrent import futures
import time
from concurrent import futures
from oslo_config import cfg
from oslo_db import exception as db_exc
from oslo_log import log as logging

View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from concurrent import futures
import datetime
from concurrent import futures
from oslo_config import cfg
from oslo_log import log as logging
from sqlalchemy.orm import exc as sqlalchemy_exceptions

View File

@ -13,6 +13,7 @@
# under the License.
from __future__ import with_statement
from logging import config as logging_config
import sys

View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import ipaddress
import time
from neutronclient.common import exceptions as neutron_client_exceptions
@ -28,9 +29,6 @@ from octavia.network import data_models as n_data_models
from octavia.network.drivers.neutron import base as neutron_base
from octavia.network.drivers.neutron import utils
import ipaddress
LOG = logging.getLogger(__name__)
AAP_EXT_ALIAS = 'allowed-address-pairs'
VIP_SECURITY_GRP_PREFIX = 'lb-'

View File

@ -13,9 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
import random
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

View File

@ -12,9 +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.
import mock
import random
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

View File

@ -12,11 +12,11 @@
# License for the specific language governing permissions and limitations
# under the License.
import subprocess
import flask
import mock
import subprocess
from octavia.amphorae.backends.agent.api_server import keepalived
import octavia.tests.unit.base as base

View File

@ -12,12 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.
import six
import uuid
from barbicanclient import containers
from barbicanclient import secrets
import mock
import six
import octavia.certificates.common.barbican as barbican_common
import octavia.certificates.common.cert as cert

View File

@ -14,6 +14,7 @@
#
import concurrent.futures
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

View File

@ -4,6 +4,7 @@
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
requests-mock>=1.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
flake8-import-order==0.12 # LGPLv3
mock>=2.0.0 # BSD
python-subunit>=0.0.18 # Apache-2.0/BSD
os-api-ref>=1.4.0 # Apache-2.0

View File

@ -114,6 +114,7 @@ ignore =
show-source = true
builtins = _
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build
import-order-style = pep8
# [H904] Delay string interpolations at logging calls.
enable-extensions=H904