Skip to content

[inventec] Replace os.system and remove subprocess with shell=True #12108

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.

Sign up for GitHub

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

Merged
maipbui merged 2 commits into from
Oct 14, 2022
Merged

[inventec] Replace os.system and remove subprocess with shell=True #12108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
409c027
Replace unsafe functions in inventec
maipbui Sep 19, 2022
799902a
Fix PR comments
maipbui Oct 5, 2022
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
24 changes: 13 additions & 11 deletions platform/broadcom/sonic-platform-modules-inventec/common/utils/asic_monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@

try:
import os
import commands
import sys, getopt
import logging
import re
import time
import syslog
from sonic_sfp.bcmshell import bcmshell
from sonic_py_common.general import getstatusoutput_noshell

except ImportError as e:
raise ImportError("%s - required module not found" % str(e))
Expand Down Expand Up @@ -53,10 +51,10 @@ def initialLoop():
bcm_obj = BCMUtil()
bcm_obj.execute_command("echo")
initialNotOK = False
print bcm_obj
print(bcm_obj)
log_message( syslog.LOG_INFO, "BCMUtil Object initialed successfully" )
except Exception, e:
print "Exception. The warning is {0}".format(str(e))
except Exception as e:
print("Exception. The warning is {0}".format(str(e)))
time.sleep(10)

class BCMUtil(bcmshell):
Expand All @@ -66,7 +64,7 @@ class BCMUtil(bcmshell):

def get_platform(self):
if self.platform is None:
self.platform = os.popen("uname -n").read().strip()
Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft Sep 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.strip()

Do you want to keep .strip()? It also applies to blank char. #Closed

_, self.platform = getstatusoutput_noshell(["uname", "-n"]).strip()
return self.platform

def get_asic_temperature( self ):
Expand Down Expand Up @@ -102,14 +100,18 @@ def main():
content = readPtr.read().strip()
if bcm_obj.get_platform() == INV_SEQUOIA_PLATFORM :
if content == "inv_bmc" and SWITCH_TEMP_FILE_NAME in file_list :
os.system("echo {0} > {1}/{2}/device/{3}".format( ( bcm_obj.get_asic_temperature() * 1000 ), HWMON_PATH, index, SWITCH_TEMP_FILE_NAME ))
file = "{0}/{1}/device/{2}".format(HWMON_PATH, index, SWITCH_TEMP_FILE_NAME)
with open(file, 'w') as f:
f.write(str(bcm_obj.get_asic_temperature() * 1000) + '\n')
break
else :
if content == "inv_psoc" and SWITCH_TEMP_FILE_NAME in file_list :
print "echo {0} > {1}/{2}/device/{3}".format( ( bcm_obj.get_asic_temperature() * 1000 ), HWMON_PATH, index, SWITCH_TEMP_FILE_NAME )
os.system("echo {0} > {1}/{2}/device/{3}".format( ( bcm_obj.get_asic_temperature() * 1000 ), HWMON_PATH, index, SWITCH_TEMP_FILE_NAME ))
print("echo {0} > {1}/{2}/device/{3}".format( ( bcm_obj.get_asic_temperature() * 1000 ), HWMON_PATH, index, SWITCH_TEMP_FILE_NAME))
file = "{0}/{1}/device/{2}".format(HWMON_PATH, index, SWITCH_TEMP_FILE_NAME)
with open(file, 'w') as f:
f.write(str(bcm_obj.get_asic_temperature() * 1000) + '\n')
break
except Exception, e:
except Exception as e:
log_message( syslog.LOG_WARNING, "Exception. The warning is {0}".format(str(e)) )
initialLoop()
time.sleep(5)
Expand Down
5 changes: 3 additions & 2 deletions platform/broadcom/sonic-platform-modules-inventec/common/utils/led_proc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import syslog
import re
from sonic_sfp.bcmshell import bcmshell
from sonic_py_common.general import getstatusoutput_noshell


# =====================================================================
Expand Down Expand Up @@ -120,8 +121,8 @@ def _board_init():
global SYNC_S
global SYNC_P

cmd = "uname -n"
platform = os.popen(cmd).read()
cmd = ["uname", "-n"]
_, platform = getstatusoutput_noshell(cmd)

if platform.rstrip() == INV_MAGNOLIA:
BOARD_TPYE = "inventec_d6254qs"
Expand Down
3 changes: 2 additions & 1 deletion platform/broadcom/sonic-platform-modules-inventec/common/utils/platform_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import os
import socket
import subprocess
from collections import OrderedDict

# Purpose: Shutdown DUT upon receiving thermaltrip event from kernel (inv_pthread)
Expand Down Expand Up @@ -59,6 +60,6 @@ def next_events(self):

