Merge "Use flake8-import-order plugin"
This commit is contained in:
commit
1421d451ee
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#
|
||||
|
||||
import concurrent.futures
|
||||
|
||||
from oslo_config import cfg
|
||||
from taskflow import engines as tf_engines
|
||||
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
# under the License.
|
||||
|
||||
import re
|
||||
import six
|
||||
|
||||
import six
|
||||
from sqlalchemy.orm import collections
|
||||
|
||||
from octavia.common import constants
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# under the License.
|
||||
|
||||
from __future__ import with_statement
|
||||
|
||||
from logging import config as logging_config
|
||||
import sys
|
||||
|
||||
|
|
|
@ -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-'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#
|
||||
|
||||
import concurrent.futures
|
||||
|
||||
import mock
|
||||
from oslo_config import cfg
|
||||
from oslo_config import fixture as oslo_fixture
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue