remove E112 hacking exemption and fix errors

Change-Id: I6031ad2274c677b071a03068e5fb3c000fec7723
Partial-Bug: 1329017

diff --git a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
index 168ba8b10b3b4520e82600ee89fc3bf4f315a0f9..4e1f792fa5f6f9f57d5f76f478a86394c2da8b7a 100644 (file)
--- a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
+++ b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
@@ -191,6 +191,7 @@ class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
                 # Add profiles in database if new profiles were created in VSM
                 for pid in vsm_profiles_set - plugin_profiles_set:
                     self._add_policy_profile(vsm_profiles[pid], pid)
+
                 # Delete profiles from database if profiles were deleted in VSM
                 for pid in plugin_profiles_set - vsm_profiles_set:
                     self._delete_policy_profile(pid)

diff --git a/neutron/plugins/midonet/plugin.py b/neutron/plugins/midonet/plugin.py
index 9bf589959a746bfccc657a520f1bd268333a9dcc..cbf6ce4ede7157c41327204d0f3836b6eccf1ac0 100644 (file)
--- a/neutron/plugins/midonet/plugin.py
+++ b/neutron/plugins/midonet/plugin.py
@@ -694,7 +694,7 @@ class MidonetPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
                         self.client.add_dhcp_route_option(
                             bridge, cidr, ip, METADATA_DEFAULT_IP)
                 else:
-                # IPs have changed.  Re-map the DHCP entries
+                    # IPs have changed.  Re-map the DHCP entries
                     for cidr, ip, mac in self._dhcp_mappings(
                             context, old_ips, mac):
                         self.client.remove_dhcp_host(

diff --git a/tox.ini b/tox.ini
index 77141e06da8048046b203a234f5351c4cda1affd..bf2398df57bdbe6afb0fc58147d26df97bd4d48b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -40,7 +40,6 @@ commands =
 commands = {posargs}
 
 [flake8]
-# E112 expected an idented block
 # E122 continuation line missing indentation or outdented
 # E125 continuation line does not distinguish itself from next logical line
 # E126 continuation line over-indented for hanging indent
@@ -63,7 +62,7 @@ commands = {posargs}
 # H405 multi line docstring summary not separated with an empty line
 # H904 Wrap long lines in parentheses instead of a backslash
 # TODO(marun) H404 multi line docstring should start with a summary
-ignore = E112,E122,E125,E126,E128,E129,E251,E265,E713,F402,F811,F812,H104,H237,H302,H304,H305,H307,H401,H402,H404,H405,H904
+ignore = E122,E125,E126,E128,E129,E251,E265,E713,F402,F811,F812,H104,H237,H302,H304,H305,H307,H401,H402,H404,H405,H904
 show-source = true
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,.ropeproject