remove __main__ construct

sonic-net · Aug 14, 2020 · 6d507f5 · 6d507f5
1 parent 40d3e52
commit 6d507f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/fdb_utils/filter_fdb_entries.py b/fdb_utils/filter_fdb_entries.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import json
 import sys
 import os
@@ -130,38 +128,29 @@ def main(argv):
     parser.add_argument('-a', '--arp', type=str, default='/tmp/arp.json', help='arp file name')
     parser.add_argument('-c', '--config_db', type=str, default='/tmp/config_db.json', help='config db file name')
     parser.add_argument('-b', '--backup_file', type=bool, default=True, help='Back up old fdb entries file')
-    args = parser.parse_args(argv)
+    args = parser.parse_args(argv[1:])
 
     fdb_filename = args.fdb
     arp_filename = args.arp
     config_db_filename = args.config_db
     backup_file = args.backup_file
 
     try:
+        syslog.openlog('filter_fdb_entries')
         file_exists_or_raise(fdb_filename)
         file_exists_or_raise(arp_filename)
         file_exists_or_raise(config_db_filename)
     except Exception as e:
         syslog.syslog(syslog.LOG_ERR, "Got an exception %s: Traceback: %s" % (str(e), traceback.format_exc()))
-    else:
-        filter_fdb_entries(fdb_filename, arp_filename, config_db_filename, backup_file)
-
-    return 0
-
-if __name__ == '__main__':
-    res = 0
-    try:
-        syslog.openlog('filter_fdb_entries')
-        res = main(sys.argv[1:])
     except KeyboardInterrupt:
         syslog.syslog(syslog.LOG_NOTICE, "SIGINT received. Quitting")
         res = 1
     except Exception as e:
         syslog.syslog(syslog.LOG_ERR, "Got an exception %s: Traceback: %s" % (str(e), traceback.format_exc()))
         res = 2
+    else:
+        filter_fdb_entries(fdb_filename, arp_filename, config_db_filename, backup_file)
     finally:
         syslog.closelog()
-    try:
-        sys.exit(res)
-    except SystemExit:
-        os._exit(res)
+
+    return 0
diff --git a/tests/filter_fdb_entries_test.py b/tests/filter_fdb_entries_test.py
@@ -164,6 +164,7 @@ def testFilterFdbEntries(self, testData):
         try:
             self.__setUp(testData)
             argv = [
+                "filter_fdb_entries",
                 "-a",
                 self.ARP_FILENAME,
                 "-f",