Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[device/centec] Replace os.system and remove subprocess with shell=True #12024

Merged
merged 3 commits into from
Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions device/centec/arm64-centec_e530_24x2c-r0/platform_reboot
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#!/usr/bin/python
import os

def main():
# reboot the system
os.system('echo 502 > /sys/class/gpio/export')
os.system('echo out > /sys/class/gpio/gpio502/direction')
os.system('echo 1 > /sys/class/gpio/gpio502/value')
with open('/sys/class/gpio/export', 'w') as file:
file.write('502\n')
with open('/sys/class/gpio/gpio502/direction', 'w') as file:
file.write('out\n')
with open('/sys/class/gpio/gpio502/value', 'w') as file:
file.write('1\n')

if __name__ == "__main__":
main()
10 changes: 6 additions & 4 deletions device/centec/arm64-centec_e530_24x2q-r0/platform_reboot
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#!/usr/bin/python
import os

def main():
# reboot the system
os.system('echo 502 > /sys/class/gpio/export')
os.system('echo out > /sys/class/gpio/gpio502/direction')
os.system('echo 1 > /sys/class/gpio/gpio502/value')
with open('/sys/class/gpio/export', 'w') as file:
file.write('502\n')
with open('/sys/class/gpio/gpio502/direction', 'w') as file:
file.write('out\n')
with open('/sys/class/gpio/gpio502/value', 'w') as file:
file.write('1\n')

if __name__ == "__main__":
main()
10 changes: 5 additions & 5 deletions device/centec/arm64-centec_e530_48s4x-r0/platform_reboot
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/python
import os
import subprocess

def main():
# reboot the system
os.system('modprobe i2c-dev')
os.system('i2cset -y 0 0x36 0x23 0x0')
os.system('sleep 1')
os.system('i2cset -y 0 0x36 0x23 0x3')
subprocess.run(['modprobe', 'i2c-dev'])
subprocess.run(['i2cset', '-y', '0', '0x36', '0x23', '0x0'])
subprocess.run(['sleep', '1'])
subprocess.run(['i2cset', '-y', '0', '0x36', '0x23', '0x3'])

if __name__ == "__main__":
main()
10 changes: 6 additions & 4 deletions device/centec/arm64-centec_e530_48t4x_p-r0/platform_reboot
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#!/usr/bin/python
import os

def main():
# reboot the system
os.system('echo 502 > /sys/class/gpio/export')
os.system('echo out > /sys/class/gpio/gpio502/direction')
os.system('echo 1 > /sys/class/gpio/gpio502/value')
with open('/sys/class/gpio/export', 'w') as file:
file.write('502\n')
with open('/sys/class/gpio/gpio502/direction', 'w') as file:
file.write('out\n')
with open('/sys/class/gpio/gpio502/value', 'w') as file:
file.write('1\n')

if __name__ == "__main__":
main()
8 changes: 4 additions & 4 deletions device/centec/x86_64-centec_v682_48x8c-r0/platform_reboot
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/usr/bin/env python

import os
import subprocess
import time

def main():
os.system('hwclock -w -f /dev/rtc1')
subprocess.run(['hwclock', '-w', '-f', '/dev/rtc1'])
time.sleep(1)

os.system('i2cset -y 0 0x36 0x23 0')
subprocess.run(['i2cset', '-y', '0', '0x36', '0x23', '0'])
time.sleep(1)
os.system('i2cset -y 0 0x36 0x23 1')
subprocess.run(['i2cset', '-y', '0', '0x36', '0x23', '1'])

if __name__ == '__main__':
main()
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ def _port_led_mode_update(self, port_idx, ledMode):

def _initSystemLed(self):
try:
cmd = 'i2cset -y 0 0x36 0x2 0x5'
Popen(cmd, shell=True)
cmd = ['i2cset', '-y', '0', '0x36', '0x2', '0x5']
Popen(cmd)
DBG_PRINT("init system led to normal")
cmd = 'i2cset -y 0 0x36 0x3 0x1'
Popen(cmd, shell=True)
cmd = ['i2cset', '-y', '0', '0x36', '0x3', '0x1']
Popen(cmd)
DBG_PRINT("init idn led to off")
except IOError as e:
DBG_PRINT(str(e))
Expand Down
8 changes: 4 additions & 4 deletions device/centec/x86_64-centec_v682_48x8c-r0/plugins/psuutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def get_psu_status(self, index):
if index is None:
return False

cmd = 'i2cget -y 0 0x36 0x1e'
status = int(Popen(cmd, stdout=PIPE, stderr=STDOUT, shell=True).stdout.readline(), 16)
cmd = ['i2cget', '-y', '0', '0x36', '0x1e']
status = int(Popen(cmd, stdout=PIPE, stderr=STDOUT).stdout.readline(), 16)
powergood = ((status & (1 << (3 * (index - 1) + 2))) != 0)
return powergood

Expand All @@ -56,7 +56,7 @@ def get_psu_presence(self, index):
if index is None:
return False

cmd = 'i2cget -y 0 0x36 0x1e'
status = int(Popen(cmd, stdout=PIPE, stderr=STDOUT, shell=True).stdout.readline(), 16)
cmd = ['i2cget', '-y', '0', '0x36', '0x1e']
status = int(Popen(cmd, stdout=PIPE, stderr=STDOUT).stdout.readline(), 16)
presence = ((status & (1 << (3 * (index - 1) + 1))) == 0)
return presence
8 changes: 4 additions & 4 deletions device/centec/x86_64-centec_v682_48y8c-r0/platform_reboot
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/usr/bin/env python

