Skip to content

DellEmc(Z9264f): Bug fix in show platform psustatus cli #3033

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
jleveque merged 4 commits into from
Jun 28, 2019
Merged

DellEmc(Z9264f): Bug fix in show platform psustatus cli #3033

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7cc394
DellEmc(Z9264f): Bug fix in show platform psustatus cli
gengankarthik Jun 18, 2019
2be46d6
DellEmc(Z9264f): Bug fix in show platform psustatus cli
gengankarthik Jun 22, 2019
092b388
DellEmc(Z9264f): Bug fix in show platform psustatus cli
gengankarthik Jun 25, 2019
873b4a2
DellEmc(Z9264f): Bug fix in show platform psustatus cli
gengankarthik Jun 26, 2019
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
13 changes: 11 additions & 2 deletions device/dell/x86_64-dellemc_z9264f_c3538-r0/plugins/psuutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
import os.path
import logging
import commands
import sys


Z9264F_MAX_PSUS = 2
IPMI_SENSOR_DATA = "docker exec -it pmon ipmitool sdr list"
IPMI_PSU_DATA = "docker exec -it pmon ipmitool sdr list"
IPMI_PSU_DATA_DOCKER = "ipmitool sdr list"
PSU_PRESENCE = "PSU{0}_state"
# Use this for older firmware
# PSU_PRESENCE="PSU{0}_prsnt"
Expand All @@ -28,15 +30,22 @@ class PsuUtil(PsuBase):

def __init__(self):
PsuBase.__init__(self)

def isDockerEnv(self):
Comment thread
jleveque marked this conversation as resolved.
num_docker = open('/proc/self/cgroup', 'r').read().count(":/docker")
return num_docker

# Fetch a BMC register
def get_pmc_register(self, reg_name):

status = 1
global ipmi_sdr_list
ipmi_dev_node = "/dev/pmi0"
ipmi_cmd = IPMI_PSU_DATA
dockerenv = self.isDockerEnv()
if dockerenv > 0:
ipmi_cmd = IPMI_PSU_DATA_DOCKER

ipmi_cmd = IPMI_SENSOR_DATA
status, ipmi_sdr_list = commands.getstatusoutput(ipmi_cmd)

if status:
Expand Down