pyghmi 1.5.60__py3-none-any.whl → 1.5.61__py3-none-any.whl

pyghmi/ipmi/oem/lenovo/energy.py

@@ -31,7 +31,9 @@ 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',)
+                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
         except pygexc.IpmiException:
@@ -57,6 +59,23 @@ class EnergyManager(object):
         else:
             self.supportedmeters = ('DC Energy',)
 
+    def supports(self, name):
+        if name.lower() in self._mypowermeters:
+            return True
+        return False
+
+    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('<HHHH', rsp['data'][6:10])
+        if name.lower().startswith('node'):
+            return npow, 'W'
+        elif name.lower().startswith('gpu'):
+            return gpupow, 'W'
+        elif name.lower().startswith('total'):
+            return npow + gpupow, 'W'
+
     def get_fapm_energy(self, ipmicmd):
         rsp = ipmicmd.xraw_command(netfn=0x3a, command=0x32, data=[4, 2, 0, 0, 0])
         j, mj = struct.unpack('<IH', rsp['data'][2:8])

pyghmi/ipmi/oem/lenovo/handler.py

@@ -718,27 +718,28 @@ class OEMHandler(generic.OEMHandler):
                 fru['FRU Number'] = bextra[0]
                 fru['Revision'] = bextra[4]
                 macs = bextra[6]
-                macprefix = None
-                idx = 0
-                endidx = len(macs) - 5
-                macprefix = None
-                while idx < endidx:
-                    currmac = macs[idx:idx + 6]
-                    if not isinstance(currmac, bytearray):
-                        # invalid vpd format, abort attempts to extract
-                        # mac in this way
-                        break
-                    if currmac == b'\x00\x00\x00\x00\x00\x00':
-                        break
-                    # VPD may veer off, detect and break off
-                    if macprefix is None:
-                        macprefix = currmac[:3]
-                    elif currmac[:3] != macprefix:
-                        break
-                    ms = mac_format.format(*currmac)
-                    ifidx = idx / 6 + 1
-                    fru['MAC Address {0}'.format(ifidx)] = ms
-                    idx = idx + 6
+                if macs:
+                    macprefix = None
+                    idx = 0
+                    endidx = len(macs) - 5
+                    macprefix = None
+                    while idx < endidx:
+                        currmac = macs[idx:idx + 6]
+                        if not isinstance(currmac, bytearray):
+                            # invalid vpd format, abort attempts to extract
+                            # mac in this way
+                            break
+                        if currmac == b'\x00\x00\x00\x00\x00\x00':
+                            break
+                        # VPD may veer off, detect and break off
+                        if macprefix is None:
+                            macprefix = currmac[:3]
+                        elif currmac[:3] != macprefix:
+                            break
+                        ms = mac_format.format(*currmac)
+                        ifidx = idx / 6 + 1
+                        fru['MAC Address {0}'.format(ifidx)] = ms
+                        idx = idx + 6
             except (AttributeError, KeyError, IndexError):
                 pass
             if self.has_xcc and name and name.startswith('PSU '):

pyghmi/ipmi/oem/lenovo/imm.py

@@ -684,8 +684,13 @@ class IMMClient(object):
             return ()
 
     def get_oem_sensor_descriptions(self, ipmicmd):
-        return [{'name': x, 'type': 'Energy'
-                 } for x in self.get_oem_sensor_names(ipmicmd)]
+        desc = []
+        for x in self.get_oem_sensor_names(ipmicmd):
+            desc.append({
+                'name': x,
+                'type': 'Power' if 'Power' in x else 'Energy'
+            })
+        return desc
 
     def get_oem_sensor_reading(self, name, ipmicmd):
         if self._energymanager is None:
@@ -694,8 +699,15 @@ class IMMClient(object):
             kwh = self._energymanager.get_ac_energy(ipmicmd)
         elif name == 'DC Energy':
             kwh = self._energymanager.get_dc_energy(ipmicmd)
+        elif self._energymanager.supports(name):
+            value, units = self._energymanager.get_sensor(name, ipmicmd)
+            return sdr.SensorReading({
+                'name': name, 'imprecision': None,
+                'value': value,
+                'states': [], 'state_ids': [], 'health': pygconst.Health.Ok,
+                'type': 'Power'}, units)
         else:
