fix(pylint): Some quick pylints

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Iba133914882485191ad962e36fae70b6fda0af98

diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py
index 841bd2e..5d3d131 100644 (file)
--- a/resources/libraries/python/NATUtil.py
+++ b/resources/libraries/python/NATUtil.py
@@ -63,9 +63,8 @@ class NATUtil:
 
     @staticmethod
     def enable_nat44_ed_plugin(
-        node, inside_vrf=0, outside_vrf=0, sessions=0, session_memory=0,
-        mode=u""
-    ):
+            node, inside_vrf=0, outside_vrf=0, sessions=0, session_memory=0,
+            mode=u""):
         """Enable NAT44 plugin.
 
         :param node: DUT node.

diff --git a/resources/tools/telemetry/bundle_bpf.py b/resources/tools/telemetry/bundle_bpf.py
index bf54db0..c376da9 100644 (file)
--- a/resources/tools/telemetry/bundle_bpf.py
+++ b/resources/tools/telemetry/bundle_bpf.py
@@ -111,7 +111,7 @@ class BundleBpf:
                     if item[u"labels"][u"name"] == u"python3":
                         continue
                     if len(str(item[u'labels'][u'cpu'])) > max_len["cpu"]:
-                        max_len["cpu"]= len(str(item[u'labels'][u'cpu']))
+                        max_len["cpu"] = len(str(item[u'labels'][u'cpu']))
                     if len(str(item[u'labels'][u'pid'])) > max_len[u"pid"]:
                         max_len[u"pid"] = len(str(item[u'labels'][u'pid']))
                     if len(str(item[u'labels'][u'name'])) > max_len[u"name"]:
@@ -125,23 +125,23 @@ class BundleBpf:
         item_list = sorted(item_list, key=lambda x: x['labels']['cpu'])
         item_list = sorted(item_list, key=lambda x: x['name'])
 
-        for it in item_list:
-            if table_name != it[u"name"]:
-                table_name = it[u"name"]
+        for itl in item_list:
+            if table_name != itl[u"name"]:
+                table_name = itl[u"name"]
                 text += f"\n==={table_name}===\n" \
                         f"cpu {u' ' * (max_len[u'cpu'] - 3)} " \
                         f"pid {u' ' * (max_len[u'pid'] - 3)} " \
                         f"name {u' ' * (max_len[u'name'] - 4)} " \
                         f"value {u' ' * (max_len[u'value'] - 5)}\n"
             text += (
-                f"""{str(it[u'labels'][u'cpu']) + u' ' * 
-                     (max_len[u"cpu"] - len(str(it[u'labels'][u'cpu'])))}  """
-                f"""{str(it[u'labels'][u'pid']) + u' ' * 
-                     (max_len[u"pid"] - len(str(it[u'labels'][u'pid'])))}  """
-                f"""{str(it[u'labels'][u'name']) + u' ' * 
-                     (max_len[u"name"] - len(str(it[u'labels'][u'name'])))}  """
-                f"""{str(it[u'value']) + u' ' * 
-                     (max_len[u"value"] - len(str(it[u'value'])))}\n""")
+                f"""{str(itl[u'labels'][u'cpu']) + u' ' *
+                     (max_len[u"cpu"] - len(str(itl[u'labels'][u'cpu'])))} """
+                f"""{str(itl[u'labels'][u'pid']) + u' ' *
+                     (max_len[u"pid"] - len(str(itl[u'labels'][u'pid'])))} """
+                f"""{str(itl[u'labels'][u'name']) + u' ' *
+                     (max_len[u"name"] - len(str(itl[u'labels'][u'name'])))} """
+                f"""{str(itl[u'value']) + u' ' *
+                     (max_len[u"value"] - len(str(itl[u'value'])))}\n""")
         getLogger(u"console_stdout").info(text)
 
     def process_data(self):

diff --git a/resources/tools/telemetry/bundle_vpp.py b/resources/tools/telemetry/bundle_vpp.py
index 315360f..963690b 100644 (file)
--- a/resources/tools/telemetry/bundle_vpp.py
+++ b/resources/tools/telemetry/bundle_vpp.py
@@ -263,8 +263,8 @@ class BundleVpp:
         for command in zip(self.api_command_list, self.api_replies_list):
             self_fn = command[0][u"api_args"][u"cmd"].replace(u" ", u"_")
             self_method_list = [meth for meth in dir(self)
-                           if callable(getattr(self, meth)) and
-                           meth.startswith('__') is False]
+                                if callable(getattr(self, meth)) and
+                                meth.startswith('__') is False]
             if self_fn not in self_method_list:
                 continue
             try:
@@ -272,9 +272,9 @@ class BundleVpp:
                 self_fn(command[1].reply)
             except AttributeError:
                 pass
-            except (KeyError, ValueError, TypeError) as e:
+            except (KeyError, ValueError, TypeError) as exc:
                 getLogger("console_stderr").error(
-                    f"Failed when processing data. Error message {e}"
+                    f"Failed when processing data. Error message {exc}"
                 )
                 sys.exit(Constants.err_telemetry_process)
 

diff --git a/resources/tools/telemetry/constants.py b/resources/tools/telemetry/constants.py
index 4b47a39..9961a07 100644 (file)
--- a/resources/tools/telemetry/constants.py
+++ b/resources/tools/telemetry/constants.py
@@ -46,4 +46,3 @@ class Constants:
 
     # Could not detach BPF events
     err_linux_detach = 52
-