Merge "python: Pylint 1.8.2 code conformity"

12 files changed, 37 insertions, 38 deletions

diff --git a/core/component_factory.py b/core/component_factory.py
index bd9a1019..b6bd2677 100644
--- a/core/component_factory.py
+++ b/core/component_factory.py
@@ -121,7 +121,6 @@ def create_loadgen(loadgen_class, loadgen_cfg):
     :param loadgen_cfg: Configuration for the loadgen
     :return: A new ILoadGenerator class
     """
-    # pylint: disable=too-many-function-args
     return loadgen_class(loadgen_cfg)
 
 def create_pktfwd(deployment, pktfwd_class):
diff --git a/core/loader/loader_servant.py b/core/loader/loader_servant.py
index 8bad9ab9..6db8e0f2 100644
--- a/core/loader/loader_servant.py
+++ b/core/loader/loader_servant.py
@@ -120,7 +120,7 @@ class LoaderServant(object):
 
         if class_name in results:
             logging.info(
-                "Class found: " + class_name + ".")
+                "Class found: %s.", class_name)
             return results.get(class_name)
 
         return None
@@ -180,7 +180,7 @@ class LoaderServant(object):
                         mod = imp.load_module(
                             modname, *imp.find_module(modname, [root]))
                 except ImportError:
-                    logging.error('Could not import file ' + filename)
+                    logging.error('Could not import file %s', filename)
                     raise
 
                 mods.append((modname, mod))
diff --git a/core/pktfwd_controller.py b/core/pktfwd_controller.py
index b38aefa5..bdc91822 100644
--- a/core/pktfwd_controller.py
+++ b/core/pktfwd_controller.py
@@ -35,12 +35,12 @@ class PktFwdController(object):
         self._pktfwd_class = pktfwd_class
         self._pktfwd = pktfwd_class(guest=True if deployment == "pvp" and
                                     settings.getValue('VNF') != "QemuPciPassthrough" else False)
-        self._logger.debug('Creation using ' + str(self._pktfwd_class))
+        self._logger.debug('Creation using %s', str(self._pktfwd_class))
 
     def setup(self):
         """Sets up the packet forwarder for p2p.
         """
-        self._logger.debug('Setup using ' + str(self._pktfwd_class))
+        self._logger.debug('Setup using %s', str(self._pktfwd_class))
 
         try:
             self._pktfwd.start()
@@ -56,7 +56,7 @@ class PktFwdController(object):
     def setup_for_guest(self):
         """Sets up the packet forwarder for pvp.
         """
-        self._logger.debug('Setup using ' + str(self._pktfwd_class))
+        self._logger.debug('Setup using %s', str(self._pktfwd_class))
 
         try:
             self._pktfwd.start_for_guest()
@@ -67,7 +67,7 @@ class PktFwdController(object):
     def stop(self):
         """Tears down the packet forwarder created in setup().
         """
-        self._logger.debug('Stop using ' + str(self._pktfwd_class))
+        self._logger.debug('Stop using %s', str(self._pktfwd_class))
         self._pktfwd.stop()
 
     def __enter__(self):
diff --git a/core/traffic_controller.py b/core/traffic_controller.py
index de82dddf..1f21e57d 100644
--- a/core/traffic_controller.py
+++ b/core/traffic_controller.py
@@ -125,7 +125,7 @@ class TrafficController(object):
 
         :param traffic: A dictionary describing the traffic to send.
         """
