From 7fdc8a1e0690a075bd9dd979a363d23becac4adf Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Wed, 8 Mar 2017 11:29:15 -0800
Subject: [PATCH] Update for new pep8 rules E402 and W503

Change-Id: I181f396b002d0c3b89579c4fc33c34b1c099953e
---
 api-ref/source/conf.py                        |  2 +-
 .../backends/agent/api_server/amphora_info.py |  4 ++--
 octavia/api/common/types.py                   |  4 ++--
 octavia/api/v1/controllers/listener.py        |  8 ++++----
 octavia/api/v1/controllers/load_balancer.py   |  6 +++---
 octavia/certificates/generator/anchor.py      |  4 ++--
 octavia/cmd/octavia_worker.py                 | 12 ++++++------
 octavia/common/data_models.py                 | 19 +++++++++----------
 octavia/common/validate.py                    |  4 ++--
 .../13500e2e978d_update_url_and_name_size.py  |  6 +++---
 .../versions/14892634e228_update_vip.py       |  6 +++---
 ...b9b_add_server_group_id_to_loadbalancer.py |  6 +++---
 ...044c_keepalived_configuration_datamodel.py |  8 ++++----
 ..._adding_terminate_https_tls_ref_support.py |  8 ++++----
 ...6852d5ff7c_add_lb_network_ip_to_amphora.py |  6 +++---
 ...add_amphora_vrrp_port_id_and_ha_port_id.py |  6 +++---
 .../versions/29ff921a6eb_shared_pools.py      |  6 +++---
 ...c_update_lb_and_amphora_data_model_for_.py |  8 ++++----
 .../versions/35dee79d5865_initial_create.py   |  8 ++++----
 .../versions/36b94648fef8_add_timestamp.py    |  6 +++---
 .../3a1e1cdb7b27_rename_amphora_host_id.py    |  6 +++---
 ...96_create_no_monitor_operational_status.py |  6 +++---
 ...a0bdb9_add_vrrp_ip_and_ha_ip_to_amphora.py |  6 +++---
 .../3f8ff3be828e_create_quotas_table.py       |  6 +++---
 ...87cd10fef_make_pool_lb_algorithm_larger.py |  6 +++---
 .../443fe6676637_add_network_id_to_vip.py     |  6 +++---
 ...dding_name_column_to_member_and_health_.py |  6 +++---
 .../458c9ee2a011_l7_policies_and_rules.py     |  8 ++++----
 ...48660b6643f0_add_new_states_for_amphora.py |  8 ++++----
 ...094013699a_update_load_balancer_amphora.py |  6 +++---
 .../versions/4d9cf7d32f2_insert_headers.py    |  6 +++---
 ...aaa983e7a9_update_member_address_column.py |  6 +++---
 .../4fe8240425b4_update_vip_add_subnet_id.py  |  6 +++---
 ...d_a_column_busy_in_table_amphora_health.py |  6 +++---
 ...cert_expiration__infor_in_amphora_table.py |  6 +++---
 ...2816c232310_fix_migration_for_mysql_5_7.py |  6 +++---
 .../6abb04f24c5_tenant_id_to_project_id.py    |  6 +++---
 .../82b9402e71fd_update_vip_address_size.py   |  6 +++---
 ..._change_tls_container_id_length_in_sni_.py |  6 +++---
 .../92fe9857279_create_healthmanager_table.py |  6 +++---
 ...6d6d_add_provisioning_status_to_objects.py |  6 +++---
 ...1292016060_add_request_errors_for_stats.py |  6 +++---
 octavia/tests/tempest/common/manager.py       |  9 +++++----
 .../agent/api_server/test_listener.py         |  8 ++++----
 releasenotes/source/conf.py                   |  2 +-
 tox.ini                                       |  2 +-
 46 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 05184fc736..b229559a09 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -27,6 +27,7 @@ import subprocess
 import sys
 import warnings
 
