Merge "python: Pylint 1.8.2 code conformity"

51 files changed, 175 insertions, 195 deletions

diff --git a/conf/__init__.py b/conf/__init__.py
index d5d26757..83c5475f 100644
--- a/conf/__init__.py
+++ b/conf/__init__.py
@@ -70,7 +70,7 @@ class Settings(object):
                     except AttributeError:
                         pass
             return param
-        elif isinstance(param, list) or isinstance(param, tuple):
+        elif isinstance(param, (list, tuple)):
             tmp_list = []
             for item in param:
                 tmp_list.append(self._eval_param(item))
@@ -229,7 +229,7 @@ class Settings(object):
             if key not in self.__dict__ and key not in _EXTRA_TEST_PARAMS:
                 unknown_keys.append(key)
 
-        if len(unknown_keys):
+        if unknown_keys:
             raise RuntimeError('Test parameters contain unknown configuration '
                                'parameter(s): {}'.format(', '.join(unknown_keys)))
 
@@ -270,7 +270,7 @@ class Settings(object):
             for vmindex in range(vm_number):
                 value = master_value_str.replace('#VMINDEX', str(vmindex))
                 for macro, args, param, _, step in re.findall(_PARSE_PATTERN, value):
-                    multi = int(step) if len(step) and int(step) else 1
+                    multi = int(step) if step and int(step) else 1
                     if macro == '#EVAL':
                         # pylint: disable=eval-used
                         tmp_result = str(eval(param))
@@ -325,13 +325,13 @@ class Settings(object):
         assert result == self.getValue(attr)
         return True
 
-    def validate_setValue(self, dummy_result, name, value):
+    def validate_setValue(self, _dummy_result, name, value):
         """Verifies, that value was correctly set
         """
         assert value == self.__dict__[name]
         return True
 
-    def validate_resetValue(self, dummy_result, attr):
+    def validate_resetValue(self, _dummy_result, attr):
         """Verifies, that value was correctly reset
         """
         return 'TEST_PARAMS' not in self.__dict__ or \
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):
diff --git a/pylintrc b/pylintrc
index d35114e1..3e7e9645 100644
--- a/pylintrc
+++ b/pylintrc
@@ -76,7 +76,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=E1602,E1603,E1601,E1606,E1607,E1604,E1605,E1608,W0401,W1604,W1605,W1606,W1607,W1601,W1602,W1603,W1622,W1623,W1620,W1621,W1608,W1609,W1624,W1625,W1618,W1626,W1627,I0021,I0020,W0704,R0903,W1613,W1638,W1611,W1610,W1617,W1616,W1615,W1614,W1630,W1619,W1632,W1635,W1634,W1637,W1636,W1639,W1612,W1628,W1633,W1629,I0011,W1640
+disable=E1602,E1603,E1601,E1606,E1607,E1604,E1605,E1608,W0401,W1604,W1605,W1606,W1607,W1601,W1602,W1603,W1622,W1623,W1620,W1621,W1608,W1609,W1624,W1625,W1618,W1626,W1627,I0021,I0020,W0704,R0903,W1613,W1638,W1611,W1610,W1617,W1616,W1615,W1614,W1630,W1619,W1632,W1635,W1634,W1637,W1636,W1639,W1612,W1628,W1633,W1629,I0011,W1640,R1705
 
 
 [REPORTS]
diff --git a/requirements.txt b/requirements.txt
index 894c1cc5..fdcff13b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ xmlrunner==1.7.7
 requests==2.8.1
 netaddr==0.7.18
 scapy-python3==0.18
-pylint==1.5.6
+pylint==1.8.2
 pyzmq==14.5.0
 distro
 stcrestclient
diff --git a/src/__init__.py b/src/__init__.py
index 9293b4f8..c784ea3c 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -18,4 +18,3 @@ No functionality is expected for this package and its purpose is just to
 keep Python package structure intact without extra requirements for
 PYTHONPATH.
 """
-
diff --git a/src/dpdk/dpdk.py b/src/dpdk/dpdk.py
index 2f120129..c2e656ef 100644
--- a/src/dpdk/dpdk.py
+++ b/src/dpdk/dpdk.py
@@ -140,7 +140,7 @@ def _vhost_user_cleanup():
 def _bind_nics():
     """Bind NICs using the bind tool specified in the configuration.
     """
-    if not len(_NICS_PCI):
+    if not _NICS_PCI:
         _LOGGER.info('NICs are not configured - nothing to bind')
         return
     try:
@@ -171,7 +171,7 @@ def _bind_nics():
 def _unbind_nics():
     """Unbind NICs using the bind tool specified in the configuration.
     """
-    if not len(_NICS_PCI):
+    if not _NICS_PCI:
         _LOGGER.info('NICs are not configured - nothing to unbind')
         return
     try:
diff --git a/src/ovs/dpctl.py b/src/ovs/dpctl.py
index 015fb38c..5030223e 100644
--- a/src/ovs/dpctl.py
+++ b/src/ovs/dpctl.py
@@ -60,5 +60,5 @@ class DPCtl(object):
 
         :return: None
         """
-        self.logger.debug('delete datapath ' + dp_name)
+        self.logger.debug('delete datapath %s', dp_name)
         self.run_dpctl(['del-dp', dp_name])
diff --git a/src/ovs/ofctl.py b/src/ovs/ofctl.py
index 110940c8..b023e080 100644
--- a/src/ovs/ofctl.py
+++ b/src/ovs/ofctl.py
@@ -469,4 +469,4 @@ def flow_match(flow_dump, flow_src):
     for rule in flow_src_list:
         if rule in flow_dump_list:
             flow_src_ctrl.remove(rule)
-    return True if not len(flow_src_ctrl) else False
+    return True if not flow_src_ctrl else False
diff --git a/testcases/integration.py b/testcases/integration.py
index f87a8ee2..8cfe5af5 100644
--- a/testcases/integration.py
+++ b/testcases/integration.py
@@ -17,7 +17,7 @@
 import logging
 
 from collections import OrderedDict
