Skip to content

Commit be4f03e

Browse files
andriymoroz-mlnxlguohan
authored andcommitted
Optimize platform info fetch (#276)
Signed-off-by: Andriy Moroz <[email protected]>
1 parent 27ae651 commit be4f03e

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

scripts/decode-syseeprom

+3-21
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,22 @@ try:
1717
import imp
1818
from sonic_eeprom import eeprom_dts
1919
import glob
20+
from sonic_platform import get_machine_info
21+
from sonic_platform import get_platform_info
2022
except ImportError, e:
2123
raise ImportError (str(e) + "- required module not found")
2224

23-
24-
SONIC_CFGGEN = '/usr/local/bin/sonic-cfggen'
25-
PLATFORM_KEY = 'DEVICE_METADATA.localhost.platform'
26-
2725
PLATFORM_ROOT = '/usr/share/sonic/device'
28-
2926
CACHE_ROOT = '/var/cache/sonic/decode-syseeprom'
3027
CACHE_FILE = 'syseeprom_cache'
3128

32-
# Returns platform and HW SKU
33-
def get_platform():
34-
try:
35-
proc = subprocess.Popen([SONIC_CFGGEN, '-H', '-v', PLATFORM_KEY],
36-
stdout=subprocess.PIPE,
37-
shell=False,
38-
stderr=subprocess.STDOUT)
39-
stdout = proc.communicate()[0]
40-
proc.wait()
41-
platform = stdout.rstrip('\n')
42-
except OSError, e:
43-
raise OSError("Cannot detect platform")
44-
45-
return platform
46-
4729
def main():
4830

4931
if not os.geteuid() == 0:
5032
raise RuntimeError("must be root to run")
5133

5234
# Get platform name
53-
platform = get_platform()
35+
platform = get_platform_info(get_machine_info())
5436

5537
platform_path = '/'.join([PLATFORM_ROOT, platform])
5638

0 commit comments

Comments
 (0)