Merge "Enable the "not-callable" pylint check"

.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

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

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
 

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