[Author]:[email protected] [Jira ID]:N/A [Description]:fix the m…

…erge conflict with PDDF
sonic-net · May 10, 2022 · b725940 · b725940
1 parent 5b3cb0b
commit b725940
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 8 deletions.
diff --git a/platform/pddf/i2c/utils/pddf_util.py b/platform/pddf/i2c/utils/pddf_util.py
@@ -21,7 +21,7 @@
 import shutil
 import subprocess
 import sys
-from sonic_py_common import device_info
+
 import pddfparse
 
 PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
@@ -139,7 +139,7 @@ def driver_check():
 
 def get_path_to_device():
     # Get platform and hwsku
-    (platform, hwsku) = device_info.get_platform_and_hwsku()
+    (platform, hwsku) = pddf_obj.get_platform_and_hwsku()
 
     # Load platform module from source
     platform_path = "/".join([PLATFORM_ROOT_PATH, platform])

diff --git a/platform/pddf/i2c/utils/pddfparse.py b/platform/pddf/i2c/utils/pddfparse.py
@@ -8,7 +8,6 @@
 import sys
 import time
 import unicodedata
-from sonic_py_common import device_info
 
 bmc_cache = {}
 cache = {}
@@ -34,7 +33,7 @@
 class PddfParse():
     def __init__(self):
         if not os.path.exists("/usr/share/sonic/platform"):
-            platform, hwsku = device_info.get_platform_and_hwsku()
+            platform, hwsku = self.get_platform_and_hwsku()
             os.symlink("/usr/share/sonic/device/"+platform, "/usr/share/sonic/platform")
 
         try:
@@ -48,6 +47,31 @@ def __init__(self):
         self.data_sysfs_obj = {}
         self.sysfs_obj = {}
 
+    # Returns platform and HW SKU
+    def get_platform_and_hwsku(self):
+        try:
+            proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-H', '-v', PLATFORM_KEY],
+                                    stdout=subprocess.PIPE,
+                                    shell=False,
+                                    universal_newlines=True,
+                                    stderr=subprocess.STDOUT)
+            stdout = proc.communicate()[0]
+            proc.wait()
+            platform = stdout.rstrip('\n')
+
+            proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-d', '-v', HWSKU_KEY],
+                                    stdout=subprocess.PIPE,
+                                    shell=False,
+                                    universal_newlines=True,
+                                    stderr=subprocess.STDOUT)
+            stdout = proc.communicate()[0]
+            proc.wait()
+            hwsku = stdout.rstrip('\n')
+        except OSError as e:
+            raise OSError("Cannot detect platform")
+
+        return (platform, hwsku)
+
     ###################################################################################################################
     #   GENERIC DEFS
     ###################################################################################################################

diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_sfp.py
@@ -6,7 +6,6 @@
 
 try:
     from sonic_platform_base.sonic_xcvr.sfp_optoe_base import SfpOptoeBase
-    import time
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 

diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_thermal.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddf_thermal.py
@@ -13,7 +13,6 @@
 
 try:
     from sonic_platform_base.thermal_base import ThermalBase
-    import time 
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 

diff --git a/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddfapi.py b/platform/pddf/platform-api-pddf-base/sonic_platform_pddf_base/pddfapi.py
@@ -6,7 +6,6 @@
 import subprocess
 import time
 import unicodedata
-from sonic_py_common import device_info
 
 bmc_cache = {}
 cache = {}
@@ -32,7 +31,7 @@
 class PddfApi():
     def __init__(self):
         if not os.path.exists("/usr/share/sonic/platform"):
-            self.platform, self.hwsku = device_info.get_platform_and_hwsku()
+            self.platform, self.hwsku = self.get_platform_and_hwsku()
             os.symlink("/usr/share/sonic/device/"+self.platform, "/usr/share/sonic/platform")
 
         try:
@@ -45,6 +44,29 @@ def __init__(self):
         self.data_sysfs_obj = {}
         self.sysfs_obj = {}
 
+    # Returns platform and HW SKU
+    def get_platform_and_hwsku(self):
+        try:
+            proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-H', '-v', PLATFORM_KEY],
+                                    stdout=subprocess.PIPE,
+                                    shell=False,
+                                    stderr=subprocess.STDOUT)
+            stdout = proc.communicate()[0]
+            proc.wait()
+            platform = stdout.rstrip('\n')
+
+            proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-d', '-v', HWSKU_KEY],
+                                    stdout=subprocess.PIPE,
+                                    shell=False,
+                                    stderr=subprocess.STDOUT)
+            stdout = proc.communicate()[0]
+            proc.wait()
+            hwsku = stdout.rstrip('\n')
+        except OSError as e:
+            raise OSError("Cannot detect platform")
+
+        return (platform, hwsku)
+
     #################################################################################################################
     #   GENERIC DEFS
     #################################################################################################################