fix bugs (#3)

Signed-off-by: Sangita Maity <[email protected]>
zhenggen-xu · Mar 3, 2020 · 26bc0b8 · 26bc0b8
1 parent ed88e95
commit 26bc0b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/sonic_platform_base/sonic_sfp/sfputilbase.py b/sonic_platform_base/sonic_sfp/sfputilbase.py
@@ -21,7 +21,7 @@
     from collections import OrderedDict
     from natsort import natsorted
     from sonic_daemon_base.daemon_base import DaemonBase
-
+    import sys
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
 
@@ -383,7 +383,7 @@ def read_porttab_mappings(self, porttabfile):
         parse_fmt_port_config_ini = (os.path.basename(porttabfile) == PORT_CONFIG_INI)
         parse_fmt_platform_json = (os.path.basename(porttabfile) == PLATFORM_JSON)
 
-        (platform, hwsku) =  DaemonBase.get_platform_and_hwsku()
+        (platform, hwsku) =  DaemonBase().get_platform_and_hwsku()
         if(parse_fmt_platform_json):
             ports, _ = get_port_config(hwsku, platform)
             if not ports:
@@ -423,7 +423,7 @@ def read_porttab_mappings(self, porttabfile):
                 print("logical to physical: {}".format(self.logical_to_physical))
                 print("physical to logical: {}".format( self.physical_to_logical))
                 """
-                sys.exit(0)
+                return None
 
 
         try:

diff --git a/sonic_platform_base/sonic_sfp/sfputilhelper.py b/sonic_platform_base/sonic_sfp/sfputilhelper.py
@@ -14,7 +14,7 @@
     from collections import OrderedDict
     from natsort import natsorted
     from sonic_daemon_base.daemon_base import DaemonBase
-
+    import sys
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
 
@@ -55,7 +55,7 @@ def read_porttab_mappings(self, porttabfile):
         parse_fmt_port_config_ini = (os.path.basename(porttabfile) == PORT_CONFIG_INI)
         parse_fmt_platform_json = (os.path.basename(porttabfile) == PLATFORM_JSON)
 
-        (platform, hwsku) =  DaemonBase.get_platform_and_hwsku()
+        (platform, hwsku) =  DaemonBase().get_platform_and_hwsku()
         if(parse_fmt_platform_json):
             ports, _ = get_port_config(hwsku, platform)
             if not ports:
@@ -92,7 +92,7 @@ def read_porttab_mappings(self, porttabfile):
                 print("logical to physical: {}".format(self.logical_to_physical))
                 print("physical to logical: {}".format( self.physical_to_logical))
                 """
-                sys.exit(0)
+                return None
 
 
         try: