summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.pylintrc1
-rw-r--r--neutron/agent/securitygroups_rpc.py3
-rw-r--r--neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py1
-rw-r--r--neutron/services/l3_router/l3_apic.py1
4 files changed, 4 insertions, 2 deletions
diff --git a/.pylintrc b/.pylintrc
index 595c3e53e6..ad9c8211bc 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -24,7 +24,6 @@ disable=
no-member,
no-method-argument,
no-self-argument,
- not-callable,
no-value-for-parameter,
super-on-old-class,
# "W" Warnings for stylistic problems or minor programming issues
diff --git a/neutron/agent/securitygroups_rpc.py b/neutron/agent/securitygroups_rpc.py
index 7681b31ead..fe67851060 100644
--- a/neutron/agent/securitygroups_rpc.py
+++ b/neutron/agent/securitygroups_rpc.py
@@ -197,7 +197,8 @@ class SecurityGroupAgentRpcMixin(object):
"or configured as NoopFirewallDriver."),
func.__name__)
else:
- return func(self, *args, **kwargs)
+ return func(self, # pylint: disable=not-callable
+ *args, **kwargs)
return decorated_function
@skip_if_noopfirewall_or_firewall_disabled
diff --git a/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py b/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py
index c9ef932026..661b869088 100644
--- a/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py
+++ b/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py
@@ -79,6 +79,7 @@ class APICMechanismDriver(api.MechanismDriver):
inst.synchronizer = (
APICMechanismDriver.get_base_synchronizer(inst))
inst.synchronizer.sync_base()
+ # pylint: disable=not-callable
return f(inst, *args, **kwargs)
return inner
diff --git a/neutron/services/l3_router/l3_apic.py b/neutron/services/l3_router/l3_apic.py
index c4139a6510..82ecb706cc 100644
--- a/neutron/services/l3_router/l3_apic.py
+++ b/neutron/services/l3_router/l3_apic.py
@@ -63,6 +63,7 @@ class ApicL3ServicePlugin(db_base_plugin_v2.NeutronDbPluginV2,
mechanism_apic.APICMechanismDriver.
get_router_synchronizer(inst))
inst.synchronizer.sync_router()
+ # pylint: disable=not-callable
return f(inst, *args, **kwargs)
return inner