-from testcases import TestCase
+from testcases.testcase import TestCase
 
 class IntegrationTestCase(TestCase):
     """IntegrationTestCase class
diff --git a/testcases/performance.py b/testcases/performance.py
index a82b5d1c..1b67911e 100644
--- a/testcases/performance.py
+++ b/testcases/performance.py
@@ -16,7 +16,7 @@
 
 import logging
 
-from testcases import TestCase
+from testcases.testcase import TestCase
 from tools.report import report
 
 class PerformanceTestCase(TestCase):
diff --git a/testcases/testcase.py b/testcases/testcase.py
index 18c3186c..f28519fa 100644
--- a/testcases/testcase.py
+++ b/testcases/testcase.py
@@ -287,7 +287,7 @@ class TestCase(object):
         # cleanup any namespaces created
         if os.path.isdir('/tmp/namespaces'):
             namespace_list = os.listdir('/tmp/namespaces')
-            if len(namespace_list):
+            if namespace_list:
                 self._logger.info('Cleaning up namespaces')
             for name in namespace_list:
                 namespace.delete_namespace(name)
@@ -295,7 +295,7 @@ class TestCase(object):
         # cleanup any veth ports created
         if os.path.isdir('/tmp/veth'):
             veth_list = os.listdir('/tmp/veth')
-            if len(veth_list):
+            if veth_list:
                 self._logger.info('Cleaning up veth ports')
             for eth in veth_list:
                 port1, port2 = eth.split('-')
@@ -322,8 +322,8 @@ class TestCase(object):
             if len(self._tc_results) < len(results):
                 if len(self._tc_results) > 1:
                     raise RuntimeError('Testcase results do not match:'
-                                       'results: {}\n'
-                                       'trafficgen results: {}\n',
+                                       'results: %s\n'
+                                       'trafficgen results: %s\n' %
                                        self._tc_results,
                                        results)
                 else:
@@ -379,7 +379,7 @@ class TestCase(object):
         self._testcase_run_time = time.strftime("%H:%M:%S",
                                                 time.gmtime(self._testcase_stop_time -
                                                             self._testcase_start_time))
-        logging.info("Testcase execution time: " + self._testcase_run_time)
+        logging.info("Testcase execution time: %s", self._testcase_run_time)
         # report test results
         self.run_report()
 
@@ -562,7 +562,7 @@ class TestCase(object):
         """
         with open(output, 'a') as csvfile:
 
-            logging.info("Write results to file: " + output)
+            logging.info("Write results to file: %s", output)
             fieldnames = TestCase._get_unique_keys(results)
 
             writer = csv.DictWriter(csvfile, fieldnames)
@@ -720,7 +720,7 @@ class TestCase(object):
                         self._logger.debug("Skipping %s as it isn't a configuration "
                                            "parameter.", '${}'.format(macro[0]))
             return param
-        elif isinstance(param, list) or isinstance(param, tuple):
+        elif isinstance(param, (list, tuple)):
             tmp_list = []
             for item in param:
                 tmp_list.append(self.step_eval_param(item, step_result))
@@ -758,9 +758,6 @@ class TestCase(object):
         # initialize list with results
         self._step_result = [None] * len(self.test)
 
-        # We have to suppress pylint report, because test_object has to be set according
-        # to the test step definition
-        # pylint: disable=redefined-variable-type
         # run test step by step...
         for i, step in enumerate(self.test):
             step_ok = not self._step_check
diff --git a/tools/collectors/collectd/collectd.py b/tools/collectors/collectd/collectd.py
index 90df6b04..700aef47 100644
--- a/tools/collectors/collectd/collectd.py
+++ b/tools/collectors/collectd/collectd.py
@@ -47,7 +47,7 @@ def get_label(sample):
     for label in YLABELS:
         if any(r in sample for r in YLABELS[label]):
             return label
-
+    return None
 
 def plot_graphs(dict_of_arrays):
     """
@@ -259,7 +259,7 @@ class Collectd(collector.ICollector):
         plot_graphs(self.results)
         proc_stats = get_results_to_print(self.results)
         for process in proc_stats:
-            logging.info("Process: " + '_'.join(process.split('_')[:-1]))
+            logging.info("Process: %s", '_'.join(process.split('_')[:-1]))
             for(key, value) in proc_stats[process].items():
                 logging.info("         Statistic: " + str(key) +
                              ", Value: " + str(value))
diff --git a/tools/collectors/collectd/collectd_bucky.py b/tools/collectors/collectd/collectd_bucky.py
index bac24ed7..f6061c55 100644
--- a/tools/collectors/collectd/collectd_bucky.py
+++ b/tools/collectors/collectd/collectd_bucky.py
@@ -498,6 +498,7 @@ class CollectDCrypto(object):
             return self.parse_signed(part_len, data)
         if sec_level == 2:
             return self.parse_encrypted(part_len, data)
+        return None
 
     def parse_signed(self, part_len, data):
         """
@@ -574,12 +575,12 @@ class CollectDConverter(object):
         try:
             name_parts = handler(sample)
             if name_parts is None:
-                return  # treat None as "ignore sample"
+                return None  # treat None as "ignore sample"
             name = '.'.join(name_parts)
         except (AttributeError, IndexError, MemoryError, RuntimeError):
             LOG.exception("Exception in sample handler  %s (%s):",
                           sample["plugin"], handler)
