diff --git a/pyghmi/ipmi/oem/lenovo/energy.py b/pyghmi/ipmi/oem/lenovo/energy.py index b6a5914e..a10a3d70 100644 --- a/pyghmi/ipmi/oem/lenovo/energy.py +++ b/pyghmi/ipmi/oem/lenovo/energy.py @@ -32,8 +32,8 @@ class EnergyManager(object): try: rsp = ipmicmd.xraw_command(netfn=0x3a, command=0x32, data=[4, 2, 0, 0, 0]) if len(rsp['data']) >= 8: - self.supportedmeters = ('DC Energy',) # 'GPU Power', - # 'Node Power', 'Total Power') + self.supportedmeters = ('DC Energy', 'GPU Power', + 'Node Power', 'Total Power') self._mypowermeters = ('node power', 'total power', 'gpu power', 'riser 1 power', 'riser 2 power') self._usefapm = True return @@ -67,9 +67,22 @@ class EnergyManager(object): def get_sensor(self, name, ipmicmd): if name.lower() not in self._mypowermeters: - raise pygexc.UnsupportedFunctionality('Unrecogcized sensor') - rsp = ipmicmd.xraw_command(netfn=0x3a, command=0x32, data=[4, 8, 0, 0, 0]) - npow, gpupow, r1pow, r2pow = struct.unpack('