# Receive thermaltrip event
if event['ACTION'] == 'remove' and event['DEVPATH'] == '/kernel/platform_status/fan':
os.system("shutdown -h now")
subprocess.call(["shutdown", "-h", "now"])


3 changes: 2 additions & 1 deletion platform/broadcom/sonic-platform-modules-inventec/common/utils/transceiver_monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import syslog
from sfputil import SfpUtil
from sonic_sfp.bcmshell import bcmshell
from sonic_py_common.general import getstatusoutput_noshell

except ImportError as e:
raise ImportError("%s - required module not found" % str(e))
Expand Down Expand Up @@ -127,7 +128,7 @@ class BCMUtil(bcmshell):

def get_platform(self):
if self.platform is None:
self.platform = os.popen("uname -n").read().strip()
_, self.platform = getstatusoutput_noshell(["uname", "-n"])
return self.platform

def get_port_to_bcm_mapping(self):
Expand Down
3 changes: 2 additions & 1 deletion platform/broadcom/sonic-platform-modules-inventec/d6332/sonic_platform/qsfp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
try:
import os
import logging
import subprocess
from ctypes import create_string_buffer
from sonic_platform_base.sfp_base import SfpBase
from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
Expand Down Expand Up @@ -120,7 +121,7 @@ def __set_attr_value(self, attr_path, value):
return True

def __is_host(self):
return os.system("docker > /dev/null 2>&1") == 0
return subprocess.call(["docker"]) == 0

def __get_path_to_port_config_file(self):
host_platform_root_path = '/usr/share/sonic/device'
Expand Down
6 changes: 4 additions & 2 deletions platform/broadcom/sonic-platform-modules-inventec/d6332/utils/inventec_d6332_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import logging
import syslog
import time
from sonic_py_common.general import getstatusoutput_noshell_pipe

DEBUG = False
args = []
Expand Down Expand Up @@ -236,8 +237,9 @@ def system_install(boot_option):
return status
for addr_offset in range (0,FAN_NUM):
addr=FAN_VPD_ADDR_BASE+addr_offset
cmd = "i2cdetect -y "+str(FAN_VPD_CHANNEL)+" "+str(addr)+" "+str(addr)+" | grep "+str(hex(addr)).replace('0x','')
result=os.system(cmd)
cmd1 = ["i2cdetect", "-y", str(FAN_VPD_CHANNEL), str(addr), str(addr)]
cmd2 = ["grep", f'{addr:x}']
result, _ = getstatusoutput_noshell_pipe(cmd1, cmd2)
if( result==0 ):
cmd="echo inv_eeprom "+str(addr)+" > /sys/bus/i2c/devices/i2c-"+FAN_VPD_CHANNEL
status, output = exec_cmd(cmd,1)
Expand Down
3 changes: 2 additions & 1 deletion platform/broadcom/sonic-platform-modules-inventec/d6356/sonic_platform/qsfp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import os
import sys
import time
import subprocess
from sonic_platform_base.sfp_base import SfpBase
from sonic_platform_base.sonic_sfp.sff8436 import sff8436Dom
from sonic_platform_base.sonic_sfp.sff8436 import sff8436InterfaceId
Expand Down Expand Up @@ -108,7 +109,7 @@ def __get_attr_value(self, attr_path):
return retval

def __is_host(self):
return os.system("docker > /dev/null 2>&1") == 0
return subprocess.call(["docker"]) == 0

def __get_path_to_port_config_file(self):
host_platform_root_path = '/usr/share/sonic/device'
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-inventec/d6356/sonic_platform/sfp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

try:
import os
import sys
import subprocess
from sonic_platform_base.sfp_base import SfpBase
from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
Expand Down Expand Up @@ -95,7 +95,7 @@ def __get_attr_value(self, attr_path):
return retval

def __is_host(self):
return os.system("docker > /dev/null 2>&1") == 0
return subprocess.call(["docker"]) == 0

def __get_path_to_port_config_file(self):
host_platform_root_path = '/usr/share/sonic/device'
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-inventec/d7054q28b/sonic_platform/sfp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class Sfp(SfpBase):
# Path to QSFP sysfs
PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
HOST_CHK_CMD = "docker > /dev/null 2>&1"
HOST_CHK_CMD = ["docker"]

PLATFORM = "x86_64-inventec_d7054q28b-r0"
HWSKU = "INVENTEC-D7054Q28B-S48-Q6"
Expand Down Expand Up @@ -285,7 +285,7 @@ def __read_txt_file(self, file_path):
return ""

def __is_host(self):
return os.system(self.HOST_CHK_CMD) == 0
return subprocess.call(self.HOST_CHK_CMD) == 0

def __get_path_to_port_config_file(self):
platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
Expand Down