pyghmi 1.5.77__py3-none-any.whl → 1.6.0__py3-none-any.whl

pyghmi/ipmi/command.py

@@ -654,6 +654,14 @@ class Command(object):
         return sel.EventHandler(self.init_sdr(), self).decode_pet(specifictrap,
                                                                   petdata)
 
+    def get_ikvm_methods(self):
+        self.oem_init()
+        return self._oem.get_ikvm_methods()
+
+    def get_ikvm_launchdata(self):
+        self.oem_init()
+        return self._oem.get_ikvm_launchdata()
+
     def get_inventory_descriptions(self):
         """Retrieve list of things that could be inventoried
 
@@ -1652,6 +1660,10 @@ class Command(object):
         r['privilege_level'] = privilege_levels[data[1] & 0b00001111]
         return r
 
+    def get_screenshot(self, outfile):
+        self.oem_init()
+        return self._oem.get_screenshot(outfile)
+
     def get_channel_info(self, channel=None):
         """Get channel info
 
@@ -2212,6 +2224,10 @@ class Command(object):
         self.oem_init()
         return self._oem.get_graphical_console()
 
+    def get_update_status(self):
+        self.oem_init()
+        return self._oem.get_update_status()
+
     def update_firmware(self, filename, data=None, progress=None, bank=None):
         """Send file to BMC to perform firmware update
 

pyghmi/ipmi/oem/generic.py

@@ -42,12 +42,22 @@ class OEMHandler(object):
         """
         return {}
 
+    def get_screenshot(self, outfile):
+        return {}
+
     def get_system_power_watts(self, ipmicmd):
         # Use DCMI getpower reading command
         rsp = ipmicmd.xraw_command(netfn=0x2c, command=2, data=(0xdc, 1, 0, 0))
         wattage = struct.unpack('<H', rsp['data'][1:3])[0]
         return wattage
-    
+
+    def get_ikvm_methods(self):
+        return []
+
+    def get_ikvm_launchdata(self):
+        # no standard ikvm behavior, must be oem defined
+        return {}
+
     def get_average_processor_temperature(self, ipmicmd):
         # DCMI suggests preferrence for 0x37 ('Air inlet')
         # If not that, then 0x40 ('Air inlet')
@@ -332,13 +342,17 @@ class OEMHandler(object):
         raise exc.UnsupportedFunctionality(
             'Remote storage configuration not supported on this platform')
 
+    def get_update_status(self):
+        raise exc.UnsupportedFunctionality(
+            'Firmwore update not supported on this platform')
+
     def update_firmware(self, filename, data=None, progress=None, bank=None):
         raise exc.UnsupportedFunctionality(
             'Firmware update not supported on this platform')
 
     def reseat_bay(self, bay):
         raise exc.UnsupportedFunctionality(
-            'Bay reseat not supported on this platform')
+            'Reseat not supported on this platform')
 
     def get_graphical_console(self):
         """Get graphical console launcher"""

pyghmi/ipmi/oem/lenovo/config.py

@@ -51,7 +51,16 @@ class Unsupported(Exception):
 def fromstring(inputdata):
     if b'!entity' in inputdata.lower():
         raise Exception('Unsupported XML')
-    return etree.fromstring(inputdata)
+    try:
+        return etree.fromstring(inputdata)
+    except etree.XMLSyntaxError:
+        inputdata = bytearray(inputdata.decode('utf8', errors='backslashreplace').encode())
+        for i in range(len(inputdata)):
+            if inputdata[i] < 0x20 and inputdata[i] not in (9, 0xa, 0xd):
+                inputdata[i] = 63
+        inputdata = bytes(inputdata)
+        return etree.fromstring(inputdata)
+
 
 
 def run_command_with_retry(connection, data):

pyghmi/ipmi/oem/lenovo/handler.py

@@ -211,11 +211,25 @@ class OEMHandler(generic.OEMHandler):
             self._mrethidx = rsp['data'][0]
         return self._mrethidx
 
+    def get_screenshot(self, outfile):
+        if self.has_xcc:
+            return self.immhandler.get_screenshot(outfile)
+        return {}
+
     def remove_storage_configuration(self, cfgspec):
         if self.has_xcc:
             return self.immhandler.remove_storage_configuration(cfgspec)
         return super(OEMHandler, self).remove_storage_configuration()
 
+    def get_ikvm_methods(self):
+        if self.has_xcc:
+            return ['url']
+
+    def get_ikvm_launchdata(self):
+        if self.has_xcc:
+            return self.immhandler.get_ikvm_launchdata()
+        return {}
+
     def clear_storage_arrays(self):
         if self.has_xcc:
             return self.immhandler.clear_storage_arrays()
@@ -1175,6 +1189,13 @@ class OEMHandler(generic.OEMHandler):
                 else:
                     raise
 