-            raise pygexc.UnsupportedFunctionality('No sunch sensor ' + name)
+            raise pygexc.UnsupportedFunctionality('No such sensor ' + name)
         return sdr.SensorReading({'name': name, 'imprecision': None,
                                   'value': kwh, 'states': [],
                                   'state_ids': [],
@@ -1626,32 +1638,6 @@ class XCCClient(IMMClient):
         #             oemsensornames = oemsensornames + (name,)
         # return oemsensornames
 
-    def get_oem_sensor_descriptions(self, ipmicmd):
-        oemdesc = [{'name': x, 'type': 'Energy'} for x in super(
-            XCCClient, self).get_oem_sensor_names(ipmicmd)]
-        return oemdesc
-        # therminfo = self.grab_cacheable_json(
-        #     '/api/dataset/pwrmgmt?params=GetThermalRealTimeData', 1)
-        # if therminfo:
-        #     for name in sorted(therminfo['items'][0]):
-        #         if 'DIMM' in name and 'Temp' in name:
-        #             oemdesc.append({'name': name, 'type': 'Temperature'})
-        # return oemdesc
-
-    def get_oem_sensor_reading(self, name, ipmicmd):
-        if 'Energy' in name:
-            return super(XCCClient, self).get_oem_sensor_reading(name, ipmicmd)
-        therminfo = self.grab_cacheable_json(
-            '/api/dataset/pwrmgmt?params=GetThermalRealTimeData', 1)
-        temp = therminfo.get('items', [{}])[0].get(name, None)
-        if temp is None:
-            raise pygexc.UnsupportedFunctionality('No sunch sensor ' + name)
-        return sdr.SensorReading({'name': name, 'imprecision': None,
-                                  'value': temp, 'states': [],
-                                  'state_ids': [],
-                                  'health': pygconst.Health.Ok,
-                                  'type': 'Temperature'}, '°C')
-
     def get_storage_configuration(self, logout=True):
         rsp = self.wc.grab_json_response(
             '/api/function/raid_alldevices?params=storage_GetAllDevices,0')
@@ -2032,8 +2018,10 @@ class XCCClient(IMMClient):
                     raise Exception(uploadthread.rsp)
                 raise Exception(errmsg)
             rsp = json.loads(uploadthread.rsp)
-            monitorurl = rsp['TaskMonitor']
+            monitorurl = rsp['@odata.id']
             complete = False
+            phase = "apply"
+            statetype = 'TaskState'
             while not complete:
                 pgress, status = self.grab_redfish_response_with_status(
                     monitorurl)
@@ -2044,14 +2032,21 @@ class XCCClient(IMMClient):
                 for msg in pgress.get('Messages', []):
                     if 'Verify failed' in msg.get('Message', ''):
                         raise Exception(msg['Message'])
-                state = pgress['TaskState']
+                state = pgress[statetype]
                 if state in ('Cancelled', 'Exception',
                              'Interrupted', 'Suspended'):
                     raise Exception(json.dumps(pgress['Messages']))
                 pct = float(pgress['PercentComplete'])
                 complete = state == 'Completed'
-                progress({'phase': 'apply', 'progress': pct})
-                if not complete:
+                progress({'phase': phase, 'progress': pct})
+                if complete:
+                    if 'OperationTransitionedToJob' in pgress['Messages'][0]['MessageId']:
+                        monitorurl = pgress['Messages'][0]['MessageArgs'][0]
+                        phase = 'validating'
+                        statetype = 'JobState'
+                        complete = False
+                        ipmisession.Session.pause(3)
+                else:
                     ipmisession.Session.pause(3)
             if bank == 'backup':
                 return 'complete'

pyghmi/redfish/oem/lenovo/xcc.py

@@ -1156,8 +1156,10 @@ class OEMHandler(generic.OEMHandler):
                     raise Exception(uploadthread.rsp)
                 raise Exception(errmsg)
             rsp = json.loads(uploadthread.rsp)
-            monitorurl = rsp['TaskMonitor']
+            monitorurl = rsp['@odata.id']
             complete = False
+            phase = "apply"
+            statetype = 'TaskState'
             while not complete:
                 pgress = self._do_web_request(monitorurl, cache=False)
                 if not pgress:
@@ -1165,15 +1167,22 @@ class OEMHandler(generic.OEMHandler):
                 for msg in pgress.get('Messages', []):
                     if 'Verify failed' in msg.get('Message', ''):
                         raise Exception(msg['Message'])
-                state = pgress['TaskState']
+                state = pgress[statetype]
                 if state in ('Cancelled', 'Exception', 'Interrupted',
                              'Suspended'):
                     raise Exception(
                         json.dumps(json.dumps(pgress['Messages'])))
                 pct = float(pgress['PercentComplete'])
                 complete = state == 'Completed'
-                progress({'phase': 'apply', 'progress': pct})
-                if not complete:
+                progress({'phase': phase, 'progress': pct})
+                if complete:
+                    if 'OperationTransitionedToJob' in pgress['Messages'][0]['MessageId']:
+                        monitorurl = pgress['Messages'][0]['MessageArgs'][0]
+                        phase = 'validating'
+                        statetype = 'JobState'
+                        complete = False
+                        time.sleep(3)
+                else:
                     time.sleep(3)
             if bank == 'backup':
                 return 'complete'

{pyghmi-1.5.60.dist-info → pyghmi-1.5.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyghmi
-Version: 1.5.60
+Version: 1.5.61
 Summary: Python General Hardware Management Initiative (IPMI and others)
 Home-page: http://github.com/openstack/pyghmi/
 Author: Jarrod Johnson

{pyghmi-1.5.60.dist-info → pyghmi-1.5.61.dist-info}/RECORD

@@ -24,10 +24,10 @@ pyghmi/ipmi/oem/lenovo/config.py,sha256=X2N9e31IFTxk0w_m8kutaRZgV_9OnoczpneQQ6mV
 pyghmi/ipmi/oem/lenovo/cpu.py,sha256=POZMP9n2S1v6r8iNStkCOVEiQYs3ut3RqL_9x-kgOFw,1651
 pyghmi/ipmi/oem/lenovo/dimm.py,sha256=L8k1aBgtvxqyubDBNKdDkz80pDE8Sck1eMLcMz1GhFI,1875
 pyghmi/ipmi/oem/lenovo/drive.py,sha256=MmVgaosEwJXcwi1kKYGnY-dbrx4Zp55941qWMvprUMA,2055
-pyghmi/ipmi/oem/lenovo/energy.py,sha256=1AhpCFBXvlHtDIU8gGYPX6Wd-AjCzSTRxhgusgeXpmE,4980
+pyghmi/ipmi/oem/lenovo/energy.py,sha256=nMT8M82lbHSU31ei3iFwFKUxKf-BdX0t9zO0yKezC6s,5869
 pyghmi/ipmi/oem/lenovo/firmware.py,sha256=KS9uUBjFUzvdMw_e-kpr5sYIvFUaeg0yqyo69T94IVc,3747
-pyghmi/ipmi/oem/lenovo/handler.py,sha256=ALXoa0kLEdgA5_9UmOEuluR-jIHcZHRGNwW3lfWv2ss,56379
-pyghmi/ipmi/oem/lenovo/imm.py,sha256=ZN5S4s8MXF9pb5-fgjIa2XTHfEYmlaF2i8R4OcsgSe0,109294
+pyghmi/ipmi/oem/lenovo/handler.py,sha256=VyUv7n3-kswXXRyCl-0Ua-fGHjjg1gzStwJBW1fE7Lc,56488
+pyghmi/ipmi/oem/lenovo/imm.py,sha256=z29v32OULFs7XfOcpT0YMX5kKjPXbBwPzdW7LJEgslc,108884
 pyghmi/ipmi/oem/lenovo/inventory.py,sha256=FLJJinw-ibdHtf3KmrTzhWXbQrpxq3TSycVf96Hg7cw,5911
 pyghmi/ipmi/oem/lenovo/nextscale.py,sha256=c5eX8fCQdvgZ6_f7k3GYxcJMAc2I0Je6d8M3o_tOSJQ,43041
 pyghmi/ipmi/oem/lenovo/pci.py,sha256=S7p-5Q2qu2YhlffN-LEmIvjfXim6OlfYL7Q6r6VZqJ4,2020
@@ -53,7 +53,7 @@ pyghmi/redfish/oem/dell/main.py,sha256=g8773SShUpbYxXB9zVx2pD5z1xP04wB_sXAxcAs6_
 pyghmi/redfish/oem/lenovo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/redfish/oem/lenovo/main.py,sha256=eaCoePPXAw78BjKj9Ht7cqiXVGlj26Effy5_ybCnVDY,1622
 pyghmi/redfish/oem/lenovo/tsma.py,sha256=puSj0fO5Dt5VpDoEMVTRY95CP9q18eXcAqq7TDK350E,34633
-pyghmi/redfish/oem/lenovo/xcc.py,sha256=yEfdv91bvbcuulmlCAltQ2WhO8CnH-jfzWgISnTikS0,76229
+pyghmi/redfish/oem/lenovo/xcc.py,sha256=3ksHgrm_gf53b1ZYdxQfYZ7kwBQTfiY8cHN_Kie5VHs,76644
 pyghmi/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/tests/unit/base.py,sha256=xWImA7zPRgfrEe2xAdRZ6w_dLwExGRBJ5CBybssUQGg,744
@@ -62,11 +62,11 @@ pyghmi/tests/unit/ipmi/test_sdr.py,sha256=vb3iLY0cnHJ2K_m4xgYUjEcbPd_ZYhYx-uBowB
 pyghmi/util/__init__.py,sha256=GZLBWJiun2Plb_VE9dDSh4_PQMCha3gA7QLUqx3oSYI,25
 pyghmi/util/parse.py,sha256=6VlyBCEcE8gy8PJWmEDdtCyWATaKwPaTswCdioPCWOE,2120
 pyghmi/util/webclient.py,sha256=i3ZVQEO68Bq4EqkmN8jysXPGQjTvDzVl2-hZxq4zBWQ,14150
-pyghmi-1.5.60.dist-info/AUTHORS,sha256=Y5fQrIX2SnPK6llV0RjxLtWUQk4PCaAnsGHXU74foik,2007
-pyghmi-1.5.60.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pyghmi-1.5.60.dist-info/METADATA,sha256=DOxNUHbD68zv-_6XBJHC5XFGaArAXWBUIkgESALHggs,1119
-pyghmi-1.5.60.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-pyghmi-1.5.60.dist-info/entry_points.txt,sha256=WkbeJkEZzG9MOILxkaEPSEQ109YP9euntH9kcxbysuk,169
-pyghmi-1.5.60.dist-info/pbr.json,sha256=TWeoCrKqtAI3uE3HiYRdHkejnC6F4JIglclQVsn2d2k,46
-pyghmi-1.5.60.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
-pyghmi-1.5.60.dist-info/RECORD,,
+pyghmi-1.5.61.dist-info/AUTHORS,sha256=Y5fQrIX2SnPK6llV0RjxLtWUQk4PCaAnsGHXU74foik,2007
+pyghmi-1.5.61.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pyghmi-1.5.61.dist-info/METADATA,sha256=2ZD16qxl5BW8ya9JqS_UxAcoRVZblw3CCpAriaS_Ssw,1119
+pyghmi-1.5.61.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+pyghmi-1.5.61.dist-info/entry_points.txt,sha256=WkbeJkEZzG9MOILxkaEPSEQ109YP9euntH9kcxbysuk,169
+pyghmi-1.5.61.dist-info/pbr.json,sha256=OjMf3Uu2lYgQdRPWc_5aWPmvm55LCA7rlpt8Gp_BprQ,46
+pyghmi-1.5.61.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
+pyghmi-1.5.61.dist-info/RECORD,,

pyghmi-1.5.61.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "537fccb", "is_release": true}

pyghmi-1.5.60.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "bcfbd8f", "is_release": true}