From 1c45ca1f5d60fa9b88f5b1647cea62eb23439302 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Mon, 16 Nov 2020 09:03:28 -0800
Subject: [PATCH] Clean up LGTM alerts (#1239)

Clean up some alerts which were detected by LGTM tool
---
 pcieutil/main.py               | 1 -
 scripts/db_migrator.py         | 1 -
 scripts/natconfig              | 6 +++---
 scripts/natshow                | 6 ------
 show/bgp_frr_v4.py             | 4 +---
 show/interfaces/portchannel.py | 6 +-----
 utilities_common/bgp_util.py   | 1 -
 7 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/pcieutil/main.py b/pcieutil/main.py
index 30174a9251..4bfa1ad5c4 100644
--- a/pcieutil/main.py
+++ b/pcieutil/main.py
@@ -11,7 +11,6 @@
 
     import click
     from sonic_py_common import device_info, logger
-    from tabulate import tabulate
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
 
diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py
index fc2d993d99..53b994b541 100755
--- a/scripts/db_migrator.py
+++ b/scripts/db_migrator.py
@@ -2,7 +2,6 @@
 
 import argparse
 import json
-import os
 import sys
 import traceback
 
diff --git a/scripts/natconfig b/scripts/natconfig
index 3a1540e13b..8254c37b2e 100644
--- a/scripts/natconfig
+++ b/scripts/natconfig
@@ -287,15 +287,15 @@ class NatConfig(object):
            else:
                print("Admin Mode     : disabled")
            if 'nat_timeout' in global_data:
-               print("Global Timeout : {}".format(global_data['nat_timeout'], "secs"))
+               print("Global Timeout : {} secs".format(global_data['nat_timeout']))
            else:
                print("Global Timeout : 600 secs")
            if 'nat_tcp_timeout' in global_data:
-               print("TCP Timeout    : {}".format(global_data['nat_tcp_timeout'], "secs"))
+               print("TCP Timeout    : {} secs".format(global_data['nat_tcp_timeout']))
            else:
                print("TCP Timeout    : 86400 secs")
            if 'nat_udp_timeout' in global_data:
-               print("UDP Timeout    : {}".format(global_data['nat_udp_timeout'], "secs"))
+               print("UDP Timeout    : {} secs".format(global_data['nat_udp_timeout']))
            else:
                print("UDP Timeout    : 300 secs")
            print("")
diff --git a/scripts/natshow b/scripts/natshow
index a61d4948cd..e056d8421a 100644
--- a/scripts/natshow
+++ b/scripts/natshow
@@ -132,8 +132,6 @@ class NatShow(object):
                 continue
 
             ip_protocol = "all"
-            source = "---"
-            destination = "---"
             translated_dst = "---"
             translated_src = "---"
 
@@ -282,8 +280,6 @@ class NatShow(object):
                     nat_twice_values = self.appl_db.get_all(self.appl_db.APPL_DB,'NAT_TWICE_TABLE:{}'.format(nat_twice_entry))
 
                     ip_protocol = "all"
-                    source = "---"
-                    destination = "---"
 
                     source = nat_twice_keys[0]
                     destination = nat_twice_keys[1]
@@ -308,8 +304,6 @@ class NatShow(object):
                     napt_twice_values = self.appl_db.get_all(self.appl_db.APPL_DB,'NAPT_TWICE_TABLE:{}'.format(napt_twice_entry))
 
                     ip_protocol = napt_twice_keys[0].lower()
-                    source = "---"
-                    destination = "---"
 
                     source = napt_twice_keys[1] + ':' + napt_twice_keys[2]
                     destination = napt_twice_keys[3] + ':' + napt_twice_keys[4]
diff --git a/show/bgp_frr_v4.py b/show/bgp_frr_v4.py
index 0b06727ce7..5b630d8981 100644
--- a/show/bgp_frr_v4.py
+++ b/show/bgp_frr_v4.py
@@ -1,11 +1,9 @@
-import json
-
 import click
-
 import utilities_common.bgp_util as bgp_util
 import utilities_common.cli as clicommon
 import utilities_common.constants as constants
 import utilities_common.multi_asic as multi_asic_util
+
 from show.main import ip, run_command
 
 ###############################################################################
diff --git a/show/interfaces/portchannel.py b/show/interfaces/portchannel.py
index ea027fa928..9beb6cb052 100644
--- a/show/interfaces/portchannel.py
+++ b/show/interfaces/portchannel.py
@@ -1,7 +1,3 @@
-
-import os
-import sys
-
 import click
 import utilities_common.cli as clicommon
 from natsort import natsorted
@@ -167,4 +163,4 @@ def portchannel(namespace, display, verbose):
     """Show PortChannel information"""
     team = Teamshow(namespace, display)
     team.get_teams_info()
-    team.display_summary()
\ No newline at end of file
+    team.display_summary()
diff --git a/utilities_common/bgp_util.py b/utilities_common/bgp_util.py
index 82fc072964..4a444fa027 100644
--- a/utilities_common/bgp_util.py
+++ b/utilities_common/bgp_util.py
@@ -1,6 +1,5 @@
 import ipaddress
 import json
-import os
 import re
 
 import click