-            return
+            return None
         host = sample.get("host", "")
         return (
             host,
@@ -655,7 +656,7 @@ class CollectDHandler(object):
         Check the value range
         """
         if val is None:
-            return
+            return None
         try:
             vmin, vmax = self.parser.types.type_ranges[stype][vname]
         except KeyError:
@@ -664,11 +665,11 @@ class CollectDHandler(object):
         if vmin is not None and val < vmin:
             LOG.debug("Invalid value %s (<%s) for %s", val, vmin, vname)
             LOG.debug("Last sample: %s", self.last_sample)
-            return
+            return None
         if vmax is not None and val > vmax:
             LOG.debug("Invalid value %s (>%s) for %s", val, vmax, vname)
             LOG.debug("Last sample: %s", self.last_sample)
-            return
+            return None
         return val
 
     def calculate(self, host, name, vtype, val, time):
@@ -684,7 +685,7 @@ class CollectDHandler(object):
         if vtype not in handlers:
             LOG.error("Invalid value type %s for %s", vtype, name)
             LOG.info("Last sample: %s", self.last_sample)
-            return
+            return None
         return handlers[vtype](host, name, val, time)
 
     def _calc_counter(self, host, name, val, time):
@@ -694,13 +695,13 @@ class CollectDHandler(object):
         key = (host, name)
         if key not in self.prev_samples:
             self.prev_samples[key] = (val, time)
-            return
+            return None
         pval, ptime = self.prev_samples[key]
         self.prev_samples[key] = (val, time)
         if time <= ptime:
             LOG.error("Invalid COUNTER update for: %s:%s", key[0], key[1])
             LOG.info("Last sample: %s", self.last_sample)
-            return
+            return None
         if val < pval:
             # this is supposed to handle counter wrap around
             # see https://collectd.org/wiki/index.php/Data_source
@@ -719,13 +720,13 @@ class CollectDHandler(object):
         key = (host, name)
         if key not in self.prev_samples:
             self.prev_samples[key] = (val, time)
-            return
+            return None
         pval, ptime = self.prev_samples[key]
         self.prev_samples[key] = (val, time)
         if time <= ptime:
             LOG.debug("Invalid DERIVE update for: %s:%s", key[0], key[1])
             LOG.debug("Last sample: %s", self.last_sample)
-            return
+            return None
         return float(abs(val - pval)) / (time - ptime)
 
     def _calc_absolute(self, host, name, val, time):
@@ -735,13 +736,13 @@ class CollectDHandler(object):
         key = (host, name)
         if key not in self.prev_samples:
             self.prev_samples[key] = (val, time)
-            return
+            return None
         _, ptime = self.prev_samples[key]
         self.prev_samples[key] = (val, time)
         if time <= ptime:
             LOG.error("Invalid ABSOLUTE update for: %s:%s", key[0], key[1])
             LOG.info("Last sample: %s", self.last_sample)
-            return
+            return None
         return float(val) / (time - ptime)
 
 
diff --git a/tools/collectors/sysmetrics/pidstat.py b/tools/collectors/sysmetrics/pidstat.py
index 99341ccf..245d8d22 100644
--- a/tools/collectors/sysmetrics/pidstat.py
+++ b/tools/collectors/sysmetrics/pidstat.py
@@ -70,7 +70,7 @@ class Pidstat(collector.ICollector):
         into the file in directory with test results
         """
         monitor = settings.getValue('PIDSTAT_MONITOR')
-        self._logger.info('Statistics are requested for: ' + ', '.join(monitor))
+        self._logger.info('Statistics are requested for: %s', ', '.join(monitor))
         pids = systeminfo.get_pids(monitor)
         if pids:
             with open(self._log, 'w') as logfile:
@@ -135,7 +135,7 @@ class Pidstat(collector.ICollector):
         """Logs collected statistics.
         """
         for process in self._results:
-            logging.info("Process: " + '_'.join(process.split('_')[:-1]))
+            logging.info("Process: %s", '_'.join(process.split('_')[:-1]))
             for(key, value) in self._results[process].items():
                 logging.info("         Statistic: " + str(key) +
                              ", Value: " + str(value))
diff --git a/tools/functions.py b/tools/functions.py
index d35f1f84..65c9978b 100644
--- a/tools/functions.py
+++ b/tools/functions.py
@@ -127,7 +127,7 @@ def settings_update_paths():
             # expand OS wildcards in paths if needed
             if glob.has_magic(tmp_tool):
                 tmp_glob = glob.glob(tmp_tool)
-                if len(tmp_glob) == 0:
+                if not tmp_glob:
                     raise RuntimeError('Path to the {} is not valid: {}.'.format(tool, tmp_tool))
                 elif len(tmp_glob) > 1:
                     raise RuntimeError('Path to the {} is ambiguous {}'.format(tool, tmp_glob))
diff --git a/tools/load_gen/stress_ng/stress_ng.py b/tools/load_gen/stress_ng/stress_ng.py
index c2592dd1..41bfe990 100644
--- a/tools/load_gen/stress_ng/stress_ng.py
+++ b/tools/load_gen/stress_ng/stress_ng.py
@@ -30,6 +30,3 @@ class StressNg(Stress):
         'name': 'stress-ng'
     }
     _logger = logging.getLogger(__name__)
-
-    def __init__(self, stress_config):
-        super(StressNg, self).__init__(stress_config)
diff --git a/tools/load_gen/stressorvm/stressor_vm.py b/tools/load_gen/stressorvm/stressor_vm.py
index 410f10e3..f4936743 100644
--- a/tools/load_gen/stressorvm/stressor_vm.py
+++ b/tools/load_gen/stressorvm/stressor_vm.py
@@ -45,7 +45,7 @@ class QemuVM(tasks.Process):
             try:
                 os.makedirs(self._shared_dir)
             except OSError as exp:
-                raise OSError("Failed to create shared directory %s: %s",
+                raise OSError("Failed to create shared directory %s: %s" %
                               self._shared_dir, exp)
 
         self.nics_nr = S.getValue('NN_NICS_NR')[self._number]
@@ -96,8 +96,7 @@ class StressorVM(ILoadGenerator):
     """
     Wrapper Class for Load-Generation through stressor-vm
     """
-    # pylint: disable=unused-argument
-    def __init__(self, config):
+    def __init__(self, _config):
         self.qvm_list = []
         for vmindex in range(int(S.getValue('NN_COUNT'))):
             qvm = QemuVM(vmindex)
diff --git a/tools/module_manager.py b/tools/module_manager.py
index dd1d92be..943399ba 100644
--- a/tools/module_manager.py
+++ b/tools/module_manager.py
@@ -160,7 +160,7 @@ class ModuleManager(object):
             self._logger.info('Unable to get list of dependecies for module \'%s\'.', module)
             # ...and try to continue, just for case that dependecies are already loaded
 
-        if len(deps):
+        if deps:
             return deps.split(',')
         else:
             return []
diff --git a/tools/namespace.py b/tools/namespace.py
index 9131398f..50374b95 100644
--- a/tools/namespace.py
+++ b/tools/namespace.py
@@ -135,9 +135,8 @@ def reset_port_to_root(port, name):
                        port, name), False)
 
 
-# pylint: disable=unused-argument
 # pylint: disable=invalid-name
-def validate_add_ip_to_namespace_eth(result, port, name, ip_addr, cidr):
+def validate_add_ip_to_namespace_eth(_result, port, name, ip_addr, cidr):
     """
     Validation function for integration testcases
     """
@@ -147,7 +146,7 @@ def validate_add_ip_to_namespace_eth(result, port, name, ip_addr, cidr):
         _LOGGER, 'Validating ip address in namespace...', False))
 
 
-def validate_assign_port_to_namespace(result, port, name, port_up=False):
+def validate_assign_port_to_namespace(_result, port, name, _port_up=False):
     """
     Validation function for integration testcases
     """
@@ -157,14 +156,14 @@ def validate_assign_port_to_namespace(result, port, name, port_up=False):
         _LOGGER, 'Validating port in namespace...'))
 
 
-def validate_create_namespace(result, name):
+def validate_create_namespace(_result, name):
     """
     Validation function for integration testcases
     """
     return name in get_system_namespace_list()
 
 
-def validate_delete_namespace(result, name):
+def validate_delete_namespace(_result, name):
     """
     Validation function for integration testcases
     """
