diff --git a/tacker/vm/drivers/heat/heat.py b/tacker/vm/drivers/heat/heat.py index 0394f7fd6..55a2d9907 100644 --- a/tacker/vm/drivers/heat/heat.py +++ b/tacker/vm/drivers/heat/heat.py @@ -81,7 +81,7 @@ class DeviceHeat(abstract_driver.DeviceAbstractDriver): device_template_dict.update( dict((key, vnfd_dict[vnfd_key]) for (key, vnfd_key) in KEY_LIST - if ((not key in device_template_dict or + if ((key not in device_template_dict or device_template_dict[key] == '') and vnfd_key in vnfd_dict and vnfd_dict[vnfd_key] != ''))) diff --git a/tacker/vm/monitor.py b/tacker/vm/monitor.py index 816278c3b..2eeb12534 100644 --- a/tacker/vm/monitor.py +++ b/tacker/vm/monitor.py @@ -205,7 +205,7 @@ class ActionPolicy(object): def get_supported_actions(cls): return cls._POLICIES.keys() - @abc.abstractmethod + @abc.abstractmethod # noqa def execute_action(cls, plugin, device_dict): pass diff --git a/tox.ini b/tox.ini index f404731d9..1641ec244 100644 --- a/tox.ini +++ b/tox.ini @@ -59,11 +59,9 @@ commands = {posargs} # 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 -# E713 test for membership should be ‘not in’ -# F811 redefinition of unused variable # H302 import only modules # H904 Wrap long lines in parentheses instead of a backslash -ignore = E125,E126,E128,E129,E713,F811,H302,H904 +ignore = E125,E126,E128,E129,H302,H904 show-source = true builtins = _ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,.ropeproject