+from octavia.version import version_info
 import openstackdocstheme
 
 extensions = [
@@ -71,7 +72,6 @@ copyright = u'2017-present, OpenStack Foundation'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-from octavia.version import version_info
 # The full version, including alpha/beta/rc tags.
 release = version_info.release_string()
 # The short X.Y version.
diff --git a/octavia/amphorae/backends/agent/api_server/amphora_info.py b/octavia/amphorae/backends/agent/api_server/amphora_info.py
index b526995688..9d0bc84459 100644
--- a/octavia/amphorae/backends/agent/api_server/amphora_info.py
+++ b/octavia/amphorae/backends/agent/api_server/amphora_info.py
@@ -131,8 +131,8 @@ class AmphoraInfo(object):
             for interface in netns.get_links():
                 interface_name = None
                 for item in interface['attrs']:
-                    if (item[0] == 'IFLA_IFNAME'
-                            and not item[1].startswith('eth')):
+                    if (item[0] == 'IFLA_IFNAME' and
+                            not item[1].startswith('eth')):
                         break
                     elif item[0] == 'IFLA_IFNAME':
                         interface_name = item[1]
diff --git a/octavia/api/common/types.py b/octavia/api/common/types.py
index 7d034b7a88..c850114a95 100644
--- a/octavia/api/common/types.py
+++ b/octavia/api/common/types.py
@@ -115,8 +115,8 @@ class BaseType(wtypes.Base):
                 else:
                     continue
             attr_name = attr
-            if (hasattr(self, '_type_to_model_map')
-                    and attr in self._type_to_model_map):
+            if (hasattr(self, '_type_to_model_map') and
+                    attr in self._type_to_model_map):
                 renamed = self._type_to_model_map[attr]
                 if '.' in renamed:
                     parent, child = renamed.split('.')
diff --git a/octavia/api/v1/controllers/listener.py b/octavia/api/v1/controllers/listener.py
index 911cc05c90..6ec641ac22 100644
--- a/octavia/api/v1/controllers/listener.py
+++ b/octavia/api/v1/controllers/listener.py
@@ -111,10 +111,10 @@ class ListenersController(base.BaseController):
 
         Update the load balancer db when provisioning status changes.
         """
-        if (listener_dict
-            and listener_dict.get('insert_headers')
-            and list(set(listener_dict['insert_headers'].keys()) -
-                     set(constants.SUPPORTED_HTTP_HEADERS))):
+        if (listener_dict and
+            listener_dict.get('insert_headers') and
+            list(set(listener_dict['insert_headers'].keys()) -
+                 set(constants.SUPPORTED_HTTP_HEADERS))):
             raise exceptions.InvalidOption(
                 value=listener_dict.get('insert_headers'),
                 option='insert_headers')
diff --git a/octavia/api/v1/controllers/load_balancer.py b/octavia/api/v1/controllers/load_balancer.py
index 0fc2682521..87f9c1565c 100644
--- a/octavia/api/v1/controllers/load_balancer.py
+++ b/octavia/api/v1/controllers/load_balancer.py
@@ -138,9 +138,9 @@ class LoadBalancersController(base.BaseController):
 
         load_balancer.project_id = project_id
 
-        if not (load_balancer.vip.port_id
-                or load_balancer.vip.network_id
-                or load_balancer.vip.subnet_id):
+        if not (load_balancer.vip.port_id or
+                load_balancer.vip.network_id or
+                load_balancer.vip.subnet_id):
             raise exceptions.ValidationException(detail=_(
                 "VIP must contain one of: port_id, network_id, subnet_id."))
 
diff --git a/octavia/certificates/generator/anchor.py b/octavia/certificates/generator/anchor.py
index 82e0f4e33c..e3f5a13845 100644
--- a/octavia/certificates/generator/anchor.py
+++ b/octavia/certificates/generator/anchor.py
@@ -57,8 +57,8 @@ class AnchorCertGenerator(local.LocalCertGenerator):
 
             if r.status_code != 200:
                 LOG.debug('Anchor returned: %s', r.content)
-                raise AnchorException("Anchor returned Status Code : "
-                                      + str(r.status_code))
+                raise AnchorException("Anchor returned Status Code : " +
+                                      str(r.status_code))
 
             return r.content
 
diff --git a/octavia/cmd/octavia_worker.py b/octavia/cmd/octavia_worker.py
index 7aeee213e0..71c96c22b5 100644
--- a/octavia/cmd/octavia_worker.py
+++ b/octavia/cmd/octavia_worker.py
@@ -16,13 +16,13 @@ import sys
 
 import eventlet
 eventlet.monkey_patch()
-from oslo_config import cfg
-from oslo_reports import guru_meditation_report as gmr
-from oslo_service import service
+from oslo_config import cfg  # noqa: E402
+from oslo_reports import guru_meditation_report as gmr  # noqa: E402
+from oslo_service import service  # noqa: E402
 
-from octavia.common import service as octavia_service
-from octavia.controller.queue import consumer
-from octavia import version
+from octavia.common import service as octavia_service  # noqa: E402
+from octavia.controller.queue import consumer  # noqa: E402
+from octavia import version  # noqa: E402
 
 CONF = cfg.CONF
 
diff --git a/octavia/common/data_models.py b/octavia/common/data_models.py
index a8d362ee09..e66381dc53 100644
--- a/octavia/common/data_models.py
+++ b/octavia/common/data_models.py
@@ -589,10 +589,9 @@ class L7Policy(BaseDataModel):
                 self.redirect_url = None
                 pool = self._find_in_graph('Pool' + value)
                 self.redirect_pool = pool
-                if len(self.l7rules) > 0 and (self.enabled is True or
-                                              ('enabled' in update_dict.keys()
-                                               and update_dict['enabled']
-                                               is True)):
+                if len(self.l7rules) > 0 and (self.enabled is True or (
+                        'enabled' in update_dict.keys() and
+                        update_dict['enabled'] is True)):
                     if pool not in self.listener.pools:
                         self.listener.pools.append(pool)
                     if self.listener not in pool.listeners:
@@ -612,15 +611,15 @@ class L7Policy(BaseDataModel):
                 self.listener.l7policies.insert(value - 1, self)
             elif key == 'enabled':
                 if (value is True and self.action ==
-                        constants.L7POLICY_ACTION_REDIRECT_TO_POOL
-                        and self.redirect_pool is not None
-                        and len(self.l7rules) > 0
-                        and self.redirect_pool not in self.listener.pools):
+                        constants.L7POLICY_ACTION_REDIRECT_TO_POOL and
+                        self.redirect_pool is not None and
+                        len(self.l7rules) > 0 and
+                        self.redirect_pool not in self.listener.pools):
                     self.listener.pools.append(self.redirect_pool)
                     self.redirect_pool.listeners.append(self.listener)
                 elif (value is False and self.action ==
-                        constants.L7POLICY_ACTION_REDIRECT_TO_POOL
-                        and self.redirect_pool is not None):
+                        constants.L7POLICY_ACTION_REDIRECT_TO_POOL and
+                        self.redirect_pool is not None):
                     self._conditionally_remove_pool_links(
                         self.redirect_pool)
             setattr(self, key, value)
diff --git a/octavia/common/validate.py b/octavia/common/validate.py
index f13e3a0a63..5272f6229c 100644
--- a/octavia/common/validate.py
+++ b/octavia/common/validate.py
@@ -162,8 +162,8 @@ def sanitize_l7policy_api_args(l7policy, create=False):
             l7policy.update({'redirect_pool_id': None})
             l7policy.pop('redirect_pool', None)
         elif l7policy['action'] == constants.L7POLICY_ACTION_REDIRECT_TO_POOL:
-            if (not l7policy.get('redirect_pool_id')
-                    and not l7policy.get('redirect_pool')):
+            if (not l7policy.get('redirect_pool_id') and
+                    not l7policy.get('redirect_pool')):
                 raise exceptions.InvalidL7PolicyArgs(
                     msg='redirect_pool_id or redirect_pool must not be None')
             l7policy.update({'redirect_url': None})
diff --git a/octavia/db/migration/alembic_migrations/versions/13500e2e978d_update_url_and_name_size.py b/octavia/db/migration/alembic_migrations/versions/13500e2e978d_update_url_and_name_size.py
index 92d48bb9af..5686305475 100644
--- a/octavia/db/migration/alembic_migrations/versions/13500e2e978d_update_url_and_name_size.py
+++ b/octavia/db/migration/alembic_migrations/versions/13500e2e978d_update_url_and_name_size.py
@@ -20,13 +20,13 @@ Create Date: 2014-09-18 16:07:04.859812
 
 '''
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '13500e2e978d'
 down_revision = '4c094013699a'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.alter_column(u'provisioning_status', u'name',
diff --git a/octavia/db/migration/alembic_migrations/versions/14892634e228_update_vip.py b/octavia/db/migration/alembic_migrations/versions/14892634e228_update_vip.py
index 94cbb48472..c3a03e63b6 100644
--- a/octavia/db/migration/alembic_migrations/versions/14892634e228_update_vip.py
+++ b/octavia/db/migration/alembic_migrations/versions/14892634e228_update_vip.py
@@ -20,13 +20,13 @@ Create Date: 2015-01-10 00:53:57.798213
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '14892634e228'
 down_revision = '3a1e1cdb7b27'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     with op.batch_alter_table(u'vip') as batch_op:
diff --git a/octavia/db/migration/alembic_migrations/versions/186509101b9b_add_server_group_id_to_loadbalancer.py b/octavia/db/migration/alembic_migrations/versions/186509101b9b_add_server_group_id_to_loadbalancer.py
index 59a0a01c85..4e75ea0d45 100644
--- a/octavia/db/migration/alembic_migrations/versions/186509101b9b_add_server_group_id_to_loadbalancer.py
+++ b/octavia/db/migration/alembic_migrations/versions/186509101b9b_add_server_group_id_to_loadbalancer.py
@@ -21,13 +21,13 @@ Create Date: 2016-01-25 15:12:52.489652
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '186509101b9b'
 down_revision = '458c9ee2a011'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column(u'load_balancer', sa.Column(u'server_group_id',
diff --git a/octavia/db/migration/alembic_migrations/versions/1e4c1d83044c_keepalived_configuration_datamodel.py b/octavia/db/migration/alembic_migrations/versions/1e4c1d83044c_keepalived_configuration_datamodel.py
index 79faa946ab..78f2b691a0 100644
--- a/octavia/db/migration/alembic_migrations/versions/1e4c1d83044c_keepalived_configuration_datamodel.py
+++ b/octavia/db/migration/alembic_migrations/versions/1e4c1d83044c_keepalived_configuration_datamodel.py
@@ -19,14 +19,14 @@ Create Date: 2015-08-06 10:39:54.998797
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '1e4c1d83044c'
-down_revision = '5a3ee5472c31'
-
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy import sql
 
+# revision identifiers, used by Alembic.
+revision = '1e4c1d83044c'
+down_revision = '5a3ee5472c31'
+
 
 def upgrade():
     op.create_table(
diff --git a/octavia/db/migration/alembic_migrations/versions/2351ea316465_adding_terminate_https_tls_ref_support.py b/octavia/db/migration/alembic_migrations/versions/2351ea316465_adding_terminate_https_tls_ref_support.py
index c81f396763..92a10d1713 100644
--- a/octavia/db/migration/alembic_migrations/versions/2351ea316465_adding_terminate_https_tls_ref_support.py
+++ b/octavia/db/migration/alembic_migrations/versions/2351ea316465_adding_terminate_https_tls_ref_support.py
@@ -19,14 +19,14 @@ Create Date: 2015-05-22 11:57:04.703910
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '2351ea316465'
-down_revision = '357d17a6d5ac'
-
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy import sql
 
+# revision identifiers, used by Alembic.
+revision = '2351ea316465'
+down_revision = '357d17a6d5ac'
+
 
 new_protocol = 'TERMINATED_HTTPS'
 
diff --git a/octavia/db/migration/alembic_migrations/versions/256852d5ff7c_add_lb_network_ip_to_amphora.py b/octavia/db/migration/alembic_migrations/versions/256852d5ff7c_add_lb_network_ip_to_amphora.py
index d9dc47b2e4..73910d1bc5 100644
--- a/octavia/db/migration/alembic_migrations/versions/256852d5ff7c_add_lb_network_ip_to_amphora.py
+++ b/octavia/db/migration/alembic_migrations/versions/256852d5ff7c_add_lb_network_ip_to_amphora.py
@@ -20,13 +20,13 @@ Create Date: 2015-01-13 16:18:57.359290
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '256852d5ff7c'
 down_revision = '14892634e228'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column(u'amphora', sa.Column(u'lb_network_ip', sa.String(64),
diff --git a/octavia/db/migration/alembic_migrations/versions/298eac0640a7_add_amphora_vrrp_port_id_and_ha_port_id.py b/octavia/db/migration/alembic_migrations/versions/298eac0640a7_add_amphora_vrrp_port_id_and_ha_port_id.py
index 4129642599..b9c039b884 100644
--- a/octavia/db/migration/alembic_migrations/versions/298eac0640a7_add_amphora_vrrp_port_id_and_ha_port_id.py
+++ b/octavia/db/migration/alembic_migrations/versions/298eac0640a7_add_amphora_vrrp_port_id_and_ha_port_id.py
@@ -20,13 +20,13 @@ Create Date: 2015-07-20 15:25:37.044098
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '298eac0640a7'
 down_revision = '4fe8240425b4'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column(u'amphora',
diff --git a/octavia/db/migration/alembic_migrations/versions/29ff921a6eb_shared_pools.py b/octavia/db/migration/alembic_migrations/versions/29ff921a6eb_shared_pools.py
index 7d2cb7b5bb..c8a7f2a9a7 100644
--- a/octavia/db/migration/alembic_migrations/versions/29ff921a6eb_shared_pools.py
+++ b/octavia/db/migration/alembic_migrations/versions/29ff921a6eb_shared_pools.py
@@ -20,13 +20,13 @@ Create Date: 2015-12-09 10:32:12.712932
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '29ff921a6eb'
 down_revision = '43287cd10fef'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     conn = op.get_bind()
diff --git a/octavia/db/migration/alembic_migrations/versions/357d17a6d5ac_update_lb_and_amphora_data_model_for_.py b/octavia/db/migration/alembic_migrations/versions/357d17a6d5ac_update_lb_and_amphora_data_model_for_.py
index e8ba1bd498..0e5f17ddc3 100644
--- a/octavia/db/migration/alembic_migrations/versions/357d17a6d5ac_update_lb_and_amphora_data_model_for_.py
+++ b/octavia/db/migration/alembic_migrations/versions/357d17a6d5ac_update_lb_and_amphora_data_model_for_.py
@@ -21,14 +21,14 @@ Create Date: 2015-07-16 17:41:49.029145
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '357d17a6d5ac'
-down_revision = '298eac0640a7'
-
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy import sql
 
+# revision identifiers, used by Alembic.
+revision = '357d17a6d5ac'
+down_revision = '298eac0640a7'
+
 
 def upgrade():
     op.create_table(
diff --git a/octavia/db/migration/alembic_migrations/versions/35dee79d5865_initial_create.py b/octavia/db/migration/alembic_migrations/versions/35dee79d5865_initial_create.py
index 97e6e6c816..27a0ae03d3 100644
--- a/octavia/db/migration/alembic_migrations/versions/35dee79d5865_initial_create.py
+++ b/octavia/db/migration/alembic_migrations/versions/35dee79d5865_initial_create.py
@@ -20,14 +20,14 @@ Create Date: 2014-08-15 11:01:14.897223
 
 '''
 
-# revision identifiers, used by Alembic.
-revision = '35dee79d5865'
-down_revision = None
-
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy import sql
 
+# revision identifiers, used by Alembic.
+revision = '35dee79d5865'
+down_revision = None
+
 
 def upgrade():
     # Create lookup tables
diff --git a/octavia/db/migration/alembic_migrations/versions/36b94648fef8_add_timestamp.py b/octavia/db/migration/alembic_migrations/versions/36b94648fef8_add_timestamp.py
index 619106c967..697e12c0b6 100644
--- a/octavia/db/migration/alembic_migrations/versions/36b94648fef8_add_timestamp.py
+++ b/octavia/db/migration/alembic_migrations/versions/36b94648fef8_add_timestamp.py
@@ -20,13 +20,13 @@ Create Date: 2016-04-21 10:45:32.278433
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '36b94648fef8'
 down_revision = '4d9cf7d32f2'
 
-from alembic import op
-import sqlalchemy as sa
-
 tables = ['member', 'pool', 'load_balancer', 'listener']
 
 
diff --git a/octavia/db/migration/alembic_migrations/versions/3a1e1cdb7b27_rename_amphora_host_id.py b/octavia/db/migration/alembic_migrations/versions/3a1e1cdb7b27_rename_amphora_host_id.py
index 68b47752d3..0f068d003b 100644
--- a/octavia/db/migration/alembic_migrations/versions/3a1e1cdb7b27_rename_amphora_host_id.py
+++ b/octavia/db/migration/alembic_migrations/versions/3a1e1cdb7b27_rename_amphora_host_id.py
@@ -20,13 +20,13 @@ Create Date: 2015-01-10 02:01:04.997336
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '3a1e1cdb7b27'
 down_revision = '4faaa983e7a9'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.alter_column(u'amphora', u'host_id', new_column_name='compute_id',
diff --git a/octavia/db/migration/alembic_migrations/versions/3b199c848b96_create_no_monitor_operational_status.py b/octavia/db/migration/alembic_migrations/versions/3b199c848b96_create_no_monitor_operational_status.py
index 7f8305b66b..302c78e4dd 100644
--- a/octavia/db/migration/alembic_migrations/versions/3b199c848b96_create_no_monitor_operational_status.py
+++ b/octavia/db/migration/alembic_migrations/versions/3b199c848b96_create_no_monitor_operational_status.py
@@ -19,13 +19,13 @@ Create Date: 2015-09-03 17:11:03.724070
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '3b199c848b96'
 down_revision = '543f5d8e4e56'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     bind = op.get_bind()
diff --git a/octavia/db/migration/alembic_migrations/versions/3e5b37a0bdb9_add_vrrp_ip_and_ha_ip_to_amphora.py b/octavia/db/migration/alembic_migrations/versions/3e5b37a0bdb9_add_vrrp_ip_and_ha_ip_to_amphora.py
index a29aae4a2e..162c58e47a 100644
--- a/octavia/db/migration/alembic_migrations/versions/3e5b37a0bdb9_add_vrrp_ip_and_ha_ip_to_amphora.py
+++ b/octavia/db/migration/alembic_migrations/versions/3e5b37a0bdb9_add_vrrp_ip_and_ha_ip_to_amphora.py
@@ -20,13 +20,13 @@ Create Date: 2015-03-24 18:17:36.998604
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '3e5b37a0bdb9'
 down_revision = '92fe9857279'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column(u'amphora',
diff --git a/octavia/db/migration/alembic_migrations/versions/3f8ff3be828e_create_quotas_table.py b/octavia/db/migration/alembic_migrations/versions/3f8ff3be828e_create_quotas_table.py
index d2e1d6badc..986e9c2764 100644
--- a/octavia/db/migration/alembic_migrations/versions/3f8ff3be828e_create_quotas_table.py
+++ b/octavia/db/migration/alembic_migrations/versions/3f8ff3be828e_create_quotas_table.py
@@ -19,13 +19,13 @@ Create Date: 2016-09-01 13:59:20.723621
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '3f8ff3be828e'
 down_revision = '44a2414dd683'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.create_table(
diff --git a/octavia/db/migration/alembic_migrations/versions/43287cd10fef_make_pool_lb_algorithm_larger.py b/octavia/db/migration/alembic_migrations/versions/43287cd10fef_make_pool_lb_algorithm_larger.py
index 007e2fb26d..781e644207 100644
--- a/octavia/db/migration/alembic_migrations/versions/43287cd10fef_make_pool_lb_algorithm_larger.py
+++ b/octavia/db/migration/alembic_migrations/versions/43287cd10fef_make_pool_lb_algorithm_larger.py
@@ -20,13 +20,13 @@ Create Date: 2016-01-14 10:05:27.803518
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '43287cd10fef'
 down_revision = '6abb04f24c5'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.drop_constraint(
diff --git a/octavia/db/migration/alembic_migrations/versions/443fe6676637_add_network_id_to_vip.py b/octavia/db/migration/alembic_migrations/versions/443fe6676637_add_network_id_to_vip.py
index 7c30ae0eef..a01fc03149 100644
--- a/octavia/db/migration/alembic_migrations/versions/443fe6676637_add_network_id_to_vip.py
+++ b/octavia/db/migration/alembic_migrations/versions/443fe6676637_add_network_id_to_vip.py
@@ -19,13 +19,13 @@ Create Date: 2017-02-06 15:21:25.637744
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '443fe6676637'
 down_revision = '3f8ff3be828e'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column(u'vip',
diff --git a/octavia/db/migration/alembic_migrations/versions/44a2414dd683_adding_name_column_to_member_and_health_.py b/octavia/db/migration/alembic_migrations/versions/44a2414dd683_adding_name_column_to_member_and_health_.py
index 2904919c07..95142d37ad 100644
--- a/octavia/db/migration/alembic_migrations/versions/44a2414dd683_adding_name_column_to_member_and_health_.py
+++ b/octavia/db/migration/alembic_migrations/versions/44a2414dd683_adding_name_column_to_member_and_health_.py
@@ -20,13 +20,13 @@ Create Date: 2016-12-19 13:14:58.879793
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '44a2414dd683'
 down_revision = 'c11292016060'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 tables = ['member', 'health_monitor']
 
diff --git a/octavia/db/migration/alembic_migrations/versions/458c9ee2a011_l7_policies_and_rules.py b/octavia/db/migration/alembic_migrations/versions/458c9ee2a011_l7_policies_and_rules.py
index 5d07cf5320..e7a0e2984b 100644
--- a/octavia/db/migration/alembic_migrations/versions/458c9ee2a011_l7_policies_and_rules.py
+++ b/octavia/db/migration/alembic_migrations/versions/458c9ee2a011_l7_policies_and_rules.py
@@ -20,14 +20,14 @@ Create Date: 2016-01-07 11:45:45.391851
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '458c9ee2a011'
-down_revision = '29ff921a6eb'
-
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy import sql
 
+# revision identifiers, used by Alembic.
+revision = '458c9ee2a011'
+down_revision = '29ff921a6eb'
+
 
 def upgrade():
     # L7 Rule Types
diff --git a/octavia/db/migration/alembic_migrations/versions/48660b6643f0_add_new_states_for_amphora.py b/octavia/db/migration/alembic_migrations/versions/48660b6643f0_add_new_states_for_amphora.py
index da2d5bec16..b96b91d4ad 100644
--- a/octavia/db/migration/alembic_migrations/versions/48660b6643f0_add_new_states_for_amphora.py
+++ b/octavia/db/migration/alembic_migrations/versions/48660b6643f0_add_new_states_for_amphora.py
@@ -21,14 +21,14 @@ Create Date: 2015-01-20 13:31:30.017959
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '48660b6643f0'
-down_revision = '3e5b37a0bdb9'
-
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy import sql
 
+# revision identifiers, used by Alembic.
+revision = '48660b6643f0'
+down_revision = '3e5b37a0bdb9'
+
 
 def upgrade():
     insert_table = sql.table(
diff --git a/octavia/db/migration/alembic_migrations/versions/4c094013699a_update_load_balancer_amphora.py b/octavia/db/migration/alembic_migrations/versions/4c094013699a_update_load_balancer_amphora.py
index 697a2a7d27..f8de464baf 100644
--- a/octavia/db/migration/alembic_migrations/versions/4c094013699a_update_load_balancer_amphora.py
+++ b/octavia/db/migration/alembic_migrations/versions/4c094013699a_update_load_balancer_amphora.py
@@ -20,13 +20,13 @@ Create Date: 2014-09-15 14:42:44.875448
 
 '''
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '4c094013699a'
 down_revision = '35dee79d5865'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column(
diff --git a/octavia/db/migration/alembic_migrations/versions/4d9cf7d32f2_insert_headers.py b/octavia/db/migration/alembic_migrations/versions/4d9cf7d32f2_insert_headers.py
index 248367a898..20f75d4ea7 100644
--- a/octavia/db/migration/alembic_migrations/versions/4d9cf7d32f2_insert_headers.py
+++ b/octavia/db/migration/alembic_migrations/versions/4d9cf7d32f2_insert_headers.py
@@ -20,13 +20,13 @@ Create Date: 2016-02-21 17:16:22.316744
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '4d9cf7d32f2'
 down_revision = '9bf4d21caaea'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column('listener', sa.Column('insert_headers', sa.PickleType()))
diff --git a/octavia/db/migration/alembic_migrations/versions/4faaa983e7a9_update_member_address_column.py b/octavia/db/migration/alembic_migrations/versions/4faaa983e7a9_update_member_address_column.py
index fbed042de8..e9c4434e4d 100644
--- a/octavia/db/migration/alembic_migrations/versions/4faaa983e7a9_update_member_address_column.py
+++ b/octavia/db/migration/alembic_migrations/versions/4faaa983e7a9_update_member_address_column.py
@@ -20,13 +20,13 @@ Create Date: 2014-09-29 11:22:16.565071
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '4faaa983e7a9'
 down_revision = '13500e2e978d'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.alter_column(u'member', u'address', new_column_name=u'ip_address',
diff --git a/octavia/db/migration/alembic_migrations/versions/4fe8240425b4_update_vip_add_subnet_id.py b/octavia/db/migration/alembic_migrations/versions/4fe8240425b4_update_vip_add_subnet_id.py
index 71fc7d55ed..daf941be40 100644
--- a/octavia/db/migration/alembic_migrations/versions/4fe8240425b4_update_vip_add_subnet_id.py
+++ b/octavia/db/migration/alembic_migrations/versions/4fe8240425b4_update_vip_add_subnet_id.py
@@ -19,13 +19,13 @@ Create Date: 2015-07-01 14:27:44.187179
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '4fe8240425b4'
 down_revision = '48660b6643f0'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     with op.batch_alter_table(u'vip') as batch_op:
diff --git a/octavia/db/migration/alembic_migrations/versions/543f5d8e4e56_add_a_column_busy_in_table_amphora_health.py b/octavia/db/migration/alembic_migrations/versions/543f5d8e4e56_add_a_column_busy_in_table_amphora_health.py
index 2e34712174..814f7d5033 100644
--- a/octavia/db/migration/alembic_migrations/versions/543f5d8e4e56_add_a_column_busy_in_table_amphora_health.py
+++ b/octavia/db/migration/alembic_migrations/versions/543f5d8e4e56_add_a_column_busy_in_table_amphora_health.py
@@ -19,13 +19,13 @@ Create Date: 2015-07-27 11:32:16.685383
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '543f5d8e4e56'
 down_revision = '2351ea316465'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column(u'amphora_health',
diff --git a/octavia/db/migration/alembic_migrations/versions/5a3ee5472c31_add_cert_expiration__infor_in_amphora_table.py b/octavia/db/migration/alembic_migrations/versions/5a3ee5472c31_add_cert_expiration__infor_in_amphora_table.py
index 046021594c..a20786ac26 100644
--- a/octavia/db/migration/alembic_migrations/versions/5a3ee5472c31_add_cert_expiration__infor_in_amphora_table.py
+++ b/octavia/db/migration/alembic_migrations/versions/5a3ee5472c31_add_cert_expiration__infor_in_amphora_table.py
@@ -19,13 +19,13 @@ Create Date: 2015-08-20 10:15:19.561066
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '5a3ee5472c31'
 down_revision = '3b199c848b96'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column(u'amphora',
diff --git a/octavia/db/migration/alembic_migrations/versions/62816c232310_fix_migration_for_mysql_5_7.py b/octavia/db/migration/alembic_migrations/versions/62816c232310_fix_migration_for_mysql_5_7.py
index fdf7db4cfa..2ad51f877b 100644
--- a/octavia/db/migration/alembic_migrations/versions/62816c232310_fix_migration_for_mysql_5_7.py
+++ b/octavia/db/migration/alembic_migrations/versions/62816c232310_fix_migration_for_mysql_5_7.py
@@ -20,13 +20,13 @@ Create Date: 2016-06-07 12:59:21.059619
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '62816c232310'
 down_revision = '36b94648fef8'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.alter_column(u'sni', u'tls_container_id', type_=sa.String(128),
diff --git a/octavia/db/migration/alembic_migrations/versions/6abb04f24c5_tenant_id_to_project_id.py b/octavia/db/migration/alembic_migrations/versions/6abb04f24c5_tenant_id_to_project_id.py
index e21bdfe4d7..3e61886917 100644
--- a/octavia/db/migration/alembic_migrations/versions/6abb04f24c5_tenant_id_to_project_id.py
+++ b/octavia/db/migration/alembic_migrations/versions/6abb04f24c5_tenant_id_to_project_id.py
@@ -20,13 +20,13 @@ Create Date: 2015-12-03 15:22:25.390595
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '6abb04f24c5'
 down_revision = '1e4c1d83044c'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.alter_column('load_balancer', 'tenant_id', new_column_name='project_id',
diff --git a/octavia/db/migration/alembic_migrations/versions/82b9402e71fd_update_vip_address_size.py b/octavia/db/migration/alembic_migrations/versions/82b9402e71fd_update_vip_address_size.py
index d52ad499d7..e92ac561ae 100644
--- a/octavia/db/migration/alembic_migrations/versions/82b9402e71fd_update_vip_address_size.py
+++ b/octavia/db/migration/alembic_migrations/versions/82b9402e71fd_update_vip_address_size.py
@@ -20,13 +20,13 @@ Create Date: 2016-07-17 14:36:36.698870
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '82b9402e71fd'
 down_revision = '4a6ec0ab7284'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.alter_column(u'vip', u'ip_address',
diff --git a/octavia/db/migration/alembic_migrations/versions/8c0851bdf6c3_change_tls_container_id_length_in_sni_.py b/octavia/db/migration/alembic_migrations/versions/8c0851bdf6c3_change_tls_container_id_length_in_sni_.py
index 5ee9b17765..a963d8352b 100644
--- a/octavia/db/migration/alembic_migrations/versions/8c0851bdf6c3_change_tls_container_id_length_in_sni_.py
+++ b/octavia/db/migration/alembic_migrations/versions/8c0851bdf6c3_change_tls_container_id_length_in_sni_.py
@@ -20,13 +20,13 @@ Create Date: 2016-03-23 19:08:53.148812
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '8c0851bdf6c3'
 down_revision = '186509101b9b'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.alter_column(u'sni', u'tls_container_id', type_=sa.String(128),
diff --git a/octavia/db/migration/alembic_migrations/versions/92fe9857279_create_healthmanager_table.py b/octavia/db/migration/alembic_migrations/versions/92fe9857279_create_healthmanager_table.py
index 78af77252d..58f16031fc 100644
--- a/octavia/db/migration/alembic_migrations/versions/92fe9857279_create_healthmanager_table.py
+++ b/octavia/db/migration/alembic_migrations/versions/92fe9857279_create_healthmanager_table.py
@@ -19,13 +19,13 @@ Create Date: 2015-01-22 16:58:23.440247
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '92fe9857279'
 down_revision = '256852d5ff7c'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.create_table(
diff --git a/octavia/db/migration/alembic_migrations/versions/9b5473976d6d_add_provisioning_status_to_objects.py b/octavia/db/migration/alembic_migrations/versions/9b5473976d6d_add_provisioning_status_to_objects.py
index 7418b8e85c..337bb0fd55 100644
--- a/octavia/db/migration/alembic_migrations/versions/9b5473976d6d_add_provisioning_status_to_objects.py
+++ b/octavia/db/migration/alembic_migrations/versions/9b5473976d6d_add_provisioning_status_to_objects.py
@@ -20,13 +20,13 @@ Create Date: 2016-09-20 21:46:26.843695
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '9b5473976d6d'
 down_revision = '82b9402e71fd'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
 
diff --git a/octavia/db/migration/alembic_migrations/versions/c11292016060_add_request_errors_for_stats.py b/octavia/db/migration/alembic_migrations/versions/c11292016060_add_request_errors_for_stats.py
index 7c1ed3c67e..2436ea3d19 100644
--- a/octavia/db/migration/alembic_migrations/versions/c11292016060_add_request_errors_for_stats.py
+++ b/octavia/db/migration/alembic_migrations/versions/c11292016060_add_request_errors_for_stats.py
@@ -20,13 +20,13 @@ Create Date: 2016-08-12 03:37:38.656962
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = 'c11292016060'
 down_revision = '9b5473976d6d'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column('listener_statistics',
diff --git a/octavia/tests/tempest/common/manager.py b/octavia/tests/tempest/common/manager.py
index 615bdf2d6e..73da18229b 100644
--- a/octavia/tests/tempest/common/manager.py
+++ b/octavia/tests/tempest/common/manager.py
@@ -682,8 +682,9 @@ class ScenarioTest(tempest.test.BaseTestCase):
                 addresses = (server['addresses'][network['name']]
                              if network else [])
             for address in addresses:
-                if (address['version'] == CONF.validation.ip_version_for_ssh
-                        and address['OS-EXT-IPS:type'] == 'fixed'):
+                if (address['version'] ==
+                        CONF.validation.ip_version_for_ssh and
+                        address['OS-EXT-IPS:type'] == 'fixed'):
                     return address['addr']
             raise exceptions.ServerUnreachable(server_id=server['id'])
         else:
@@ -815,8 +816,8 @@ class NetworkScenarioTest(ScenarioTest):
         port_map = [(p["id"], fxip["ip_address"])
                     for p in ports
                     for fxip in p["fixed_ips"]
-                    if netutils.is_valid_ipv4(fxip["ip_address"])
-                    and p['status'] in p_status]
+                    if netutils.is_valid_ipv4(fxip["ip_address"]) and
+                    p['status'] in p_status]
         inactive = [p for p in ports if p['status'] != 'ACTIVE']
         if inactive:
             LOG.warning("Instance has ports that are not ACTIVE: %s", inactive)
diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_listener.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_listener.py
index d2b9b8b4c6..3310b5baa7 100644
--- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_listener.py
+++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_listener.py
@@ -114,8 +114,8 @@ class ListenerTestCase(base.TestCase):
             pass
 
     @mock.patch('os.path.exists')
-    @mock.patch('octavia.amphorae.backends.agent.api_server'
-                + '.util.get_haproxy_pid')
+    @mock.patch('octavia.amphorae.backends.agent.api_server' +
+                '.util.get_haproxy_pid')
     def test_check_listener_status(self, mock_pid, mock_exists):
         mock_pid.return_value = '1245'
         mock_exists.side_effect = [True, True]
@@ -170,8 +170,8 @@ class ListenerTestCase(base.TestCase):
         handle.write.assert_called_once_with(cmd)
 
     @mock.patch('os.path.exists')
-    @mock.patch('octavia.amphorae.backends.agent.api_server'
-                + '.util.get_haproxy_pid')
+    @mock.patch('octavia.amphorae.backends.agent.api_server' +
+                '.util.get_haproxy_pid')
     def test_check_haproxy_status(self, mock_pid, mock_exists):
         mock_pid.return_value = '1245'
         mock_exists.side_effect = [True, True]
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index a739a72868..d3f2537f82 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -30,6 +30,7 @@
 # sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration ------------------------------------------------
+from octavia import version
 
 # If your documentation needs a minimal Sphinx version, state it here.
 # needs_sphinx = '1.0'
@@ -63,7 +64,6 @@ copyright = u'2015, Octavia Developers'
 # built documents.
 #
 # The short X.Y version.
-from octavia import version
 # from octavia.version import version_info as octavia_version
 # The full version, including alpha/beta/rc tags.
 release = version.version_info.version_string_with_vcs()
diff --git a/tox.ini b/tox.ini
index 80de003aa6..39b42cb300 100644
--- a/tox.ini
+++ b/tox.ini
@@ -100,7 +100,7 @@ commands = bandit -r octavia -ll -ii -x octavia/tests {posargs}
 [flake8]
 # Ignoring O321 because it's unnecessarily restricting use of json package.
 # jsonutils version doesn't add additional value
-ignore = O321,E402,W503
+ignore = O321
 show-source = true
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build