remove get_platform_path()

edge-core · Sep 5, 2024 · 4b3a0e0 · 4b3a0e0
1 parent e9498b0
commit 4b3a0e0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9716-32d/sonic_platform/helper.py b/platform/broadcom/sonic-platform-modules-accton/as9716-32d/sonic_platform/helper.py
@@ -12,9 +12,6 @@
 
 HOST_CHK_CMD = ["docker"]
 EMPTY_STRING = ""
-HOST_PLATFORM_PATH = "/usr/share/sonic/device/{}/"
-PMON_PLATFORM_PATH = "/usr/share/sonic/platform/"
-MACHINE_CONF_FILE = "/host/machine.conf"
 
 
 class APIHelper():
@@ -103,19 +100,6 @@ def ipmi_set_ss_thres(self, id, threshold_key, value):
             status = False
         return status, result
 
-    def get_platform_path(self):
-        platform_path = PMON_PLATFORM_PATH
-        if self.is_host():
-            platform = "None"
-            with open(MACHINE_CONF_FILE, 'r') as file:
-                for line in file:
-                    if 'onie_platform=' in line:
-                        platform = line.strip().split('=')[1]
-                        break
-            platform_path = HOST_PLATFORM_PATH.format(platform)
-
-        return platform_path
-
 
 class FileLock:
     """

diff --git a/platform/broadcom/sonic-platform-modules-accton/as9716-32d/sonic_platform/pcie.py b/platform/broadcom/sonic-platform-modules-accton/as9716-32d/sonic_platform/pcie.py
@@ -8,7 +8,6 @@
 
 try:
     from sonic_platform_base.sonic_pcie.pcie_common import PcieUtil
-    from .helper import APIHelper
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -18,7 +17,6 @@ class Pcie(PcieUtil):
 
     def __init__(self, platform_path):
         PcieUtil.__init__(self, platform_path)
-        self._api_helper = APIHelper()
         self._conf_rev = self.__get_conf_rev()
 
     def __get_conf_rev(self):
@@ -35,7 +33,6 @@ def __get_conf_rev(self):
         """
         try:
             import os
-            import json
             from sonic_platform_pddf_base import pddfapi
             from sonic_platform.eeprom import Eeprom
 
@@ -48,10 +45,9 @@ def __get_conf_rev(self):
                     return "N/A"
 
                 label_rev = results[2].decode('ascii')
-                platform_path = self._api_helper.get_platform_path()
 
                 for rev in (label_rev[:-1], label_rev):
-                    pcie_yaml_file = os.path.join(platform_path, f"pcie_{rev}.yaml")
+                    pcie_yaml_file = os.path.join(self.config_path, f"pcie_{rev}.yaml")
                     if os.path.exists(pcie_yaml_file):
                         return rev