matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[devices]: fix show environment for n3248te (#17508)

Browse Source 
Why I did it
The command show environment has been broken on this platform for quite a while. These adjustments allow it to function again.

How I did it
I adjusted the platform_sensors.py file for the n3248te to appease the errors that it was generating from the Python interpreter.

How to verify it
Run sudo show environment on an unchanged n3248te to see that it generates an error right away about print statements being malformed. Then place this file at /usr/bin/platform_sensors.py in the pmon container and run the command again to see the correct output.
This commit is contained in:
Justin Thomas 2024-03-25 12:53:36 -07:00 committed by GitHub
parent 610685d27b
commit fb29a4047c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
platform/broadcom/sonic-platform-modules-dell/n3248te/scripts/platform_sensors.py
View File

@ -10,24 +10,24 @@ import subprocess
output = "" output = ""
try: try:
rc = 0 rc = 0
output = subprocess.check_output('/usr/bin/sensors').splitlines() output = subprocess.check_output('/usr/bin/sensors', text=True).splitlines()
valid = False valid = False
for line in output: for line in output:
if line.startswith('acpitz') or line.startswith('coretemp'): if line.startswith('acpitz') or line.startswith('coretemp'):
valid = True valid = True
if valid: if valid:
print line print(line)
if line == '': valid = False if line == '': valid = False
print "Onboard Temperature Sensors:" print("Onboard Temperature Sensors:")
idx = 0 idx = 0
for line in output: for line in output:
if line.startswith('tmp75'): if line.startswith('tmp75'):
print '\t' + output[idx+2].split('(')[0] print('\t' + output[idx+2].split('(')[0])
idx += 1 idx += 1
print "\nFanTrays:" print("\nFanTrays:")
idx = 0 idx = 0
found_emc = False found_emc = False
for line in output: for line in output:
@ -37,50 +37,50 @@ try:
line = f.readline() line = f.readline()
present = int(line, 0) present = int(line, 0)
if present : if present :
print '\t' + 'FanTray1:' print('\t' + 'FanTray1:')
print '\t\t' + 'Fan Speed:' + (output[idx+2].split('(')[0]).split(':')[1] print('\t\t' + 'Fan Speed:' + (output[idx+2].split('(')[0]).split(':')[1])
with open('/sys/devices/platform/dell-n3248te-cpld.0/fan0_dir') as f: with open('/sys/devices/platform/dell-n3248te-cpld.0/fan0_dir') as f:
line = f.readline() line = f.readline()
dir = 'Intake' if line[:-1] == 'B2F' else 'Exhaust' dir = 'Intake' if line[:-1] == 'B2F' else 'Exhaust'
print '\t\t' + 'Airflow:\t' + dir print('\t\t' + 'Airflow:\t' + dir)
else : print '\t' + 'FanTray1:\tNot Present' else : print('\t' + 'FanTray1:\tNot Present')
with open('/sys/devices/platform/dell-n3248te-cpld.0/fan1_prs') as f: with open('/sys/devices/platform/dell-n3248te-cpld.0/fan1_prs') as f:
line = f.readline() line = f.readline()
present = int(line, 0) present = int(line, 0)
if present : if present :
print '\t' + 'FanTray2:' print('\t' + 'FanTray2:')
print '\t\t' + 'Fan Speed:' + (output[idx+3].split('(')[0]).split(':')[1] print('\t\t' + 'Fan Speed:' + (output[idx+3].split('(')[0]).split(':')[1])
with open('/sys/devices/platform/dell-n3248te-cpld.0/fan1_dir') as f: with open('/sys/devices/platform/dell-n3248te-cpld.0/fan1_dir') as f:
line = f.readline() line = f.readline()
dir = 'Intake' if line[:-1] == 'B2F' else 'Exhaust' dir = 'Intake' if line[:-1] == 'B2F' else 'Exhaust'
print '\t\t' + 'Airflow:\t' + dir print('\t\t' + 'Airflow:\t' + dir)
else : print '\t' + 'FanTray2:\tNot Present' else : print('\t' + 'FanTray2:\tNot Present')
with open('/sys/devices/platform/dell-n3248te-cpld.0/fan2_prs') as f: with open('/sys/devices/platform/dell-n3248te-cpld.0/fan2_prs') as f:
line = f.readline() line = f.readline()
present = int(line, 0) present = int(line, 0)
if present : if present :
print '\t' + 'FanTray3:' print('\t' + 'FanTray3:')
print '\t\t' + 'Fan Speed:' + (output[idx+4].split('(')[0]).split(':')[1] print('\t\t' + 'Fan Speed:' + (output[idx+4].split('(')[0]).split(':')[1])
with open('/sys/devices/platform/dell-n3248te-cpld.0/fan2_dir') as f: with open('/sys/devices/platform/dell-n3248te-cpld.0/fan2_dir') as f:
line = f.readline() line = f.readline()
dir = 'Intake' if line[:-1] == 'B2F' else 'Exhaust' dir = 'Intake' if line[:-1] == 'B2F' else 'Exhaust'
print '\t\t' + 'Airflow:\t' + dir print('\t\t' + 'Airflow:\t' + dir)
else : print '\t' + 'FanTray3:\tNot Present' else : print('\t' + 'FanTray3:\tNot Present')
idx += 1 idx += 1
if not found_emc : if not found_emc :
print '\t' + 'FanTray1:\tNot Present' print('\t' + 'FanTray1:\tNot Present')
print '\t' + 'FanTray2:\tNot Present' print('\t' + 'FanTray2:\tNot Present')
print '\t' + 'FanTray3:\tNot Present' print('\t' + 'FanTray3:\tNot Present')
print '\nPSUs:' print('\nPSUs:')
idx = 0 idx = 0
with open('/sys/devices/platform/dell-n3248te-cpld.0/psu0_prs') as f: with open('/sys/devices/platform/dell-n3248te-cpld.0/psu0_prs') as f:
line = f.readline() line = f.readline()
found_psu1 = int(line, 0) found_psu1 = int(line, 0)
if not found_psu1 : if not found_psu1 :
print '\tPSU1:\tNot Present' print('\tPSU1:\tNot Present')
with open('/sys/devices/platform/dell-n3248te-cpld.0/psu1_prs') as f: with open('/sys/devices/platform/dell-n3248te-cpld.0/psu1_prs') as f:
line = f.readline() line = f.readline()
found_psu2 = int(line, 0) found_psu2 = int(line, 0)
@ -90,46 +90,46 @@ try:
line = f.readline() line = f.readline()
status = int(line, 0) status = int(line, 0)
if not status : if not status :
print '\tPSU1:\tNot OK' print('\tPSU1:\tNot OK')
break break
with open('/sys/bus/i2c/devices/10-0056/eeprom') as f: with open('/sys/bus/i2c/devices/10-0056/eeprom', encoding='iso-8859-1') as f:
line = f.readline() line = f.readline()
dir = 'Exhaust' if 'FORWARD' in line else 'Intake' dir = 'Exhaust' if 'FORWARD' in line else 'Intake'
print '\tPSU1:' print('\tPSU1:')
print '\t\t' + output[idx+2].split('(')[0] print('\t\t' + output[idx+2].split('(')[0])
print '\t\t' + output[idx+4].split('(')[0] print('\t\t' + output[idx+4].split('(')[0])
print '\t\t' + output[idx+6].split('(')[0] print('\t\t' + output[idx+6].split('(')[0])
print '\t\t' + output[idx+7].split('(')[0] print('\t\t' + output[idx+7].split('(')[0])
print '\t\t' + output[idx+9].split('(')[0] print('\t\t' + output[idx+9].split('(')[0])
print '\t\t' + output[idx+11].split('(')[0] print('\t\t' + output[idx+11].split('(')[0])
print '\t\t' + output[idx+12].split('(')[0] print('\t\t' + output[idx+12].split('(')[0])
print '\t\t' + output[idx+14].split('(')[0] print('\t\t' + output[idx+14].split('(')[0])
print '\t\t' + output[idx+15].split('(')[0] print('\t\t' + output[idx+15].split('(')[0])
print '\t\t' + 'Airflow:\t\t ' + dir print('\t\t' + 'Airflow:\t\t ' + dir)
if line.startswith('dps460-i2c-11'): if line.startswith('dps460-i2c-11'):
with open('/sys/devices/platform/dell-n3248te-cpld.0/psu1_status') as f: with open('/sys/devices/platform/dell-n3248te-cpld.0/psu1_status') as f:
line = f.readline() line = f.readline()
status = int(line, 0) status = int(line, 0)
if not status : if not status :
print '\tPSU2:\tNot OK' print('\tPSU2:\tNot OK')
break break
print '\tPSU2:' print('\tPSU2:')
with open('/sys/bus/i2c/devices/11-0056/eeprom') as f: with open('/sys/bus/i2c/devices/11-0056/eeprom', encoding='iso-8859-1') as f:
line = f.readline() line = f.readline()
dir = 'Exhaust' if 'FORWARD' in line else 'Intake' dir = 'Exhaust' if 'FORWARD' in line else 'Intake'
print '\t\t' + output[idx+2].split('(')[0] print('\t\t' + output[idx+2].split('(')[0])
print '\t\t' + output[idx+4].split('(')[0] print('\t\t' + output[idx+4].split('(')[0])
print '\t\t' + output[idx+6].split('(')[0] print('\t\t' + output[idx+6].split('(')[0])
print '\t\t' + output[idx+7].split('(')[0] print('\t\t' + output[idx+7].split('(')[0])
print '\t\t' + output[idx+9].split('(')[0] print('\t\t' + output[idx+9].split('(')[0])
print '\t\t' + output[idx+11].split('(')[0] print('\t\t' + output[idx+11].split('(')[0])
print '\t\t' + output[idx+12].split('(')[0] print('\t\t' + output[idx+12].split('(')[0])
print '\t\t' + output[idx+14].split('(')[0] print('\t\t' + output[idx+14].split('(')[0])
print '\t\t' + output[idx+15].split('(')[0] print('\t\t' + output[idx+15].split('(')[0])
print '\t\t' + 'Airflow:\t\t ' + dir print('\t\t' + 'Airflow:\t\t ' + dir)
idx += 1 idx += 1
if not found_psu2 : if not found_psu2 :
print '\tPSU2:\tNot Present' print('\tPSU2:\tNot Present')
except subprocess.CalledProcessError as err: except subprocess.CalledProcessError as err:
print ("Exception when calling get_sonic_error -> %s\n" %(err)) print ("Exception when calling get_sonic_error -> %s\n" %(err))