import os
import subprocess
import time

def main():
os.system('hwclock -w -f /dev/rtc1')
subprocess.run(['hwclock', '-w', '-f', '/dev/rtc1'])
time.sleep(1)

os.system('i2cset -y 0 0x36 0x23 0')
subprocess.run(['i2cset', '-y', '0', '0x36', '0x23', '0'])
time.sleep(1)
os.system('i2cset -y 0 0x36 0x23 1')
subprocess.run(['i2cset', '-y', '0', '0x36', '0x23', '1'])

if __name__ == '__main__':
main()
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ def _port_led_mode_update(self, port_idx, ledMode):

def _initSystemLed(self):
try:
cmd = 'i2cset -y 0 0x36 0x2 0x5'
Popen(cmd, shell=True)
cmd = ['i2cset', '-y', '0', '0x36', '0x2', '0x5']
Popen(cmd)
DBG_PRINT("init system led to normal")
cmd = 'i2cset -y 0 0x36 0x3 0x1'
Popen(cmd, shell=True)
cmd = ['i2cset', '-y', '0', '0x36', '0x3', '0x1']
Popen(cmd)
DBG_PRINT("init idn led to off")
except IOError as e:
DBG_PRINT(str(e))
Expand Down
8 changes: 4 additions & 4 deletions device/centec/x86_64-centec_v682_48y8c-r0/plugins/psuutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def get_psu_status(self, index):
if index is None:
return False

cmd = 'i2cget -y 0 0x36 0x1e'
status = int(Popen(cmd, stdout=PIPE, stderr=STDOUT, shell=True).stdout.readline(), 16)
cmd = ['i2cget', '-y', '0', '0x36', '0x1e']
status = int(Popen(cmd, stdout=PIPE, stderr=STDOUT).stdout.readline(), 16)
powergood = ((status & (1 << (3 * (index - 1) + 2))) != 0)
return powergood

Expand All @@ -56,7 +56,7 @@ def get_psu_presence(self, index):
if index is None:
return False

cmd = 'i2cget -y 0 0x36 0x1e'
status = int(Popen(cmd, stdout=PIPE, stderr=STDOUT, shell=True).stdout.readline(), 16)
cmd = ['i2cget', '-y', '0', '0x36', '0x1e']
status = int(Popen(cmd, stdout=PIPE, stderr=STDOUT).stdout.readline(), 16)
presence = ((status & (1 << (3 * (index - 1) + 1))) == 0)
return presence
9 changes: 5 additions & 4 deletions device/centec/x86_64-ew_es6220_x48q2h4-r0/plugins/psuutil.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import os.path
import subprocess

try:
from sonic_psu.psu_base import PsuBase
Expand All @@ -14,7 +14,7 @@ def __init__(self):

self.psu_path = "/sys/bus/i2c/devices/{}-0058/"
self.psu_oper_status = "in1_input"
self.psu_presence = "i2cget -y {} 0x50 0x00"
self.psu_presence = ["i2cget", "-y", "", "0x50", "0x00"]

def get_num_psus(self):
"""
Expand Down Expand Up @@ -46,8 +46,9 @@ def get_psu_presence(self, index):
Base_bus_number = 39
status = 0
try:
p = os.popen(self.psu_presence.format(index + Base_bus_number) + "> /dev/null 2>&1")
if p.readline() != None:
self.psu_presence[2] = str(index + Base_bus_number)
p = subprocess.Popen(self.psu_presence)
if p.stdout.readline() is not None:
status = 1
p.close()
except IOError:
Expand Down
27 changes: 0 additions & 27 deletions device/centec/x86_64-ew_es6220_x48q2h4-r0/plugins/sfputil.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

try:
import time
import os
from sonic_sfp.sfputilbase import SfpUtilBase
except ImportError as e:
raise ImportError("%s - required module not found" % str(e))
Expand Down Expand Up @@ -47,32 +46,6 @@ def __init__(self):

SfpUtilBase.__init__(self)

def get_presence(self, port_name):
# modify by zhw to get sfp presence
# Check for invalid port_num
port_num = int(port_name[8:])

if port_num < (self.port_start+1) or port_num > (self.port_end+1):
return False

# cpld info from "CPLD Register for es5800A2.2(V1.1)"
cpld_map = {0: '0x82', 1: '0x83', 2: '0x84',
3: '0x85', 4: '0x86', 5: '0x87', 6: '0x8E'}
cpld_key = (port_num - 1)/8
cpld_mask = (1 << (port_num - 1) % 8)

# use i2cget cmd to get cpld data
output = os.popen('i2cdetect -l | grep CP')
bus_num = output.read()[4]
cmd = "i2cget -y "+bus_num+" 0x5 "+cpld_map[cpld_key]
tmp = os.popen(cmd).read().replace("\n", "")
cpld_value = int(tmp, 16)

if cpld_value & cpld_mask == 0:
return True
else:
return False

def get_low_power_mode(self, port_num):
'''
# Check for invalid port_num
Expand Down