Change sp run to call and add \n

Signed-off-by: maipbui <maibui@microsoft.com>
sonic-net · Sep 21, 2022 · 96bc208 · 96bc208
1 parent f1365f5
commit 96bc208
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
@@ -148,14 +148,14 @@ def _get_class(self, config):
 
     def get_reg(self, path, reg_addr):
         with open(path, 'w') as file:
-            file.write(reg_addr)
+            file.write(reg_addr + '\n')
         with open(path, 'r') as file:
             output = file.readline().strip()
         return output
 
     def set_reg(self, path, reg_addr, value):
         with open(path, 'w') as file:
-            file.write("{0} {1}".format(reg_addr, value))
+            file.write("{0} {1}\n".format(reg_addr, value))
         return None
 
     def read_txt_file(self, path):
@@ -185,7 +185,7 @@ def write_txt_file(self, file_path, value):
         return True
 
     def is_host(self):
-        return subprocess.run(self.HOST_CHK_CMD, stdout=None, stderr=None).returncode == 0
+        return subprocess.call(self.HOST_CHK_CMD) == 0
 
     def load_json_file(self, path):
         """

diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py
@@ -62,7 +62,7 @@ def __get_bios_version(self):
     def get_register_value(self, register):
         # Retrieves the cpld register value
         with open(GETREG_PATH, 'w') as file:
-            file.write(register)
+            file.write(register + '\n')
         with open(GETREG_PATH, 'r') as file:
             raw_data = file.readline()
         return raw_data.strip()

diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/component.py
@@ -52,7 +52,7 @@ def __get_bios_version(self):
     def get_register_value(self, register):
         # Retrieves the cpld register value
         with open(GETREG_PATH, 'w') as file:
-            file.write(register)
+            file.write(register + '\n')
         with open(GETREG_PATH, 'r') as file:
             raw_data = file.readline()
         return raw_data.strip()

diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/helper.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/helper.py
@@ -15,7 +15,7 @@ def __init__(self):
         (self.platform, self.hwsku) = device_info.get_platform_and_hwsku()
 
     def is_host(self):
-        return subprocess.run(HOST_CHK_CMD, stdout=None, stderr=None).returncode == 0
+        return subprocess.call(HOST_CHK_CMD) == 0
 
     def pci_get_value(self, resource, offset):
         status = True
@@ -71,7 +71,7 @@ def write_txt_file(self, file_path, value):
 
     def get_cpld_reg_value(self, getreg_path, register):
         with open(getreg_path, 'w') as file:
-            file.write(register)
+            file.write(register + '\n')
         with open(getreg_path, 'r') as file:
             result = file.readline()
         return result

diff --git a/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/helper.py b/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/helper.py
@@ -14,7 +14,7 @@ def __init__(self):
         pass
 
     def is_host(self):
-        return subprocess.run(HOST_CHK_CMD, stdout=None, stderr=None).returncode == 0
+        return subprocess.call(HOST_CHK_CMD) == 0
 
     def pci_get_value(self, resource, offset):
         status = True
@@ -40,8 +40,8 @@ def run_command(self, cmd1_args, cmd2_args):
 
     def run_interactive_command(self, cmd):
         try:
-            subprocess.run(cmd, check=True)
-        except subprocess.CalledProcessError:
+            subprocess.call(cmd)
+        except:
             return False
         return True
 

diff --git a/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_silverstone-r0/sonic_platform/sfp.py
@@ -269,7 +269,7 @@ def __convert_string_to_num(self, value_str):
             return 'N/A'
 
     def __is_host(self):
-        return subprocess.run(self.HOST_CHK_CMD, stdout=None, stderr=None).returncode == 0
+        return subprocess.call(self.HOST_CHK_CMD) == 0
 
     def __get_path_to_port_config_file(self):
         platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])

diff --git a/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/common.py b/platform/broadcom/sonic-platform-modules-cel/services/platform_api/sonic_platform/common.py
@@ -149,9 +149,11 @@ def _get_class(self, config):
         return class_
 
     def get_reg(self, path, reg_addr):
-        cmd = "echo {1} > {0}; cat {0}".format(path, reg_addr)
-        status, output = self._run_command(cmd)
-        return output if status else None
+        with open(path, 'w') as file:
+            file.write(reg_addr + '\n')
+        with open(path, 'r') as file:
+            output = file.readline().strip()
+        return output
 
     def read_txt_file(self, path):
         with open(path, 'r') as f:
@@ -167,7 +169,7 @@ def write_txt_file(self, file_path, value):
         return True
 
     def is_host(self):
-        return subprocess.run(self.HOST_CHK_CMD).returncode == 0
+        return subprocess.call(self.HOST_CHK_CMD) == 0
 
     def load_json_file(self, path):
         """