Merge "python: Pylint 1.8.2 code conformity"

7 files changed, 36 insertions, 40 deletions

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()