diff --git a/tools/networkcard.py b/tools/networkcard.py
index 2cd296fb..758010d2 100644
--- a/tools/networkcard.py
+++ b/tools/networkcard.py
@@ -191,7 +191,7 @@ def get_mac(pci_handle):
     """
     mac_path = glob.glob(os.path.join(_PCI_DIR, _PCI_NET, '*', 'address').format(pci_handle))
     # kernel driver is loaded and MAC can be read
-    if len(mac_path) and os.path.isfile(mac_path[0]):
+    if mac_path and os.path.isfile(mac_path[0]):
         with open(mac_path[0], 'r') as _file:
             return _file.readline().rstrip('\n')
 
diff --git a/tools/pkt_gen/dummy/dummy.py b/tools/pkt_gen/dummy/dummy.py
index 3dc5448e..b0558b6e 100755
--- a/tools/pkt_gen/dummy/dummy.py
+++ b/tools/pkt_gen/dummy/dummy.py
@@ -273,4 +273,5 @@ if __name__ == '__main__':
         print(dev.send_cont_traffic(traffic=TRAFFIC))
         print(dev.send_rfc2544_throughput(traffic=TRAFFIC))
         print(dev.send_rfc2544_back2back(traffic=TRAFFIC))
+        # pylint: disable=no-member
         print(dev.send_rfc(traffic=TRAFFIC))
diff --git a/tools/pkt_gen/ixia/ixia.py b/tools/pkt_gen/ixia/ixia.py
index d4ca56f2..ffb1f5e3 100755
--- a/tools/pkt_gen/ixia/ixia.py
+++ b/tools/pkt_gen/ixia/ixia.py
@@ -157,8 +157,8 @@ class Ixia(trafficgen.ITrafficGenerator):
         return NotImplementedError(
             'Ixia start back2back traffic not implemented')
 
-    def send_rfc2544_back2back(self, traffic=None, duration=60,
-                               lossrate=0.0, tests=1):
+    def send_rfc2544_back2back(self, traffic=None, tests=1, duration=60,
+                               lossrate=0.0):
         return NotImplementedError(
             'Ixia send back2back traffic not implemented')
 
diff --git a/tools/pkt_gen/ixnet/ixnet.py b/tools/pkt_gen/ixnet/ixnet.py
index d1ba9096..e2223e14 100755
--- a/tools/pkt_gen/ixnet/ixnet.py
+++ b/tools/pkt_gen/ixnet/ixnet.py
@@ -370,7 +370,7 @@ class IxNet(trafficgen.ITrafficGenerator):
                 next(reader)
                 for row in reader:
                     #Replace null entries added by Ixia with 0s.
-                    row = [entry if len(entry) > 0 else '0' for entry in row]
+                    row = [entry if entry else '0' for entry in row]
 
                     # tx_fps and tx_mps cannot be reliably calculated
                     # as the DUT may be modifying the frame size
diff --git a/tools/pkt_gen/moongen/moongen.py b/tools/pkt_gen/moongen/moongen.py
index 570720e8..2ac2ec31 100644
--- a/tools/pkt_gen/moongen/moongen.py
+++ b/tools/pkt_gen/moongen/moongen.py
@@ -64,46 +64,46 @@ class Moongen(ITrafficGenerator):
         :param one_shot: No RFC 2544 binary search,
                         just packet flow at traffic specifics
         """