-        self._logger.debug('send_traffic with ' +
+        self._logger.debug('send_traffic with %s',
                            str(self._traffic_gen_class))
         self.configure(traffic)
 
@@ -144,7 +144,8 @@ class TrafficController(object):
              If this function requires more than one argument, all should be
              should be passed using the args list and appropriately handled.
          """
-        self._logger.debug('send_traffic_async with ' +
+        # pylint: disable=unused-argument
+        self._logger.debug('send_traffic_async with %s',
                            str(self._traffic_gen_class))
         self.configure(traffic)
 
@@ -158,7 +159,7 @@ class TrafficController(object):
         """
         counter = 0
         for item in self._results:
-            logging.info("Record: " + str(counter))
+            logging.info("Record: %s", str(counter))
             counter += 1
             for(key, value) in list(item.items()):
                 logging.info("         Key: " + str(key) +
@@ -169,7 +170,7 @@ class TrafficController(object):
         """
         return self._results
 
-    def validate_send_traffic(self, dummy_result, dummy_traffic):
+    def validate_send_traffic(self, _dummy_result, _dummy_traffic):
         """Verify that send traffic has succeeded
         """
         if self._results:
diff --git a/core/traffic_controller_rfc2544.py b/core/traffic_controller_rfc2544.py
index 488dde6f..cb921970 100644
--- a/core/traffic_controller_rfc2544.py
+++ b/core/traffic_controller_rfc2544.py
@@ -87,7 +87,7 @@ class TrafficControllerRFC2544(TrafficController, IResults):
                 tests=self._tests,
                 duration=self._duration)
             self._traffic_started = True
-            if len(function['args']) > 0:
+            if function['args']:
                 function['function'](function['args'])
             else:
                 function['function']()
diff --git a/core/traffic_controller_rfc2889.py b/core/traffic_controller_rfc2889.py
index 64ab0ba6..316202c9 100644
--- a/core/traffic_controller_rfc2889.py
+++ b/core/traffic_controller_rfc2889.py
@@ -84,7 +84,7 @@ class TrafficControllerRFC2889(TrafficController, IResults):
                 trials=self._trials,
                 duration=self._duration)
             self._traffic_started = True
-            if len(function['args']) > 0:
+            if function['args']:
                 function['function'](function['args'])
             else:
                 function['function']()
diff --git a/core/vnf_controller.py b/core/vnf_controller.py
index 78a29258..cbf59b79 100644
--- a/core/vnf_controller.py
+++ b/core/vnf_controller.py
@@ -93,8 +93,7 @@ class VnfController(object):
     def get_vnfs_number(self):
         """Returns a number of vnfs controlled by this controller.
         """
-        self._logger.debug('get_vnfs_number ' + str(len(self._vnfs)) +
-                           ' VNF[s]')
+        self._logger.debug('get_vnfs_number %s VNF[s]', str(len(self._vnfs)))
         return len(self._vnfs)
 
     def start(self):
diff --git a/core/vswitch_controller_clean.py b/core/vswitch_controller_clean.py
index 61724b9b..432406a7 100644
--- a/core/vswitch_controller_clean.py
+++ b/core/vswitch_controller_clean.py
@@ -37,13 +37,13 @@ class VswitchControllerClean(IVswitchController):
         self._vswitch_class = vswitch_class
         self._vswitch = vswitch_class()
         self._deployment_scenario = "Clean"
-        self._logger.debug('Creation using ' + str(self._vswitch_class))
+        self._logger.debug('Creation using %s', str(self._vswitch_class))
         self._traffic = traffic.copy()
 
     def setup(self):
         """Sets up the switch for Clean.
         """
-        self._logger.debug('Setup using ' + str(self._vswitch_class))
+        self._logger.debug('Setup using %s', str(self._vswitch_class))
 
         try:
             self._vswitch.start()
@@ -54,7 +54,7 @@ class VswitchControllerClean(IVswitchController):
     def stop(self):
         """Tears down the switch created in setup().
         """
-        self._logger.debug('Stop using ' + str(self._vswitch_class))
+        self._logger.debug('Stop using %s', str(self._vswitch_class))
         self._vswitch.stop()
 
     def __enter__(self):
diff --git a/core/vswitch_controller_op2p.py b/core/vswitch_controller_op2p.py
index 85bf79bd..3f879f9f 100644
--- a/core/vswitch_controller_op2p.py
+++ b/core/vswitch_controller_op2p.py
@@ -46,12 +46,12 @@ class VswitchControllerOP2P(IVswitchController):
         self._deployment_scenario = "OP2P"
         self._traffic = traffic.copy()
         self._tunnel_operation = tunnel_operation
-        self._logger.debug('Creation using ' + str(self._vswitch_class))
+        self._logger.debug('Creation using %s', str(self._vswitch_class))
 
     def setup(self):
         """ Sets up the switch for overlay P2P (tunnel encap or decap)
         """
-        self._logger.debug('Setting up ' + str(self._tunnel_operation))
+        self._logger.debug('Setting up %s', str(self._tunnel_operation))
         if self._tunnel_operation == "encapsulation":
             self._setup_encap()
         else:
@@ -66,7 +66,7 @@ class VswitchControllerOP2P(IVswitchController):
         Create 2 bridges br0 (integration bridge) and br-ext and a VXLAN port
         for encapsulation.
         """
-        self._logger.debug('Setup using ' + str(self._vswitch_class))
+        self._logger.debug('Setup using %s', str(self._vswitch_class))
 
         try:
             self._vswitch.start()
@@ -129,7 +129,7 @@ class VswitchControllerOP2P(IVswitchController):
     def _setup_decap(self):
         """ Sets up the switch for overlay P2P decapsulation test
         """
-        self._logger.debug('Setup using ' + str(self._vswitch_class))
+        self._logger.debug('Setup using %s', str(self._vswitch_class))
 
         try:
             self._vswitch.start()
@@ -189,7 +189,7 @@ class VswitchControllerOP2P(IVswitchController):
     def _setup_decap_vanilla(self):
         """ Sets up the switch for overlay P2P decapsulation test
         """
-        self._logger.debug('Setup decap vanilla ' + str(self._vswitch_class))
+        self._logger.debug('Setup decap vanilla %s', str(self._vswitch_class))
 
         try:
             self._vswitch.start()
@@ -261,7 +261,7 @@ class VswitchControllerOP2P(IVswitchController):
     def stop(self):
         """Tears down the switch created in setup().
         """
-        self._logger.debug('Stop using ' + str(self._vswitch_class))
+        self._logger.debug('Stop using %s', str(self._vswitch_class))
         self._vswitch.stop()
 
     def __enter__(self):
diff --git a/core/vswitch_controller_p2p.py b/core/vswitch_controller_p2p.py
index 0d41b145..eb1f57f0 100644
--- a/core/vswitch_controller_p2p.py
+++ b/core/vswitch_controller_p2p.py
@@ -46,13 +46,13 @@ class VswitchControllerP2P(IVswitchController):
         self._vswitch_class = vswitch_class
         self._vswitch = vswitch_class()
         self._deployment_scenario = "P2P"
-        self._logger.debug('Creation using ' + str(self._vswitch_class))
+        self._logger.debug('Creation using %s', str(self._vswitch_class))
         self._traffic = traffic.copy()
 
     def setup(self):
         """Sets up the switch for p2p.
         """
-        self._logger.debug('Setup using ' + str(self._vswitch_class))
+        self._logger.debug('Setup using %s', str(self._vswitch_class))
 
         try:
             self._vswitch.start()
@@ -109,7 +109,7 @@ class VswitchControllerP2P(IVswitchController):
     def stop(self):
         """Tears down the switch created in setup().
         """
-        self._logger.debug('Stop using ' + str(self._vswitch_class))
+        self._logger.debug('Stop using %s', str(self._vswitch_class))
         self._vswitch.stop()
 
     def __enter__(self):
@@ -126,7 +126,7 @@ class VswitchControllerP2P(IVswitchController):
     def get_ports_info(self):
         """See IVswitchController for description
         """
-        self._logger.debug('get_ports_info  using ' + str(self._vswitch_class))
+        self._logger.debug('get_ports_info  using %s', str(self._vswitch_class))
         return self._vswitch.get_ports(settings.getValue('VSWITCH_BRIDGE_NAME'))
 
     def dump_vswitch_flows(self):
diff --git a/core/vswitch_controller_ptunp.py b/core/vswitch_controller_ptunp.py
index 27d26789..853c7d5c 100644
--- a/core/vswitch_controller_ptunp.py
+++ b/core/vswitch_controller_ptunp.py
@@ -59,13 +59,13 @@ class VswitchControllerPtunP(IVswitchController):
         self.br_mod_ip1 = settings.getValue('TUNNEL_MODIFY_BRIDGE_IP1')
         self.br_mod_ip2 = settings.getValue('TUNNEL_MODIFY_BRIDGE_IP2')
         self.tunnel_type = settings.getValue('TUNNEL_TYPE')
-        self._logger.debug('Creation using ' + str(self._vswitch_class))
+        self._logger.debug('Creation using %s', str(self._vswitch_class))
 
     def setup(self):
         """ Sets up the switch for VxLAN overlay PTUNP (tunnel encap or decap)
         """
         self._logger.debug('Setting up phy-tun-phy tunneling scenario')
-        if self.tunnel_type is 'vxlan':
+        if self.tunnel_type == 'vxlan':
             self._setup_vxlan_encap_decap()
         else:
             self._logger.error("Only VxLAN is supported for now")
@@ -78,7 +78,7 @@ class VswitchControllerPtunP(IVswitchController):
             physical ports. Two more bridges br-mod1 and br-mod2 to mangle
             and redirect the packets from one tunnel port to other.
         """
-        self._logger.debug('Setup using ' + str(self._vswitch_class))
+        self._logger.debug('Setup using %s', str(self._vswitch_class))
         try:
             self._vswitch.start()
             self._vswitch.add_switch(self.bridge_phy1)
@@ -204,7 +204,7 @@ class VswitchControllerPtunP(IVswitchController):
     def stop(self):
         """Tears down the switch created in setup().
         """
-        self._logger.debug('Stop using ' + str(self._vswitch_class))
+        self._logger.debug('Stop using %s', str(self._vswitch_class))
         self._vswitch.stop()
 
     def __enter__(self):
@@ -221,7 +221,7 @@ class VswitchControllerPtunP(IVswitchController):
     def get_ports_info(self):
         """See IVswitchController for description
         """
-        self._logger.debug('get_ports_info using ' + str(self._vswitch_class))
+        self._logger.debug('get_ports_info using %s', str(self._vswitch_class))
         ports = self._vswitch.get_ports(self.bridge_phy1) +\
                 self._vswitch.get_ports(self.bridge_mod1) +\
                 self._vswitch.get_ports(self.bridge_phy2) +\
@@ -231,7 +231,7 @@ class VswitchControllerPtunP(IVswitchController):
     def dump_vswitch_flows(self):
         """See IVswitchController for description
         """
-        self._logger.debug('dump_flows using ' + str(self._vswitch_class))
+        self._logger.debug('dump_flows using %s', str(self._vswitch_class))
         self._vswitch.dump_flows(self.bridge_phy1)
         self._vswitch.dump_flows(self.bridge_mod1)
         self._vswitch.dump_flows(self.bridge_phy2)
diff --git a/core/vswitch_controller_pxp.py b/core/vswitch_controller_pxp.py
index d4d1e764..e3c208a3 100644
--- a/core/vswitch_controller_pxp.py
+++ b/core/vswitch_controller_pxp.py
@@ -57,13 +57,13 @@ class VswitchControllerPXP(IVswitchController):
 
         self._traffic = traffic.copy()
         self._bidir = True if self._traffic['bidir'] == 'True' else False
-        self._logger.debug('Creation using ' + str(self._vswitch_class))
+        self._logger.debug('Creation using %s', str(self._vswitch_class))
         self._bridge = settings.getValue('VSWITCH_BRIDGE_NAME')
 
     def setup(self):
         """ Sets up the switch for PXP
         """
-        self._logger.debug('Setup using ' + str(self._vswitch_class))
+        self._logger.debug('Setup using %s', str(self._vswitch_class))
 
         try:
             self._vswitch.start()
@@ -182,7 +182,7 @@ class VswitchControllerPXP(IVswitchController):
     def stop(self):
         """Tears down the switch created in setup().
         """
-        self._logger.debug('Stop using ' + str(self._vswitch_class))
+        self._logger.debug('Stop using %s', str(self._vswitch_class))
         self._vswitch.stop()
 
     def _add_flow(self, flow, port1, port2, reverse_flow=False):
@@ -212,7 +212,7 @@ class VswitchControllerPXP(IVswitchController):
     def get_ports_info(self):
         """See IVswitchController for description
         """
-        self._logger.debug('get_ports_info  using ' + str(self._vswitch_class))
+        self._logger.debug('get_ports_info  using %s', str(self._vswitch_class))
         return self._vswitch.get_ports(self._bridge)
 
     def dump_vswitch_flows(self):