Skip to content

Commit 0232218

Browse files
cpchangtwlguohan
authored andcommitted
[Quanta/device] Modify psuutil.py and config.bcm of IX1B (#1985)
* Fix LED activity behavior * Modify psuutil.py and config.bcm of IX1B
1 parent 83f0822 commit 0232218

File tree

2 files changed

+33
-31
lines changed

2 files changed

+33
-31
lines changed

device/quanta/x86_64-quanta_ix1b_32x-r0/Quanta-IX1B-32X/th-ix1b-32x100G.config.bcm

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ parity_enable=1
1212
# Control to disable parity correction
1313
parity_correction=1
1414

15-
l2_mem_entries=<40960>
16-
l3_mem_entries=<40960>
15+
ipv6_lpm_128b_enable=1
16+
l3_alpm_enable=2
17+
18+
l2_mem_entries=40960
19+
l3_mem_entries=40960
1720

1821
portmap_1=1:100
1922
portmap_2=5:100

device/quanta/x86_64-quanta_ix1b_32x-r0/plugins/psuutil.py

+28-29
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
import os.path
8-
import commands
8+
import subprocess
99
import logging
1010

1111
try:
@@ -17,59 +17,58 @@
1717

1818
def show_log(txt):
1919
if DEBUG == True:
20-
print "[IX1B]"+txt
20+
print("[IX2]"+txt)
2121
return
2222

2323
def exec_cmd(cmd, show):
2424
logging.info('Run :'+cmd)
25-
status, output = commands.getstatusoutput(cmd)
26-
show_log (cmd +"with result:" + str(status))
27-
show_log (" output:"+output)
28-
if status:
29-
logging.info('Failed :'+cmd)
25+
try:
26+
output = subprocess.check_output(cmd, shell=True)
27+
show_log (cmd +"output:"+str(output))
28+
except subprocess.CalledProcessError as e:
29+
logging.info("Failed :"+cmd)
3030
if show:
31-
print('Failed :'+cmd)
32-
return status, output
31+
print("Failed :"+cmd +"returncode = {}, err msg: {}".format(e.returncode, e.output))
32+
return output
3333

3434
def my_log(txt):
3535
if DEBUG == True:
36-
print "[QUANTA DBG]: "+txt
36+
print("[QUANTA DBG]: "+txt)
3737
return
3838

3939
def log_os_system(cmd, show):
4040
logging.info('Run :'+cmd)
4141
status = 1
4242
output = ""
43-
status, output = commands.getstatusoutput(cmd)
44-
my_log (cmd +"with result:" + str(status))
45-
my_log ("cmd:" + cmd)
46-
my_log (" output:"+output)
47-
if status:
43+
try:
44+
output = subprocess.check_output(cmd, shell=True)
45+
my_log (cmd +"output:"+str(output))
46+
except subprocess.CalledProcessError as e:
4847
logging.info('Failed :'+cmd)
4948
if show:
50-
print('Failed :'+cmd)
51-
return status, output
49+
print("Failed :"+cmd +"returncode = {}, err msg: {}".format(e.returncode, e.output))
50+
return output
5251

5352
def gpio16_exist():
54-
ret, ls = log_os_system("ls /sys/class/gpio/ | grep gpio16", 0)
53+
ls = log_os_system("ls /sys/class/gpio/ | grep gpio16", 0)
5554
logging.info('mods:'+ls)
5655
if len(ls) ==0:
5756
return False
5857

5958
def gpio17_exist():
60-
ret, ls = log_os_system("ls /sys/class/gpio/ | grep gpio17", 0)
59+
ls = log_os_system("ls /sys/class/gpio/ | grep gpio17", 0)
6160
logging.info('mods:'+ls)
6261
if len(ls) ==0:
6362
return False
6463

6564
def gpio19_exist():
66-
ret, ls = log_os_system("ls /sys/class/gpio/ | grep gpio19", 0)
65+
ls = log_os_system("ls /sys/class/gpio/ | grep gpio19", 0)
6766
logging.info('mods:'+ls)
6867
if len(ls) ==0:
6968
return False
7069

7170
def gpio20_exist():
72-
ret, ls = log_os_system("ls /sys/class/gpio/ | grep gpio20", 0)
71+
ls = log_os_system("ls /sys/class/gpio/ | grep gpio20", 0)
7372
logging.info('mods:'+ls)
7473
if len(ls) ==0:
7574
return False
@@ -86,20 +85,20 @@ def __init__(self):
8685
PsuBase.__init__(self)
8786

8887
if gpio16_exist() == False:
89-
status, output = exec_cmd("echo 16 > /sys/class/gpio/export ", 1)
90-
status, output = exec_cmd("echo in > /sys/class/gpio/gpio16/direction ", 1)
88+
output = exec_cmd("echo 16 > /sys/class/gpio/export ", 1)
89+
output = exec_cmd("echo in > /sys/class/gpio/gpio16/direction ", 1)
9190

9291
if gpio17_exist() == False:
93-
status, output = exec_cmd("echo 17 > /sys/class/gpio/export ", 1)
94-
status, output = exec_cmd("echo in > /sys/class/gpio/gpio17/direction ", 1)
92+
output = exec_cmd("echo 17 > /sys/class/gpio/export ", 1)
93+
output = exec_cmd("echo in > /sys/class/gpio/gpio17/direction ", 1)
9594

9695
if gpio19_exist() == False:
97-
status, output = exec_cmd("echo 19 > /sys/class/gpio/export ", 1)
98-
status, output = exec_cmd("echo in > /sys/class/gpio/gpio19/direction ", 1)
96+
output = exec_cmd("echo 19 > /sys/class/gpio/export ", 1)
97+
output = exec_cmd("echo in > /sys/class/gpio/gpio19/direction ", 1)
9998

10099
if gpio20_exist() == False:
101-
status, output = exec_cmd("echo 20 > /sys/class/gpio/export ", 1)
102-
status, output = exec_cmd("echo in > /sys/class/gpio/gpio20/direction ", 1)
100+
output = exec_cmd("echo 20 > /sys/class/gpio/export ", 1)
101+
output = exec_cmd("echo in > /sys/class/gpio/gpio20/direction ", 1)
103102

104103
# Get sysfs attribute
105104
def get_attr_value(self, attr_path):

0 commit comments

Comments
 (0)