-        logging.debug("traffic['frame_rate'] = " + \
+        logging.debug("traffic['frame_rate'] = %s", \
             str(traffic['frame_rate']))
 
-        logging.debug("traffic['multistream'] = " + \
+        logging.debug("traffic['multistream'] = %s", \
             str(traffic['multistream']))
 
-        logging.debug("traffic['stream_type'] = " + \
+        logging.debug("traffic['stream_type'] = %s", \
             str(traffic['stream_type']))
 
-        logging.debug("traffic['l2']['srcmac'] = " + \
+        logging.debug("traffic['l2']['srcmac'] = %s", \
             str(traffic['l2']['srcmac']))
 
-        logging.debug("traffic['l2']['dstmac'] = " + \
+        logging.debug("traffic['l2']['dstmac'] = %s", \
             str(traffic['l2']['dstmac']))
 
-        logging.debug("traffic['l3']['proto'] = " + \
+        logging.debug("traffic['l3']['proto'] = %s", \
             str(traffic['l3']['proto']))
 
-        logging.debug("traffic['l3']['srcip'] = " + \
+        logging.debug("traffic['l3']['srcip'] = %s", \
             str(traffic['l3']['srcip']))
 
-        logging.debug("traffic['l3']['dstip'] = " + \
+        logging.debug("traffic['l3']['dstip'] = %s", \
             str(traffic['l3']['dstip']))
 
-        logging.debug("traffic['l4']['srcport'] = " + \
+        logging.debug("traffic['l4']['srcport'] = %s", \
             str(traffic['l4']['srcport']))
 
-        logging.debug("traffic['l4']['dstport'] = " + \
+        logging.debug("traffic['l4']['dstport'] = %s", \
             str(traffic['l4']['dstport']))
 
-        logging.debug("traffic['vlan']['enabled'] = " + \
+        logging.debug("traffic['vlan']['enabled'] = %s", \
             str(traffic['vlan']['enabled']))
 
-        logging.debug("traffic['vlan']['id'] = " + \
+        logging.debug("traffic['vlan']['id'] = %s", \
             str(traffic['vlan']['id']))
 
-        logging.debug("traffic['vlan']['priority'] = " + \
+        logging.debug("traffic['vlan']['priority'] = %s", \
             str(traffic['vlan']['priority']))
 
-        logging.debug("traffic['vlan']['cfi'] = " + \
+        logging.debug("traffic['vlan']['cfi'] = %s", \
             str(traffic['vlan']['cfi']))
 
         logging.debug(traffic['l2']['framesize'])
@@ -160,9 +160,9 @@ class Moongen(ITrafficGenerator):
             (traffic['frame_rate'] / 100) * (self._moongen_line_speed / \
             (8 * (traffic['l2']['framesize'] + 20)) / math.pow(10, 6)))
 
-        logging.debug("startRate = " + start_rate)
+        logging.debug("startRate = %s", start_rate)
 
-        out_file.write("startRate = " + \
+        out_file.write("startRate = %s" % \
             start_rate + "\n")
 
         out_file.write("}" + "\n")
@@ -508,8 +508,8 @@ class Moongen(ITrafficGenerator):
 
         return moongen_results
 
-    def send_rfc2544_throughput(self, traffic=None, duration=20,
-                                lossrate=0.0, tests=1):
+    def send_rfc2544_throughput(self, traffic=None, tests=1, duration=20,
+                                lossrate=0.0):
         #
         # Send traffic per RFC2544 throughput test specifications.
         #
@@ -631,8 +631,8 @@ class Moongen(ITrafficGenerator):
         """
         self._logger.info('In moongen wait_rfc2544_throughput')
 
-    def send_rfc2544_back2back(self, traffic=None, duration=60,
-                               lossrate=0.0, tests=1):
+    def send_rfc2544_back2back(self, traffic=None, tests=1, duration=60,
+                               lossrate=0.0):
         """Send traffic per RFC2544 back2back test specifications.
 
         Send packets at a fixed rate, using ``traffic``
diff --git a/tools/pkt_gen/testcenter/testcenter.py b/tools/pkt_gen/testcenter/testcenter.py
index 9980ae7c..ec2a14bd 100644
--- a/tools/pkt_gen/testcenter/testcenter.py
+++ b/tools/pkt_gen/testcenter/testcenter.py
@@ -246,8 +246,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
                     row["ForwardingRate(fps)"])
         return result
 
-    # pylint: disable=unused-argument
-    def send_rfc2889_forwarding(self, traffic=None, tests=1, duration=20):
+    def send_rfc2889_forwarding(self, traffic=None, tests=1, _duration=20):
         """
         Send traffic per RFC2889 Forwarding test specifications.
         """
@@ -257,7 +256,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
                 framesize = traffic['l2']['framesize']
         args = get_rfc2889_common_settings(framesize, tests,
                                            traffic['traffic_type'])
-        if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
+        if settings.getValue("TRAFFICGEN_STC_VERBOSE") == "True":
             args.append("--verbose")
             verbose = True
             self._logger.debug("Arguments used to call test: %s", args)
@@ -273,7 +272,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
 
         return self.get_rfc2889_forwarding_results(filec)
 
-    def send_rfc2889_caching(self, traffic=None, tests=1, duration=20):
+    def send_rfc2889_caching(self, traffic=None, tests=1, _duration=20):
         """
         Send as per RFC2889 Addr-Caching test specifications.
         """
@@ -286,7 +285,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
         custom_args = get_rfc2889_custom_settings()
         args = common_args + custom_args
 
-        if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
+        if settings.getValue("TRAFFICGEN_STC_VERBOSE") == "True":
             args.append("--verbose")
             verbose = True
             self._logger.debug("Arguments used to call test: %s", args)
@@ -302,7 +301,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
 
         return self.get_rfc2889_addr_caching_results(filec)
 
-    def send_rfc2889_learning(self, traffic=None, tests=1, duration=20):
+    def send_rfc2889_learning(self, traffic=None, tests=1, _duration=20):
         """
         Send traffic per RFC2889 Addr-Learning test specifications.
         """
@@ -315,7 +314,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
         custom_args = get_rfc2889_custom_settings()
         args = common_args + custom_args
 
-        if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
+        if settings.getValue("TRAFFICGEN_STC_VERBOSE") == "True":
             args.append("--verbose")
             verbose = True
             self._logger.debug("Arguments used to call test: %s", args)
@@ -387,7 +386,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
                                                           custom, 1)
         args = rfc2544_common_args + stc_common_args + rfc2544_custom_args
 
-        if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
+        if settings.getValue("TRAFFICGEN_STC_VERBOSE") == "True":
             args.append("--verbose")
             verbose = True
             self._logger.debug("Arguments used to call test: %s", args)
@@ -420,7 +419,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
                                                           tests)
         args = rfc2544_common_args + stc_common_args + rfc2544_custom_args
 
-        if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
+        if settings.getValue("TRAFFICGEN_STC_VERBOSE") == "True":
             args.append("--verbose")
             verbose = True
             self._logger.debug("Arguments used to call test: %s", args)
@@ -453,7 +452,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
                                                           tests)
         args = rfc2544_common_args + stc_common_args + rfc2544_custom_args
 
-        if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
+        if settings.getValue("TRAFFICGEN_STC_VERBOSE") == "True":
             args.append("--verbose")
             verbose = True
             self._logger.info("Arguments used to call test: %s", args)
@@ -498,4 +497,5 @@ if __name__ == '__main__':
     }
     with TestCenter() as dev:
         print(dev.send_rfc2544_throughput(traffic=TRAFFIC))
+        # pylint: disable=no-member
         print(dev.send_rfc2544_backtoback(traffic=TRAFFIC))
diff --git a/tools/pkt_gen/xena/XenaDriver.py b/tools/pkt_gen/xena/XenaDriver.py
index 6e39e47a..cdc82838 100644
--- a/tools/pkt_gen/xena/XenaDriver.py
+++ b/tools/pkt_gen/xena/XenaDriver.py
@@ -170,8 +170,7 @@ class KeepAliveThread(threading.Thread):
         self.finished = threading.Event()
         self.setDaemon(True)
         _LOGGER.debug(
-            'Xena Socket keep alive thread initiated, interval ' +
-            '{} seconds'.format(self.interval))
+            'Xena Socket keep alive thread initiated, interval %s seconds', self.interval)
 
     def stop(self):
         """ Thread stop. See python thread docs for more info
@@ -904,7 +903,7 @@ class XenaRXStats(object):
                 statdict[entry_id] = self._pack_stats(param, 3)
             elif param[1] == 'PR_TPLDS':
                 tid_list = self._pack_tplds_stats(param, 2)
-                if len(tid_list):
+                if tid_list:
                     statdict['pr_tplds'] = tid_list
             elif param[1] == 'PR_TPLDTRAFFIC':
                 if 'pr_tpldstraffic' in statdict:
diff --git a/tools/pkt_gen/xena/xena.py b/tools/pkt_gen/xena/xena.py
index b465b2db..c8988b06 100755
--- a/tools/pkt_gen/xena/xena.py
+++ b/tools/pkt_gen/xena/xena.py
@@ -276,10 +276,6 @@ class Xena(ITrafficGenerator):
         enable the pairs topology
         :return: None
         """
-        # set duplex mode, this code is valid, pylint complaining with a
-        # warning that many have complained about online.
-        # pylint: disable=redefined-variable-type
-
         try:
             if self._params['traffic']['bidir'] == "True":
                 j_file = XenaJSONMesh()
diff --git a/tools/report/report.py b/tools/report/report.py
index b3f15c1b..5d05e7ad 100644
--- a/tools/report/report.py
+++ b/tools/report/report.py
@@ -137,7 +137,6 @@ def generate(testcase):
             'tests': tests,
         }
         i = 0
-        # pylint: disable=no-member
         for output_file in output_files:
             template = template_env.get_template(_TEMPLATE_FILES[i])
             output_text = template.render(template_vars)
diff --git a/tools/systeminfo.py b/tools/systeminfo.py
index f34bcce6..6020d0e2 100644
--- a/tools/systeminfo.py
+++ b/tools/systeminfo.py
@@ -191,7 +191,7 @@ def get_bin_version(binary, regex):
         return None
 
     versions = re.findall(regex, output)
-    if len(versions):
+    if versions:
         return versions[0]
     else:
         return None
@@ -297,7 +297,7 @@ def get_version(app_name):
                     if not '16' in release:
                         tmp_ver[2] += line.rstrip('\n').split(' ')[2]
 
-        if len(tmp_ver[0]):
+        if tmp_ver[0]:
             app_version = '.'.join(tmp_ver)
         app_git_tag = get_git_tag(S.getValue('TOOLS')['dpdk_src'])
     elif app_name.lower().startswith('qemu'):
diff --git a/tools/teststepstools.py b/tools/teststepstools.py
index 33db8f79..db2d53e6 100644
--- a/tools/teststepstools.py
+++ b/tools/teststepstools.py
@@ -43,7 +43,7 @@ class TestStepsTools(object):
         return True
 
     @staticmethod
-    def validate_Assert(result, dummy_condition):
+    def validate_Assert(result, _dummy_condition):
         """ Validate evaluation of given `condition'
         """
         return result
@@ -56,7 +56,7 @@ class TestStepsTools(object):
         return eval(expression)
 
     @staticmethod
-    def validate_Eval(result, dummy_expression):
+    def validate_Eval(result, _dummy_expression):
         """ Validate result of python `expression' evaluation
         """
         return result is not None
@@ -76,7 +76,7 @@ class TestStepsTools(object):
         return True
 
     @staticmethod
-    def validate_Exec_Python(result, dummy_code):
+    def validate_Exec_Python(result, _dummy_code):
         """ Validate result of python `code' execution
         """
         return result
@@ -99,7 +99,7 @@ class TestStepsTools(object):
         return output
 
     @staticmethod
-    def validate_Exec_Shell(result, dummy_command, dummy_regex=None):
+    def validate_Exec_Shell(result, _dummy_command, _dummy_regex=None):
         """ validate result of shell `command' execution
         """
         return result is not None
@@ -115,7 +115,7 @@ class TestStepsTools(object):
             return None
 
     @staticmethod
-    def validate_Exec_Shell_Background(result, dummy_command, dummy_regex=None):
+    def validate_Exec_Shell_Background(result, _dummy_command, _dummy_regex=None):
         """ validate result of shell `command' execution on the background
         """
         return result is not None
diff --git a/tools/veth.py b/tools/veth.py
index 6418d11a..6d7c9962 100644
--- a/tools/veth.py
+++ b/tools/veth.py
@@ -84,8 +84,7 @@ def del_veth_port(port, peer_port):
                        port, peer_port), False)
 
 
-# pylint: disable=unused-argument
-def validate_add_veth_port(result, port, peer_port):
+def validate_add_veth_port(_result, port, peer_port):
     """
     Validation function for integration testcases
     """
@@ -93,7 +92,7 @@ def validate_add_veth_port(result, port, peer_port):
     return all([port in devs, peer_port in devs])
 
 
-def validate_bring_up_eth_port(result, eth_port, namespace=None):
+def validate_bring_up_eth_port(_result, eth_port, namespace=None):
     """
     Validation function for integration testcases
     """
@@ -110,7 +109,7 @@ def validate_bring_up_eth_port(result, eth_port, namespace=None):
     return True
 
 
-def validate_del_veth_port(result, port, peer_port):
+def validate_del_veth_port(_result, port, peer_port):
     """
     Validation function for integration testcases
     """
diff --git a/vnfs/__init__.py b/vnfs/__init__.py
index 34cacf4f..1743faf8 100644
--- a/vnfs/__init__.py
+++ b/vnfs/__init__.py
@@ -17,4 +17,3 @@
 This package contains an interface the VSPERF core uses for controlling
 VNFs and VNF-specific implementation modules of this interface.
 """
-
diff --git a/vnfs/qemu/__init__.py b/vnfs/qemu/__init__.py
index 82f32eb9..6ed326dd 100644
--- a/vnfs/qemu/__init__.py
+++ b/vnfs/qemu/__init__.py
@@ -17,4 +17,3 @@
 This package contains an implementation of the interface the VSPERF core
 uses for controlling VNFs using QEMU and DPDK's testpmd application.
 """
-
diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py
index a0128f44..7ba58c05 100644
--- a/vnfs/qemu/qemu.py
+++ b/vnfs/qemu/qemu.py
@@ -286,7 +286,7 @@ class IVnfQemu(IVnf):
         elif self._guest_loopback == 'linux_bridge':
             self._configure_linux_bridge()
         elif self._guest_loopback != 'clean':
-            raise RuntimeError('Unsupported guest loopback method "%s" was specified.',
+            raise RuntimeError('Unsupported guest loopback method "%s" was specified.' %
                                self._guest_loopback)
 
     def wait(self, prompt=None, timeout=30):
diff --git a/vnfs/vnf/__init__.py b/vnfs/vnf/__init__.py
index b7c43217..6a7a1547 100644
--- a/vnfs/vnf/__init__.py
+++ b/vnfs/vnf/__init__.py
@@ -15,4 +15,4 @@
 """VNF interface and helpers.
 """
 
-from vnfs import *
+import vnfs
diff --git a/vnfs/vnf/vnf.py b/vnfs/vnf/vnf.py
index 5ac2ada3..3ad1dcda 100644
--- a/vnfs/vnf/vnf.py
+++ b/vnfs/vnf/vnf.py
@@ -138,7 +138,7 @@ class IVnf(tasks.Process):
         self.execute(cmd)
         return self.wait(prompt=prompt, timeout=timeout)
 
-    def validate_start(self, dummyresult):
+    def validate_start(self, _dummyresult):
         """ Validate call of VNF start()
         """
         if self._child and self._child.isalive():
@@ -152,7 +152,7 @@ class IVnf(tasks.Process):
         return not self.validate_start(result)
 
     @staticmethod
-    def validate_execute_and_wait(result, dummy_cmd, dummy_timeout=30, dummy_prompt=''):
+    def validate_execute_and_wait(result, _dummy_cmd, _dummy_timeout=30, _dummy_prompt=''):
         """ Validate command execution within VNF
         """
         return len(result) > 0
diff --git a/vsperf b/vsperf
index d205ad1f..a1417420 100755
--- a/vsperf
+++ b/vsperf
@@ -116,7 +116,6 @@ def parse_arguments():
         e.g. --test-params "['x=z; y=(a,b)','x=z']"
         """
         def __call__(self, parser, namespace, values, option_string=None):
-
             if values[0] == '[':
                 input_list = ast.literal_eval(values)
                 parameter_list = []
@@ -327,7 +326,7 @@ def get_vswitch_names(rst_files):
     """ Function will return a list of vSwitches detected in given ``rst_files``.
     """
     vswitch_names = set()
-    if len(rst_files):
+    if rst_files:
         try:
             output = subprocess.check_output(['grep', '-h', '^* vSwitch'] + rst_files).decode().splitlines()
             for line in output:
@@ -335,7 +334,7 @@ def get_vswitch_names(rst_files):
                 if match:
                     vswitch_names.add(match.group(1))
 
-            if len(vswitch_names):
+            if vswitch_names:
                 return list(vswitch_names)
 
         except subprocess.CalledProcessError:
@@ -366,7 +365,7 @@ def generate_final_report():
     # check if there are any results in rst format
     rst_results = glob.glob(os.path.join(path, 'result*rst'))
     pkt_processors = get_vswitch_names(rst_results)
-    if len(rst_results):
+    if rst_results:
         try:
             test_report = os.path.join(path, '{}_{}'.format('_'.join(pkt_processors), _TEMPLATE_RST['final']))
             # create report caption directly - it is not worth to execute jinja machinery
@@ -474,7 +473,7 @@ def enable_sriov(nic_list):
                 sriov_nic.update({tmp_nic[0] : int(tmp_nic[1][2:])})
 
     # sriov is required for some NICs
-    if len(sriov_nic):
+    if sriov_nic:
         for nic in sriov_nic:
             # check if SRIOV is supported and enough virt interfaces are available
             if not networkcard.is_sriov_supported(nic) \
@@ -590,7 +589,7 @@ def vsperf_finalize():
         if os.path.exists(results_path):
             files_list = os.listdir(results_path)
             if files_list == []:
-                _LOGGER.info("Removing empty result directory: "  + results_path)
+                _LOGGER.info("Removing empty result directory: %s", results_path)
                 shutil.rmtree(results_path)
     except AttributeError:
         # skip it if parameter doesn't exist
@@ -758,7 +757,7 @@ def main():
 
     # create results directory
     if not os.path.exists(results_path):
-        _LOGGER.info("Creating result directory: "  + results_path)
+        _LOGGER.info("Creating result directory: %s", results_path)
         os.makedirs(results_path)
     # pylint: disable=too-many-nested-blocks
     if settings.getValue('mode') == 'trafficgen':
@@ -802,15 +801,11 @@ def main():
             # Default - run all tests
             selected_tests = testcases
 
-        if not len(selected_tests):
+        if not selected_tests:
             _LOGGER.error("No tests matched --tests option or positional args. Done.")
             vsperf_finalize()
             sys.exit(1)
 
-        # run tests
-        # Add pylint exception: Redefinition of test type from
-        # testcases.integration.IntegrationTestCase to testcases.performance.PerformanceTestCase
-        # pylint: disable=redefined-variable-type
         suite = unittest.TestSuite()
         settings_snapshot = copy.deepcopy(settings.__dict__)
 
diff --git a/vswitches/__init__.py b/vswitches/__init__.py
index a34475be..20a715e0 100644
--- a/vswitches/__init__.py
+++ b/vswitches/__init__.py
@@ -17,4 +17,3 @@
 This package contains an interface the VSPERF core uses for controlling
 vSwitches and vSwitch-specific implementation modules of this interface.
 """
-
diff --git a/vswitches/ovs.py b/vswitches/ovs.py
index 76cabb0d..9e49b2ee 100644
--- a/vswitches/ovs.py
+++ b/vswitches/ovs.py
@@ -166,7 +166,7 @@ class IVSwitchOvs(IVSwitch, tasks.Process):
 
         """
         if switch_name is None or remote_switch_name is None:
-            return
+            return None
 
         bridge = self._bridges[switch_name]
         remote_bridge = self._bridges[remote_switch_name]
@@ -382,7 +382,7 @@ class IVSwitchOvs(IVSwitch, tasks.Process):
             with open(self._ovsdb_pidfile_path, "r") as pidfile:
                 ovsdb_pid = pidfile.read().strip()
 
-            self._logger.info("Killing ovsdb with pid: " + ovsdb_pid)
+            self._logger.info("Killing ovsdb with pid: %s", ovsdb_pid)
 
             if ovsdb_pid:
                 tasks.terminate_task(ovsdb_pid, logger=self._logger)
@@ -409,7 +409,7 @@ class IVSwitchOvs(IVSwitch, tasks.Process):
     #
     # validate methods required for integration testcases
     #
-    def validate_add_switch(self, dummy_result, switch_name, dummy_params=None):
+    def validate_add_switch(self, _dummy_result, switch_name, _dummy_params=None):
         """Validate - Create a new logical switch with no ports
         """
         bridge = self._bridges[switch_name]
@@ -420,7 +420,7 @@ class IVSwitchOvs(IVSwitch, tasks.Process):
 
     # Method could be a function
     # pylint: disable=no-self-use
-    def validate_del_switch(self, dummy_result, switch_name):
+    def validate_del_switch(self, _dummy_result, switch_name):
         """Validate removal of switch
         """
         bridge = OFBridge('tmp')
@@ -444,7 +444,7 @@ class IVSwitchOvs(IVSwitch, tasks.Process):
         """
         return self.validate_add_phy_port(result, switch_name)
 
-    def validate_del_port(self, dummy_result, switch_name, port_name):
+    def validate_del_port(self, _dummy_result, switch_name, port_name):
         """ Validate that port_name was removed from bridge.
         """
         bridge = self._bridges[switch_name]
@@ -453,7 +453,7 @@ class IVSwitchOvs(IVSwitch, tasks.Process):
         assert 'Port "%s"' % port_name not in output[0]
         return True
 
-    def validate_add_flow(self, dummy_result, switch_name, flow, dummy_cache='off'):
+    def validate_add_flow(self, _dummy_result, switch_name, flow, _dummy_cache='off'):
         """ Validate insertion of the flow into the switch
         """
 
@@ -474,44 +474,44 @@ class IVSwitchOvs(IVSwitch, tasks.Process):
                 return True
         return False
 
-    def validate_del_flow(self, dummy_result, switch_name, flow=None):
+    def validate_del_flow(self, _dummy_result, switch_name, flow=None):
         """ Validate removal of the flow
         """
         if not flow:
             # what else we can do?
             return True
-        return not self.validate_add_flow(dummy_result, switch_name, flow)
+        return not self.validate_add_flow(_dummy_result, switch_name, flow)
 
-    def validate_dump_flows(self, dummy_result, dummy_switch_name):
+    def validate_dump_flows(self, _dummy_result, _dummy_switch_name):
         """ Validate call of flow dump
         """
         return True
 
-    def validate_disable_rstp(self, dummy_result, switch_name):
+    def validate_disable_rstp(self, _dummy_result, switch_name):
         """ Validate rstp disable
         """
         bridge = self._bridges[switch_name]
         return 'rstp_enable         : false' in ''.join(bridge.bridge_info())
 
-    def validate_enable_rstp(self, dummy_result, switch_name):
+    def validate_enable_rstp(self, _dummy_result, switch_name):
         """ Validate rstp enable
         """
         bridge = self._bridges[switch_name]
         return 'rstp_enable         : true' in ''.join(bridge.bridge_info())
 
-    def validate_disable_stp(self, dummy_result, switch_name):
+    def validate_disable_stp(self, _dummy_result, switch_name):
         """ Validate stp disable
         """
         bridge = self._bridges[switch_name]
         return 'stp_enable          : false' in ''.join(bridge.bridge_info())
 
-    def validate_enable_stp(self, dummy_result, switch_name):
+    def validate_enable_stp(self, _dummy_result, switch_name):
         """ Validate stp enable
         """
         bridge = self._bridges[switch_name]
         return 'stp_enable          : true' in ''.join(bridge.bridge_info())
 
-    def validate_restart(self, dummy_result):
+    def validate_restart(self, _dummy_result):
         """ Validate restart
         """
         return True
diff --git a/vswitches/vpp_dpdk_vhost.py b/vswitches/vpp_dpdk_vhost.py
index 58d6bf51..bdb5ff81 100644
--- a/vswitches/vpp_dpdk_vhost.py
+++ b/vswitches/vpp_dpdk_vhost.py
@@ -205,6 +205,7 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
     def add_switch(self, switch_name, dummy_params=None):
         """See IVswitch for general description
         """
+        # pylint: disable=unused-argument
         if switch_name in self._switches:
             self._logger.warning("switch %s already exists...", switch_name)
         else:
@@ -221,6 +222,7 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
         """See IVswitch for general description
         :raises: RuntimeError
         """
+        # pylint: disable=unused-argument
         # get list of physical interfaces with PCI addresses
         vpp_nics = self._get_nic_info(key='Pci')
         # check if there are any NICs left
@@ -239,6 +241,7 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
     def add_vport(self, dummy_switch_name):
         """See IVswitch for general description
         """
+        # pylint: disable=unused-argument
         socket_name = S.getValue('TOOLS')['ovs_var_tmp'] + 'dpdkvhostuser' + str(len(self._virt_ports))
         if S.getValue('VSWITCH_VHOSTUSER_SERVER_MODE'):
             mode = ['server']
@@ -280,7 +283,7 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
         if bidir:
             self.run_vppctl(['set', 'interface', 'l2', 'xconnect', port2, port1])
 
-    def add_bridge(self, switch_name, port1, port2, dummy_bidir=False):
+    def add_bridge(self, switch_name, port1, port2, _dummy_bidir=False):
         """Add given ports to bridge ``switch_name``
         """
         self.run_vppctl(['set', 'interface', 'l2', 'bridge', port1,
@@ -301,7 +304,7 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
         elif mode == 'bridge':
             self.add_bridge(switch_name, port1, port2)
         else:
-            raise RuntimeError('VPP: Unsupported l2 connection mode detected %s', mode)
+            raise RuntimeError('VPP: Unsupported l2 connection mode detected %s' % mode)
 
     def del_l2patch(self, port1, port2, bidir=False):
         """Remove l2patch connection between given ports
@@ -314,12 +317,12 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
         if bidir:
             self.run_vppctl(['test', 'l2patch', 'rx', port2, 'tx', port1, 'del'])
 
-    def del_xconnect(self, dummy_port1, dummy_port2, dummy_bidir=False):
+    def del_xconnect(self, _dummy_port1, _dummy_port2, _dummy_bidir=False):
         """Remove xconnect connection between given ports
         """
         self._logger.warning('VPP: Removal of l2 xconnect is not implemented.')
 
-    def del_bridge(self, dummy_switch_name, dummy_port1, dummy_port2):
+    def del_bridge(self, _dummy_switch_name, _dummy_port1, _dummy_port2):
         """Remove given ports from the bridge
         """
         self._logger.warning('VPP: Removal of interfaces from bridge is not implemented.')
@@ -337,7 +340,7 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
         elif mode == 'bridge':
             self.del_bridge(switch_name, port1, port2)
         else:
-            raise RuntimeError('VPP: Unsupported l2 connection mode detected %s', mode)
+            raise RuntimeError('VPP: Unsupported l2 connection mode detected %s' % mode)
 
     def dump_l2patch(self):
         """Dump l2patch connections
@@ -369,7 +372,7 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
         elif mode == 'bridge':
             self.dump_bridge(switch_name)
         else:
-            raise RuntimeError('VPP: Unsupported l2 connection mode detected %s', mode)
+            raise RuntimeError('VPP: Unsupported l2 connection mode detected %s' % mode)
 
     def run_vppctl(self, args, check_error=False):
         """Run ``vppctl`` with supplied arguments.
@@ -385,50 +388,50 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
     #
     # Validate methods
     #
-    def validate_add_switch(self, dummy_result, switch_name, dummy_params=None):
+    def validate_add_switch(self, _dummy_result, switch_name, _dummy_params=None):
         """Validate - Create a new logical switch with no ports
         """
         return switch_name in self._switches
 
-    def validate_del_switch(self, dummy_result, switch_name):
+    def validate_del_switch(self, _dummy_result, switch_name):
         """Validate removal of switch
         """
-        return not self.validate_add_switch(dummy_result, switch_name)
+        return not self.validate_add_switch(_dummy_result, switch_name)
 
-    def validate_add_phy_port(self, result, dummy_switch_name):
+    def validate_add_phy_port(self, result, _dummy_switch_name):
         """ Validate that physical port was added to bridge.
         """
         return result[0] in self._phy_ports
 
-    def validate_add_vport(self, result, dummy_switch_name):
+    def validate_add_vport(self, result, _dummy_switch_name):
         """ Validate that virtual port was added to bridge.
         """
         return result[0] in self._virt_ports
 
-    def validate_del_port(self, dummy_result, dummy_switch_name, port_name):
+    def validate_del_port(self, _dummy_result, _dummy_switch_name, port_name):
         """ Validate that port_name was removed from bridge.
         """
         return not (port_name in self._phy_ports or port_name in self._virt_ports)
 
     # pylint: disable=no-self-use
-    def validate_add_connection(self, dummy_result, dummy_switch_name, dummy_port1,
-                                dummy_port2, dummy_bidir=False):
+    def validate_add_connection(self, _dummy_result, _dummy_switch_name, _dummy_port1,
+                                _dummy_port2, _dummy_bidir=False):
         """ Validate that connection was added
         """
         return True
 
-    def validate_del_connection(self, dummy_result, dummy_switch_name, dummy_port1,
-                                dummy_port2, dummy_bidir=False):
+    def validate_del_connection(self, _dummy_result, _dummy_switch_name, _dummy_port1,
+                                _dummy_port2, _dummy_bidir=False):
         """ Validate that connection was deleted
         """
         return True
 
-    def validate_dump_connections(self, dummy_result, dummy_switch_name):
+    def validate_dump_connections(self, _dummy_result, _dummy_switch_name):
         """ Validate dump connections call
         """
         return True
 
-    def validate_run_vppctl(self, result, dummy_args, dummy_check_error=False):
+    def validate_run_vppctl(self, result, _dummy_args, _dummy_check_error=False):
         """validate execution of ``vppctl`` with supplied arguments.
         """
         # there shouldn't be any stderr