openstack/dragonflow
Code Issues Proposed changes

e125 warning can be resolved

Browse Source 
E125 warning can be resolved.
Remove e125 ignore statement.
Closes-Bug: #1650167

Change-Id: I3345dabea91b4710ebfe1967b49148fe17f31c26
This commit is contained in:
xhzhf 2016-12-14 23:35:01 +08:00
parent ab4501f281
commit 5592ed2880
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dragonflow/neutron/ml2/mech_driver.py
View File

@ -574,11 +574,11 @@ class DFMechDriver(driver_api.MechanismDriver):
# Here we do not want port status update to trigger
# sending event to other compute node.
if (cfg.CONF.df.enable_port_status_notifier and
n_const.DEVICE_OWNER_COMPUTE_PREFIX
in updated_port['device_owner'] and
context.status != context.original_status and
(context.status == n_const.PORT_STATUS_DOWN or
context.status == n_const.PORT_STATUS_ACTIVE)):
n_const.DEVICE_OWNER_COMPUTE_PREFIX
in updated_port['device_owner'] and
context.status != context.original_status and
(context.status == n_const.PORT_STATUS_DOWN or
context.status == n_const.PORT_STATUS_ACTIVE)):
return None
# If a subnet enabled dhcp, the DFMechDriver will create a dhcp server

2
dragonflow/neutron/services/qos/notification_drivers/df_qos_notification_driver.py
View File

@ -18,7 +18,7 @@ from dragonflow.db.neutron import lockedobjects_db as lock_db
class DFQosServiceNotificationDriver(
qos_base.QosServiceNotificationDriverBase):
qos_base.QosServiceNotificationDriverBase):
"""Dragonflow notification driver for QoS."""
def __init__(self):

26
dragonflow/tests/fullstack/test_l2_flows.py
View File

@ -185,9 +185,9 @@ class TestL2FLows(test_base.DFTestBase):
if ingress_action in flow['actions']:
ingress_check = True
if l2_lookup_multicast_check is None or \
l2_lookup_unicast_check is None or \
ingress_check is None:
if (l2_lookup_multicast_check is None or
l2_lookup_unicast_check is None or
ingress_check is None):
return None
return True
@ -250,11 +250,11 @@ class TestL2FLows(test_base.DFTestBase):
if ingress_action in flow['actions']:
ingress_check = True
if l2_lookup_multicast_check is None or \
l2_lookup_unicast_check is None or \
l2_lookup_unkown_check is None or \
egress_check is None or \
ingress_check is None:
if (l2_lookup_multicast_check is None or
l2_lookup_unicast_check is None or
l2_lookup_unkown_check is None or
egress_check is None or
ingress_check is None):
return None
@ -370,11 +370,11 @@ class TestL2FLows(test_base.DFTestBase):
if ingress_action in flow['actions']:
ingress_check = True
if l2_lookup_multicast_check is None or \
l2_lookup_unicast_check is None or \
l2_lookup_unkown_check is None or \
egress_check is None or \
ingress_check is None:
if (l2_lookup_multicast_check is None or
l2_lookup_unicast_check is None or
l2_lookup_unkown_check is None or
egress_check is None or
ingress_check is None):
return None
return True

3
tox.ini
View File

@ -46,7 +46,6 @@ deps =
commands = python setup.py build_sphinx
[flake8]
# E125 continuation line does not distinguish itself from next logical line
# E126 continuation line over-indented for hanging indent
# E128 continuation line under-indented for visual indent
# E129 visually indented line with same indent as next logical line
@ -57,7 +56,7 @@ commands = python setup.py build_sphinx
# H233 Python 3.x incompatible use of print operator
# N342 String interpolation should be delayed at logging calls
# N530 Direct neutron imports not allowed
ignore = E125,E126,E128,E129,E265,H301,H404,H405,H904,H233,N342,N530
ignore = E126,E128,E129,E265,H301,H404,H405,H904,H233,N342,N530
show-source = true
# TODO(dougw) neutron/tests/unit/vmware exclusion is a temporary services split hack
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,.ropeproject,rally-scenarios,neutron/tests/unit/vmware*