diff --git a/dragonflow/tests/common/utils.py b/dragonflow/tests/common/utils.py index 0e4b57d07..c7aee07d3 100644 --- a/dragonflow/tests/common/utils.py +++ b/dragonflow/tests/common/utils.py @@ -65,7 +65,7 @@ def check_dhcp_ip_rule(flows, dhcp_ip): ',tp_dst=' + str(df_const.DHCP_SERVER_PORT) for flow in flows: if (flow['table'] == str(df_const.SERVICES_CLASSIFICATION_TABLE) - and flow['actions'] == goto_dhcp): + and flow['actions'] == goto_dhcp): if ('nw_dst=' + dhcp_ip + dhcp_ports in flow['match']): return True return False diff --git a/dragonflow/tests/fullstack/test_apps.py b/dragonflow/tests/fullstack/test_apps.py index 4830098d4..f2dfd0cdc 100644 --- a/dragonflow/tests/fullstack/test_apps.py +++ b/dragonflow/tests/fullstack/test_apps.py @@ -498,7 +498,7 @@ class TestDHCPApp(test_base.DFTestBase): def _check_dhcp_block_rule(self, flows, ofport=None): for flow in flows: if (int(flow['table']) == constants.DHCP_TABLE and - 'drop' in flow['actions']): + 'drop' in flow['actions']): if ofport is None or 'inport=' + ofport in flow['match']: return True return False diff --git a/dragonflow/tests/fullstack/test_db_consistent.py b/dragonflow/tests/fullstack/test_db_consistent.py index 041129122..ca9bdcc22 100644 --- a/dragonflow/tests/fullstack/test_db_consistent.py +++ b/dragonflow/tests/fullstack/test_db_consistent.py @@ -29,7 +29,7 @@ class TestDbConsistent(test_base.DFTestBase): goto_egress = 'goto_table:' + str(const.EGRESS_TABLE) for flow in flows: if (flow['table'] == str(const.L2_LOOKUP_TABLE) - and goto_egress in flow['actions']): + and goto_egress in flow['actions']): if 'dl_dst=' + mac in flow['match']: return True return False diff --git a/dragonflow/tests/fullstack/test_dhcp_flows.py b/dragonflow/tests/fullstack/test_dhcp_flows.py index 29e2f62bc..00a92c59e 100644 --- a/dragonflow/tests/fullstack/test_dhcp_flows.py +++ b/dragonflow/tests/fullstack/test_dhcp_flows.py @@ -44,9 +44,9 @@ class TestOVSFlowsForDHCP(test_base.DFTestBase): ',tp_dst=' + str(constants.DHCP_SERVER_PORT) for flow in flows: if (flow['table'] == str(constants.SERVICES_CLASSIFICATION_TABLE) - and flow['actions'] == goto_dhcp): + and flow['actions'] == goto_dhcp): if ('udp,dl_dst=' + constants.BROADCAST_MAC + dhcp_ports - in flow['match']): + in flow['match']): found_dhcp_cast_flow = True break self.assertTrue(found_dhcp_cast_flow) diff --git a/tox.ini b/tox.ini index 2d4ad584e..9134f32f7 100644 --- a/tox.ini +++ b/tox.ini @@ -48,11 +48,10 @@ commands = sphinx-build -W -b html doc/source doc/build/html [flake8] # E126 continuation line over-indented for hanging indent -# E129 visually indented line with same indent as next logical line # H404 multi line docstring should start with a summary # H405 multi line docstring summary not separated with an empty line # N530 Direct neutron imports not allowed -ignore = E126,E129,H404,H405,N530 +ignore = E126,H404,H405,N530 # H904: Delay string interpolations at logging calls enable-extensions=H904 show-source = true