+    def get_update_status(self):
+        if self.is_fpc or self.has_tsma:
+            return "ready"
+        if self.has_xcc:
+            return self.immhandler.get_update_status()
+        return super(OEMHandler, self).get_update_status()
+
     def update_firmware(self, filename, data=None, progress=None, bank=None):
         if self.has_xcc:
             return self.immhandler.update_firmware(

pyghmi/ipmi/oem/lenovo/imm.py

@@ -617,7 +617,9 @@ class IMMClient(object):
                         skipkeys.add(fwi['key'])
                         if fwi.get('fw_status', 0) == 2:
                             bdata = {}
-                            if 'fw_version_pend' in fwi:
+                            if 'fw_pkg_version' in fwi and fwi['fw_pkg_version']:
+                                bdata['version'] = fwi['fw_pkg_version']
+                            elif 'fw_version_pend' in fwi:
                                 bdata['version'] = fwi['fw_version_pend']
                             yield '{0} Pending Update'.format(aname), bdata
         for fwi in fwu.get('items', []):
@@ -914,6 +916,14 @@ class XCCClient(IMMClient):
         self.ipmicmd.ipmi_session.register_keepalive(self.keepalive, None)
         self.adp_referer = None
 
+    def get_screenshot(self, outfile):
+        self.wc.grab_json_response('/api/providers/rp_screenshot')
+        url = '/download/HostScreenShot.png'
+        fd = webclient.FileDownloader(self.wc, url, outfile)
+        fd.start()
+        fd.join()
+
+
     def get_user_privilege_level(self, uid):
         uid = uid - 1
         accurl = '/redfish/v1/AccountService/Accounts/{0}'.format(uid)
@@ -922,6 +932,18 @@ class XCCClient(IMMClient):
             return accinfo.get('RoleId', None)
         return None
 
+    def get_ikvm_methods(self):
+        return ['url']
+
+    def get_ikvm_launchdata(self):
+        access = self.grab_redfish_response_with_status('/redfish/v1/Managers/1/Oem/Lenovo/RemoteControl/Actions/LenovoRemoteControlService.GetRemoteConsoleToken', {})
+        if access[0].get('Token', None):
+            accessinfo = {
+                'url': '/#/login?{}&context=remote&mode=multi'.format(access[0]['Token'])
+                }
+            return accessinfo
+        return {}
+
     def set_user_access(self, uid, privilege_level):
         uid = uid - 1
         role = None
@@ -940,8 +962,11 @@ class XCCClient(IMMClient):
 
     def reseat(self):
         wc = self.wc.dupe(timeout=5)
-        rsp = wc.grab_json_response_with_status(
-            '/api/providers/virt_reseat', '{}')
+        try:
+            rsp = wc.grab_json_response_with_status(
+                '/api/providers/virt_reseat', '{}')
+        except socket.timeout:
+            return # probably reseated itself and unable to reply
         if rsp[1] == 500 and rsp[0] == 'Target Unavailable':
             return
         if rsp[1] != 200 or rsp[0].get('return', 1) != 0:
@@ -1283,8 +1308,14 @@ class XCCClient(IMMClient):
         return True
 
     def get_diagnostic_data(self, savefile, progress=None, autosuffix=False):
-        self.wc.grab_json_response('/api/providers/ffdc',
-                                   {'Generate_FFDC': 1})
+        result = self.wc.grab_json_response('/api/providers/ffdc',
+                                            {'Generate_FFDC_status': 1})
+        rsp = self.wc.grab_json_response('/api/providers/ffdc',
+                                         {'Generate_FFDC': 1})
+        if rsp.get('return', 0) == 4:
+            rsp = self.wc.grab_json_response('/api/providers/ffdc',
+                                             {'Generate_FFDC': 1,
+                                              'thermal_log': 0})
         percent = 0
         while percent != 100:
             ipmisession.Session.pause(3)
@@ -2075,14 +2106,18 @@ class XCCClient(IMMClient):
             # the validating phase; add a retry here so we don't exit the loop in this case
             retry = 3
             while not complete and retry > 0:
-                pgress, status = self.grab_redfish_response_with_status(
-                    monitorurl)
+                try:
+                    pgress, status = self.grab_redfish_response_with_status(
+                        monitorurl)
+                except socket.timeout:
+                    pgress = None
                 if status < 200 or status >= 300:
                     raise Exception(pgress)
                 if not pgress:
                     retry -= 1
                     ipmisession.Session.pause(3)
                     continue
+                retry = 3 # reset retry counter
                 for msg in pgress.get('Messages', []):
                     if 'Verify failed' in msg.get('Message', ''):
                         raise Exception(msg['Message'])
@@ -2103,6 +2138,8 @@ class XCCClient(IMMClient):
                         ipmisession.Session.pause(3)
                 else:
                     ipmisession.Session.pause(3)
+            if not retry:
+                raise Exception('Falied to monitor update progress due to excessive timeouts')
             if bank == 'backup':
                 return 'complete'
             return 'pending'
@@ -2116,7 +2153,14 @@ class XCCClient(IMMClient):
 
     def set_custom_user_privilege(self, uid, privilege):
         return self.set_user_access(self, uid, privilege)
-       
+
+    def get_update_status(self):
+        upd = self.grab_redfish_response_emptyonerror('/redfish/v1/UpdateService')
+        health = upd.get('Status', {}).get('Health', 'bod')
+        if health == 'OK':
+            return 'ready'
+        return 'unavailable'
+
     def update_firmware(self, filename, data=None, progress=None, bank=None):
         usd = self.grab_redfish_response_emptyonerror(
             '/redfish/v1/UpdateService')

pyghmi/ipmi/oem/lenovo/nextscale.py

@@ -762,7 +762,13 @@ class SMMClient(object):
                 rsp = {'data': [1]}
             rsp['data'] = bytearray(rsp['data'])
             if rsp['data'][0] == 2:  # shared io
-                rsp = self.ipmicmd.xraw_command(0x32, 0xa7, data=[bay - 1])
+                try:
+                    rsp = self.ipmicmd.xraw_command(0x32, 0xa7, data=[bay - 1])
+                except Exception:
+                    raise Exception('Shared IO detected trying to reseat {}, '
+                                    'but unable to determine status of '
+                                    'partner bay {}'.format(
+                                        bay, bay - 1))
                 rsp['data'] = bytearray(rsp['data'])
                 if rsp['data'][1] == 0x80:
                     raise Exception('Unable to reseat bay {0} due to bay {1} '

pyghmi/redfish/command.py

@@ -432,6 +432,15 @@ class Command(object):
         self._do_web_request(accinfo[0], userinfo, method='PATCH', etag=etag)
         return True
 
+    def get_screenshot(self, outfile):
+        return self.oem.get_screenshot(outfile)
+
+    def get_ikvm_methods(self):
+        return self.oem.get_ikvm_methods()
+
+    def get_ikvm_launchdata(self):
+        return self.oem.get_ikvm_launchdata()
+
     def user_delete(self, uid):
         self.oem.user_delete(uid)
 
@@ -1115,7 +1124,7 @@ class Command(object):
             yield res
 
     def _extract_fwinfo(self, inf):
-        currinf = {}
+        currinf = self._oem._extract_fwinfo(inf)
         fwi, url = inf
         fwname = fwi.get('Name', 'Unknown')
         if fwname in self._fwnamemap:
@@ -1129,6 +1138,7 @@ class Command(object):
         currinf['id'] = fwi.get('Id', None)
         currinf['version'] = fwi.get('Version', 'Unknown')
         currinf['date'] = parse_time(fwi.get('ReleaseDate', ''))
+        currinf['software_id'] = fwi.get('SoftwareId', '')
         if not (currinf['version'] or currinf['date']):
             return None, None
         # TODO(Jarrod Johnson): OEM extended data with buildid
@@ -1419,6 +1429,8 @@ class Command(object):
                 self.wc.stdheaders['X-Auth-Token'] = self.xauthtoken
                 if 'Authorization' in self.wc.stdheaders:
                     del self.wc.stdheaders['Authorization']
+        for res in self.oem.list_media(self, cache=False):
+            pass
 
     def detach_remote_media(self):
         try:
@@ -1452,6 +1464,8 @@ class Command(object):
                                                      method='PATCH')
                             else:
                                 raise
+        for res in self.oem.list_media(self, cache=False):
+            pass
 
     def upload_media(self, filename, progress=None, data=None):
         """Upload a file to be hosted on the target BMC
@@ -1466,6 +1480,9 @@ class Command(object):
         """
         return self.oem.upload_media(filename, progress, data)
 
+    def get_update_status(self):
+        return self.oem.get_update_status()
+
     def update_firmware(self, file, data=None, progress=None, bank=None):
         """Send file to BMC to perform firmware update
 

pyghmi/redfish/oem/generic.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import base64
+import copy
 from fnmatch import fnmatch
 import json
 import os
@@ -193,6 +194,10 @@ class OEMHandler(object):
         self._urlcache = cache
         self.webclient = webclient
 
+    def get_screenshot(self, outfile):
+        raise exc.UnsupportedFunctionality(
+            'Retrieving screenshot is not implemented for this platform')
+
     def supports_expand(self, url):
         # Unfortunately, the state of expand in redfish is pretty dicey,
         # so an OEM handler must opt into this behavior
@@ -569,13 +574,14 @@ class OEMHandler(object):
             pendingsettings, self.attrdeps, reginfo,
             fishclient._setbiosurl)
 
-    def _set_redfish_settings(self, changeset, fishclient, currsettings,
+    def _set_redfish_settings(self, inchangeset, fishclient, currsettings,
                               rawsettings, pendingsettings, attrdeps, reginfo,
                               seturl):
         etag = pendingsettings.get('@odata.etag', None)
         pendingsettings = pendingsettings.get('Attributes', {})
         dephandler = AttrDependencyHandler(attrdeps, rawsettings,
                                            pendingsettings)
+        changeset = copy.deepcopy(inchangeset)
         for change in list(changeset):
             if change not in currsettings:
                 found = False
@@ -650,6 +656,9 @@ class OEMHandler(object):
         return {}
 
 
+    def _extract_fwinfo(self, inf):
+        return {}
+
     def get_firmware_inventory(self, components, fishclient):
         return []
 
@@ -663,13 +672,13 @@ class OEMHandler(object):
         except AttributeError:
             self.password = password
 
-    def list_media(self, fishclient):
-        bmcinfo = fishclient._do_web_request(fishclient._bmcurl)
+    def list_media(self, fishclient, cache=True):
+        bmcinfo = fishclient._do_web_request(fishclient._bmcurl, cache=cache)
         vmcoll = bmcinfo.get('VirtualMedia', {}).get('@odata.id', None)
         if vmcoll:
-            vmlist = fishclient._do_web_request(vmcoll)
+            vmlist = fishclient._do_web_request(vmcoll, cache=cache)
             vmurls = [x['@odata.id'] for x in vmlist.get('Members', [])]
-            for vminfo in fishclient._do_bulk_requests(vmurls):
+            for vminfo in fishclient._do_bulk_requests(vmurls, cache=cache):
                 vminfo = vminfo[0]
                 if vminfo.get('Image', None):
                     imageurl = vminfo['Image'].replace(
@@ -1018,6 +1027,12 @@ class OEMHandler(object):
             return topdata
         return topdata
 
+    def get_ikvm_methods(self):
+        return []
+
+    def get_ikvm_launchdata(self):
+        return {}
+
     def get_storage_configuration(self):
         raise exc.UnsupportedFunctionality(
             'Remote storage configuration not supported on this platform')
@@ -1038,6 +1053,15 @@ class OEMHandler(object):
         raise exc.UnsupportedFunctionality(
             'Remote media upload not supported on this platform')
 
+    def get_update_status(self):
+        upd = self._do_web_request('/redfish/v1/UpdateService')
+        health = upd.get('Status', {}).get('Health', 'Unknown')
+        if health == 'OK':
+            return 'ready'
+        if health == 'Unknown' and upd.get('ServiceEnabled'):
+            return 'ready'
+        return 'unavailable'
+
     def update_firmware(self, filename, data=None, progress=None, bank=None, otherfields=()):
         # disable cache to make sure we trigger the token renewal logic if needed
         usd = self._do_web_request('/redfish/v1/UpdateService', cache=False)
@@ -1090,11 +1114,15 @@ class OEMHandler(object):
             retry = 3
             pct = 0.0
             while not complete and retry > 0:
-                pgress = self._do_web_request(monitorurl, cache=False)
+                try:
+                    pgress = self._do_web_request(monitorurl, cache=False)
+                except socket.timeout:
+                    pgress = None
                 if not pgress:
                     retry -= 1
                     time.sleep(3)
                     continue
+                retry = 3 # reset retry counter
                 for msg in pgress.get('Messages', []):
                     if 'Verify failed' in msg.get('Message', ''):
                         raise Exception(msg['Message'])
@@ -1119,6 +1147,8 @@ class OEMHandler(object):
                         time.sleep(3)
                 else:
                     time.sleep(3)
+            if not retry:
+                raise Exception('Falied to monitor update progress due to excessive timeouts')
             return 'pending'
         finally:
             if 'HttpPushUriTargetsBusy' in usd:
@@ -1266,4 +1296,4 @@ class OEMHandler(object):
 
     def reseat_bay(self, bay):
         raise exc.UnsupportedFunctionality(
-            'Bay reseat not supported on this platform')
+            'Reseat not supported on this platform')

pyghmi/redfish/oem/lenovo/smm3.py

@@ -12,8 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import copy
+import os
 import pyghmi.redfish.oem.generic as generic
 import pyghmi.constants as pygconst
+import pyghmi.util.webclient as webclient
+import pyghmi.exceptions as exc
+import time
 
 healthlookup = {
     'ok': pygconst.Health.Ok,
@@ -38,6 +43,9 @@ def _baytonumber(bay):
 def _baytolabel(bay):
     try:
         baynum =  int(bay)
+        if baynum < 1:
+            raise exc.UnsupportedFunctionality(
+                    'Reseat not supported for whole chassis')
         # need to convert to 1a, 1b, etc...
         vertidx = ((baynum - 1) // 2 + 1) << 4
         horizidx = (baynum - 1) % 2 + 10
@@ -57,6 +65,58 @@ class OEMHandler(generic.OEMHandler):
     def get_system_configuration(self, hideadvanced=True, fishclient=None):
         return {}
 
+    def get_diagnostic_data(self, savefile, progress=None, autosuffix=False):
+        tsk = self._do_web_request(
+            '/redfish/v1/Managers/bmc/LogServices/Dump/Actions/LogService.CollectDiagnosticData',
+            {"DiagnosticDataType": "Manager"})
+        taskrunning = True
+        taskurl = tsk.get('@odata.id', None)
+        pct = 0 if taskurl else 100
+        durl = None
+        while pct < 100 and taskrunning:
+            status = self._do_web_request(taskurl)
+            durl = status.get('AdditionalDataURI', '')
+            pct = status.get('PercentComplete', 0)
+            taskrunning = status.get('TaskState', 'Complete') == 'Running'
+            if progress:
+                progress({'phase': 'initializing', 'progress': float(pct)})
+            if taskrunning:
+                time.sleep(3)
+        if not durl:
+            for hdr in status.get('Payload', {}).get('HttpHeaders', []):
+                if hdr.startswith('Location: '):
+
+                    enturl = hdr.replace('Location: ', '')
+                    entryinfo = self._do_web_request(enturl)
+                    durl = entryinfo.get('AdditionalDataURI', None)
+                    break
+        if not durl:
+            raise Exception("Failed getting service data url")
+        fname = os.path.basename(durl)
+        if autosuffix and not savefile.endswith('.tar.xz'):
+            savefile += time.strftime('-SMM3_%Y%m%d_%H%M%S.tar.xz')
+        fd = webclient.FileDownloader(self.webclient, durl, savefile)
+        fd.start()
+        while fd.isAlive():
+            fd.join(1)
+            if progress and self.webclient.get_download_progress():
+                progress({'phase': 'download',
+                          'progress': 100 * self.webclient.get_download_progress()})
+        if fd.exc:
+            raise fd.exc
+        if progress:
+            progress({'phase': 'complete'})
+        return savefile
+
+    def _extract_fwinfo(self, inf):
+        fwi, url = inf
+        currinf = {}
+        buildid = fwi.get('Oem', {}).get('Lenovo', {}).get('ExtendedVersion', None)
+        if buildid:
+            currinf['build'] = buildid
+        return currinf
+
+
     def _get_node_info(self):
         nodeinfo = self._varsysinfo
         if not nodeinfo:
@@ -69,9 +129,10 @@ class OEMHandler(generic.OEMHandler):
             if len(chassismembs) == 1:
                 chassisurl = chassismembs[0]['@odata.id']
                 nodeinfo = self._do_web_request(chassisurl)
-        nodeinfo['SKU'] = nodeinfo['Model']
-        nodeinfo['Model'] = 'N1380 Enclosure'
-        return nodeinfo
+        newnodeinfo = copy.deepcopy(nodeinfo)
+        newnodeinfo['SKU'] = nodeinfo['Model']
+        newnodeinfo['Model'] = 'N1380 Enclosure'
+        return newnodeinfo
 
     def reseat_bay(self, bay):
         bayid = _baytolabel(bay)

pyghmi/redfish/oem/lenovo/tsma.py

@@ -799,7 +799,7 @@ class TsmHandler(generic.OEMHandler):
         raise exc.UnsupportedFunctionality(
             'Remote media upload not supported on this system')
 
-    def list_media(self, fishclient=None):
+    def list_media(self, fishclient=None, cache=True):
         wc = self.wc
         rsp = wc.grab_json_response('/api/settings/media/general')
         cds = rsp['cd_remote_server_address']

pyghmi/redfish/oem/lenovo/xcc.py

@@ -150,6 +150,13 @@ class OEMHandler(generic.OEMHandler):
         self.fwc = None
         self.fwo = None
 
+    def get_screenshot(self, outfile):
+        self.wc.grab_json_response('/api/providers/rp_screenshot')
+        url = '/download/HostScreenShot.png'
+        fd = webclient.FileDownloader(self.wc, url, outfile)
+        fd.start()
+        fd.join()
+
     def get_extended_bmc_configuration(self, fishclient, hideadvanced=True):
         immsettings = self.get_system_configuration(fetchimm=True, hideadvanced=hideadvanced)
         for setting in list(immsettings):
@@ -157,6 +164,17 @@ class OEMHandler(generic.OEMHandler):
                 del immsettings[setting]
         return immsettings
 
+    def get_ikvm_methods(self):
+        return ['url']
+
+    def get_ikvm_launchdata(self):
+        access = self._do_web_request('/redfish/v1/Managers/1/Oem/Lenovo/RemoteControl/Actions/LenovoRemoteControlService.GetRemoteConsoleToken', {})
+        if access.get('Token', None):
+            accessinfo = {
+                'url': '/#/login?{}&context=remote&mode=multi'.format(access['Token'])
+                }
+            return accessinfo
+
     def get_system_configuration(self, hideadvanced=True, fishclient=None,
                                  fetchimm=False):
         if not self.fwc:
@@ -293,8 +311,12 @@ class OEMHandler(generic.OEMHandler):
             raise pygexc.UnsupportedFunctionality(
                 'This is not an enclosure manager')
         wc = self.wc.dupe(timeout=5)
-        rsp = wc.grab_json_response_with_status(
-            '/api/providers/virt_reseat', '{}')
+        try:
+            rsp = wc.grab_json_response_with_status(
+                '/api/providers/virt_reseat', '{}')
+        except socket.timeout:
+            # Can't be certain, but most likely a timeout'
+            return
         if rsp[1] == 500 and rsp[0] == 'Target Unavailable':
             return
         if rsp[1] != 200 or rsp[0].get('return', 1) != 0:
@@ -638,7 +660,9 @@ class OEMHandler(generic.OEMHandler):
                     skipkeys.add(fwi['key'])
                     if fwi.get('fw_status', 0) == 2:
                         bdata = {}
-                        if 'fw_version_pend' in fwi:
+                        if 'fw_pkg_version' in fwi and fwi['fw_pkg_version']:
+                            bdata['version'] = fwi['fw_pkg_version']
+                        elif 'fw_version_pend' in fwi:
                             bdata['version'] = fwi['fw_version_pend']
                         yield '{0} Pending Update'.format(aname), bdata
         for fwi in fdata.get('items', []):
@@ -1127,7 +1151,7 @@ class OEMHandler(generic.OEMHandler):
         res = wc.grab_json_response_with_status(url, body, method=method)
         return res
 
-    def list_media(self, fishclient):
+    def list_media(self, fishclient, cache=True):
         rt = self.wc.grab_json_response('/api/providers/rp_vm_remote_getdisk')
         if 'items' in rt:
             for mt in rt['items']:
@@ -1290,11 +1314,15 @@ class OEMHandler(generic.OEMHandler):
             # the validating phase; add a retry here so we don't exit the loop in this case
             retry = 3
             while not complete and retry > 0:
-                pgress = self._do_web_request(monitorurl, cache=False)
+                try:
+                    pgress = self._do_web_request(monitorurl, cache=False)
+                except socket.timeout:
+                    pgress = None
                 if not pgress:
                     retry -= 1
                     time.sleep(3)
                     continue
+                retry = 3 # reset retry counter
                 for msg in pgress.get('Messages', []):
                     if 'Verify failed' in msg.get('Message', ''):
                         raise Exception(msg['Message'])
@@ -1316,6 +1344,8 @@ class OEMHandler(generic.OEMHandler):
                         time.sleep(3)
                 else:
                     time.sleep(3)
+            if not retry:
+                raise Exception('Falied to monitor update progress due to excessive timeouts')
             if bank == 'backup':
                 return 'complete'
             return 'pending'
@@ -1530,8 +1560,12 @@ class OEMHandler(generic.OEMHandler):
         return 'pending'
 
     def get_diagnostic_data(self, savefile, progress=None, autosuffix=False):
-        self.wc.grab_json_response('/api/providers/ffdc',
-                                   {'Generate_FFDC': 1})
+        rsp = self.wc.grab_json_response('/api/providers/ffdc',
+                                         {'Generate_FFDC': 1})
+        if rsp.get('return', 0) == 4:
+            rsp = self.wc.grab_json_response('/api/providers/ffdc',
+                                             {'Generate_FFDC': 1,
+                                              'thermal_log': 0})
         percent = 0
         while percent != 100:
             time.sleep(3)

pyghmi/redfish/oem/lenovo/xcc3.py

@@ -42,6 +42,14 @@ class OEMHandler(generic.OEMHandler):
     def supports_expand(self, url):
         return True
 
+    def get_screenshot(self, outfile):
+        wc = self.webclient.dupe()
+        self._get_session_token(wc)
+        url = '/web_download/Mini_ScreenShot.jpg'
+        fd = webclient.FileDownloader(wc, url, outfile)
+        fd.start()
+        fd.join()
+
     def get_diagnostic_data(self, savefile, progress=None, autosuffix=False):
         tsk = self._do_web_request(
             '/redfish/v1/Systems/1/LogServices/DiagnosticLog/Actions/LogService.CollectDiagnosticData',
@@ -77,6 +85,17 @@ class OEMHandler(generic.OEMHandler):
             progress({'phase': 'complete'})
         return savefile
 
+    def get_ikvm_methods(self):
+        return ['openbmc', 'url']
+
+    def get_ikvm_launchdata(self):
+        access = self._do_web_request('/redfish/v1/Managers/1/Oem/Lenovo/RemoteControl/Actions/LenovoRemoteControlService.GetRemoteConsoleToken', {})
+        if access.get('Token', None):
+            accessinfo = {
+                'url': '/#/login?{}&context=remote&mode=multi'.format(access['Token'])
+                }
+            return accessinfo
+
     def get_system_power_watts(self, fishclient):
         powerinfo = fishclient._do_web_request('/redfish/v1/Chassis/1/Sensors/power_Sys_Power')
         return powerinfo['Reading']
@@ -270,7 +289,7 @@ class OEMHandler(generic.OEMHandler):
                 acctattribs['Oem']['Lenovo'][
                     self.oemacctmap[key.lower()]] = currval
                 if key.lower() == 'password_expiration':
-                    warntime = str(int(int(currval) * 0.08))
+                    warntime = int(int(currval) * 0.08)
                     acctattribs['Oem']['Lenovo'][
                         'PasswordExpirationWarningPeriod'] = warntime
             elif key.lower() in self.acctmap:
@@ -413,6 +432,13 @@ class OEMHandler(generic.OEMHandler):
             progress({'phase': 'complete'})
 
     def get_firmware_inventory(self, components, fishclient):
+        sfs = fishclient._do_web_request('/api/providers/system_firmware_status')
+        pendingscm = sfs.get('fpga_scm_pending_build', None)
+        pendinghpm = sfs.get('fpga_hpm_pending_build', None)
+        if pendingscm == '*':
+            pendingscm = None
+        if pendinghpm == '*':
+            pendinghpm = None
         fwlist = fishclient._do_web_request(fishclient._fwinventory + '?$expand=.')
         fwlist = copy.deepcopy(fwlist.get('Members', []))
         self._fwnamemap = {}
@@ -432,9 +458,11 @@ class OEMHandler(generic.OEMHandler):
             swid = redres.get('SoftwareId', '')
             buildid = ''
             version = redres.get('Version', None)
-            if swid.startswith('FPGA-') or swid.startswith('UEFI-') or swid.startswith('BMC-'):
-                buildid = swid.split('-')[1] + version.split('-')[0]
-                version = '-'.join(version.split('-')[1:])
+            for prefix in ['FPGA-', 'UEFI-', 'BMC-', 'LXPM-', 'DRVWN-', 'DRVLN-', 'LXUM']:
+                if swid.startswith(prefix):
+                    buildid = swid.split('-')[1] + version.split('-')[0]
+                    version = '-'.join(version.split('-')[1:])
+                    break
             if version:
                 redres['Version'] = version
             cres = fishclient._extract_fwinfo(res)
@@ -443,6 +471,14 @@ class OEMHandler(generic.OEMHandler):
             if buildid:
                 cres[1]['build'] = buildid
             yield cres
+            if cres[0] == 'SCM-FPGA' and pendingscm:
+                yield 'SCM-FPGA Pending', {
+                    'Name': 'SCM-FPGA Pending',
+                    'build': pendingscm}
+            elif cres[0] == 'HPM-FPGA' and pendinghpm:
+                yield 'HPM-FPGA Pending', {
+                    'Name': 'HPM-FPGA Pending',
+                    'build': pendinghpm}
         raise pygexc.BypassGenericBehavior()
 
 

{pyghmi-1.5.77.dist-info → pyghmi-1.6.0.dist-info}/METADATA

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

{pyghmi-1.5.77.dist-info → pyghmi-1.6.0.dist-info}/RECORD

@@ -11,25 +11,25 @@ pyghmi/cmd/pyghmiutil.py,sha256=hir7FFvwKDNxYGpOPCgIVSgHP4UsVKFIbVBgBWqkBxA,2917
 pyghmi/cmd/virshbmc.py,sha256=rNbRJrVnx5BmQQLVRV8JK3lW9YWUcP7Z8hCWfpfVLCM,5149
 pyghmi/ipmi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/ipmi/bmc.py,sha256=LJBF90msq8xFcZSUe3s3jVcW02Ib-0Fc5zWvQNtGmcQ,7283
-pyghmi/ipmi/command.py,sha256=qfoo_s2zosV7prL7IpuAaFwlBRM6ormXnPWqFj1LFoA,90521
+pyghmi/ipmi/command.py,sha256=hSxL67zvlROMVyUtERc7UDRlJ7Bbk28seGG_RCtuWa0,90945
 pyghmi/ipmi/console.py,sha256=Jle7uJI3ZQS6cMwbEisFEvXjmu5MVqMs17BcAlygR_4,23369
 pyghmi/ipmi/events.py,sha256=zgUidJIARHomwxasgeYAzDO1AEMfEOzb6XVxzry22Us,22569
 pyghmi/ipmi/fru.py,sha256=sw5ZBMrEVSBDgOUPVU_ksehQMJvrl2v-r7rVyA9xoiE,14430
 pyghmi/ipmi/sdr.py,sha256=U4NH-ca1zwEmU_dKT2wvXY2vEvXh33dV9rIUlmf_5Xw,32999
 pyghmi/ipmi/oem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/ipmi/oem/generic.py,sha256=-5mIxczwkvOdRy2NSPbSgPerQ5AMez-KhC8AkOrwkL0,18614
+pyghmi/ipmi/oem/generic.py,sha256=Ih8BoVebCCmgmHgbO1gJuprecRXG8vi2n4bZ-Oy6r7c,18966
 pyghmi/ipmi/oem/lookup.py,sha256=Ex00OEEolsdWCVhyP0QDGzOxHGEA7sKI8a8fW4kJPD8,3653
 pyghmi/ipmi/oem/lenovo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/ipmi/oem/lenovo/config.py,sha256=gxFl5Z-RSDyEvbmcQ_RI2xbaW7gdSWm_ysJeXxV0P_0,26325
+pyghmi/ipmi/oem/lenovo/config.py,sha256=aNN5dvbGlNpWlrrvlWthyAO0PGn6A9Pf75wjhVleu_k,26692
 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=THttIqlwpnj7ljbBWTHjelDLmDaQiCuMvNqJy9Ec7j8,6355
 pyghmi/ipmi/oem/lenovo/firmware.py,sha256=KS9uUBjFUzvdMw_e-kpr5sYIvFUaeg0yqyo69T94IVc,3747
-pyghmi/ipmi/oem/lenovo/handler.py,sha256=Y2c_IZph1VE5rP8d2fZASQulDtxL_yGv7bvJNtDxwL8,56632
-pyghmi/ipmi/oem/lenovo/imm.py,sha256=Yfrafthw1HU7Blw4JWnkryc2AEeUAoVok06A53hKvZc,111538
+pyghmi/ipmi/oem/lenovo/handler.py,sha256=ubLUJS9c3yuZiCH1m2I5-NFI9CbpRh3_okijQxARoxM,57236
+pyghmi/ipmi/oem/lenovo/imm.py,sha256=MFd26rim8d3yVrKWxXVchaXNch93ACelgDqmjxVZu9s,113461
 pyghmi/ipmi/oem/lenovo/inventory.py,sha256=FLJJinw-ibdHtf3KmrTzhWXbQrpxq3TSycVf96Hg7cw,5911
-pyghmi/ipmi/oem/lenovo/nextscale.py,sha256=ojLh17M87GnKUl-3yCTJcIJca1mpcrhlc7rQmhpby3A,43407
+pyghmi/ipmi/oem/lenovo/nextscale.py,sha256=bvY7MLOGMioXT7F6HBt5BBftGAEYNo2GkBNjwysPAWs,43734
 pyghmi/ipmi/oem/lenovo/pci.py,sha256=S7p-5Q2qu2YhlffN-LEmIvjfXim6OlfYL7Q6r6VZqJ4,2020
 pyghmi/ipmi/oem/lenovo/psu.py,sha256=ISgGe7MdLd1Z7MiRcgJ0gyC92m-4CDNmhMs-H0T3GVY,3098
 pyghmi/ipmi/oem/lenovo/raid_controller.py,sha256=hr9W17FwgpG9B544eebkEH88gOlU6M4gIapZq7WOPsw,2335
@@ -43,19 +43,19 @@ pyghmi/ipmi/private/simplesession.py,sha256=cNGaoT0uWIKDut6gUG9kAOX_b_qTzdB26R6I
 pyghmi/ipmi/private/spd.py,sha256=oEPSXm19X2eNXDiyW_6fVjBFqhuuMAtBI9quRJgclH4,27094
 pyghmi/ipmi/private/util.py,sha256=ayYodiSydlrrt0_pQppoRB1T6n-KNOiHZSfAlCMcpG0,3847
 pyghmi/redfish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/command.py,sha256=Rn2oooBAvnsGM46pS9TM7WVjDXGwrwlZY9mZqzC-97I,60741
+pyghmi/redfish/command.py,sha256=GhGxHRUFLgXp3sEdusd2U92lJGgPnn7pUQVH7uDNsaw,61304
 pyghmi/redfish/oem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/oem/generic.py,sha256=dwad7SwV4zYka0oKrSIBfjXu3KyFbOidVGXAW08tfAE,55691
+pyghmi/redfish/oem/generic.py,sha256=5RalOmcBlnvVx05sgo9xCYkTVZ8CrhKMb7pDTtuLAls,56718
 pyghmi/redfish/oem/lookup.py,sha256=pfJW5xSkUY61OirMeYy0b1SbjBFz6IDfN5ZOYog_Yq4,1530
 pyghmi/redfish/oem/dell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/redfish/oem/dell/idrac.py,sha256=pNnmqdV1sOP3ABw0xq0wF1QEO2L8onT7Osc_-sDO8EU,2146
 pyghmi/redfish/oem/dell/main.py,sha256=g8773SShUpbYxXB9zVx2pD5z1xP04wB_sXAxcAs6_xY,793
 pyghmi/redfish/oem/lenovo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/redfish/oem/lenovo/main.py,sha256=bnx8LuC_C4_OluNR8JSHIxtSlM4_jdBb4cUzJM6mazE,2597
-pyghmi/redfish/oem/lenovo/smm3.py,sha256=FWNCR6eSK6a9ZgZ5G-HyAllYkUD5hZeO7oOVKNNslEE,3152
-pyghmi/redfish/oem/lenovo/tsma.py,sha256=puSj0fO5Dt5VpDoEMVTRY95CP9q18eXcAqq7TDK350E,34633
-pyghmi/redfish/oem/lenovo/xcc.py,sha256=DG0GVEl_n-k77p_CFzUISLQ3AlTgppc9_yPwPy20Q4o,82735
-pyghmi/redfish/oem/lenovo/xcc3.py,sha256=NYL_6akVaS5sYL6f3beHSZjWeRGlDTbAkzYojDK_G6I,19516
+pyghmi/redfish/oem/lenovo/smm3.py,sha256=JnO89n59xK50MM7qKNofmLenmJ7e7rtaiuwGz-DxrNo,5598
+pyghmi/redfish/oem/lenovo/tsma.py,sha256=6GELCuriumARj_kv7fgqtUpo9ekiWHpQcM9v_mnGILI,34645
+pyghmi/redfish/oem/lenovo/xcc.py,sha256=78ksNj2-0jquj61lmAZldy3DdcR5KndqbLQ2Y4ZSFOM,84234
+pyghmi/redfish/oem/lenovo/xcc3.py,sha256=KBJQLAIpaU32bfFzKxZ9jH7oHnGgJIBz0bMZT-TMKy8,20989
 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
@@ -64,11 +64,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=782_yMuy_LuN9E2vh2EJ-R64X_EyvLLRuurE__jfn20,15371
-pyghmi-1.5.77.dist-info/AUTHORS,sha256=-0iHKtdQwAJfAGKcruCnvcQXrXuE_LgBZ3P15DJI1xY,2044
-pyghmi-1.5.77.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pyghmi-1.5.77.dist-info/METADATA,sha256=vGNVD3HFcrVNpj1IgdCPFTsS165Zmw0JLCSxagRV1ag,1137
-pyghmi-1.5.77.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pyghmi-1.5.77.dist-info/entry_points.txt,sha256=-OpJliDzATxmuPXK0VR3Ma-Yk_i4ZhfIIB-12A26dSI,168
-pyghmi-1.5.77.dist-info/pbr.json,sha256=bMLCDGwW8QTeMX-sRWFYm0VDMdoXgjoox4GwcdTx5hA,46
-pyghmi-1.5.77.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
-pyghmi-1.5.77.dist-info/RECORD,,
+pyghmi-1.6.0.dist-info/AUTHORS,sha256=-0iHKtdQwAJfAGKcruCnvcQXrXuE_LgBZ3P15DJI1xY,2044
+pyghmi-1.6.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pyghmi-1.6.0.dist-info/METADATA,sha256=jXiO4-aURNuuFgBYbGHrNV29OfV0W8_vVh0Q9pdFtsI,1136
+pyghmi-1.6.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+pyghmi-1.6.0.dist-info/entry_points.txt,sha256=-OpJliDzATxmuPXK0VR3Ma-Yk_i4ZhfIIB-12A26dSI,168
+pyghmi-1.6.0.dist-info/pbr.json,sha256=hh4S35BO_VBD-i-FKARTIoOpcIB6KZ5PAmA-FL5fLYs,46
+pyghmi-1.6.0.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
+pyghmi-1.6.0.dist-info/RECORD,,

{pyghmi-1.5.77.dist-info → pyghmi-1.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.3.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pyghmi-1.6.0.dist-info/pbr.json

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

pyghmi-1.5.77.dist-info/pbr.json

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