pyghmi 1.5.70__py3-none-any.whl → 1.5.72__py3-none-any.whl

pyghmi/ipmi/command.py

@@ -849,9 +849,9 @@ class Command(object):
         else:
             raise Exception("Unrecognized data format " + repr(fetchdata))
 
-    def get_extended_bmc_configuration(self):
+    def get_extended_bmc_configuration(self, hideadvanced=True):
         self.oem_init()
-        return self._oem.get_extended_bmc_configuration()
+        return self._oem.get_extended_bmc_configuration(hideadvanced=hideadvanced)
 
     def get_bmc_configuration(self):
         self.oem_init()

pyghmi/ipmi/oem/lenovo/config.py

@@ -272,7 +272,9 @@ class LenovoFirmwareConfig(object):
             cfgfilename = "config"
         options = {}
         data = None
-        if self.connection:
+        if not hasattr(self.xc, 'grab_redfish_response_with_status'):
+            rsp = ({}, 500)
+        elif self.connection:
             rsp = ({}, 200)
         else:
             rsp = self.xc.grab_redfish_response_with_status(

pyghmi/ipmi/oem/lenovo/handler.py

@@ -1194,9 +1194,9 @@ class OEMHandler(generic.OEMHandler):
             return {'height': self._fpc_variant & 0xf, 'slot': 0}
         return super(OEMHandler, self).get_description()
 
-    def get_extended_bmc_configuration(self):
+    def get_extended_bmc_configuration(self, hideadvanced=True):
         if self.has_xcc:
-            return self.immhandler.get_extended_bmc_configuration()
+            return self.immhandler.get_extended_bmc_configuration(hideadvanced=hideadvanced)
         return super(OEMHandler, self).get_extended_bmc_configuration()
 
     def get_bmc_configuration(self):

pyghmi/ipmi/oem/lenovo/imm.py

@@ -978,8 +978,8 @@ class XCCClient(IMMClient):
                 return {}
         return {'height': int(dsc['u-height']), 'slot': int(dsc['slot'])}
 
-    def get_extended_bmc_configuration(self):
-        immsettings = self.get_system_configuration(fetchimm=True)
+    def get_extended_bmc_configuration(self, hideadvanced=True):
+        immsettings = self.get_system_configuration(fetchimm=True, hideadvanced=hideadvanced)
         for setting in list(immsettings):
             if not setting.startswith('IMM.'):
                 del immsettings[setting]

pyghmi/redfish/command.py

@@ -81,20 +81,6 @@ def _mask_to_cidr(mask):
     return cidr
 
 
-def _to_boolean(attrval):
-    attrval = attrval.lower()
-    if not attrval:
-        return False
-    if ('true'.startswith(attrval) or 'yes'.startswith(attrval)
-            or 'enabled'.startswith(attrval) or attrval == '1'):
-        return True
-    if ('false'.startswith(attrval) or 'no'.startswith(attrval)
-            or 'disabled'.startswith(attrval) or attrval == '0'):
-        return False
-    raise Exception(
-        'Unrecognized candidate for boolean: {0}'.format(attrval))
-
-
 def _cidr_to_mask(cidr):
     return socket.inet_ntop(
         socket.AF_INET, struct.pack(
@@ -547,7 +533,7 @@ class Command(object):
                 msgid = ','.join(msgid)
                 raise exc.RedfishError(errmsg, msgid=msgid)
             except (ValueError, KeyError):
-                raise exc.PyghmiException(str(url) + ":" + res[0])
+                raise exc.PyghmiException(str(url) + ":" + str(res[0]))
         if payload is None and method is None:
             self._urlcache[url] = {'contents': res[0],
                                    'vintage': os.times()[4]}
@@ -789,6 +775,9 @@ class Command(object):
     def get_health(self, verbose=True):
         return self.oem.get_health(self, verbose)
 
+    def get_extended_bmc_configuration(self, hideadvanced=True):
+        return self.oem.get_extended_bmc_configuration(self, hideadvanced=hideadvanced)
+
     def get_bmc_configuration(self):
         """Get miscellaneous BMC configuration
 
@@ -823,8 +812,16 @@ class Command(object):
         In many cases, this may render remote network access impracticle or
         impossible."
         """
+        bmcinfo = self._do_web_request(self._bmcurl)
+        rc = bmcinfo.get('Actions', {}).get('#Manager.ResetToDefaults', {})
+        actinf = rc.get('ResetType@Redfish.AllowableValues', [])
+        if 'ResetAll' in actinf:
+            acturl = actinf.get('target', None)
+            if acturl:
+                self._do_web_request(acturl, {'ResetType': 'ResetAll'})
+                return
         raise exc.UnsupportedFunctionality(
-            'Clear BMC configuration not supported in redfish yet')
+            'Clear BMC configuration not supported on this platform')
 
     def get_system_configuration(self, hideadvanced=True):
         return self.oem.get_system_configuration(hideadvanced, self)
@@ -966,7 +963,7 @@ class Command(object):
 
     def get_firmware(self, components=()):
         try:
-            for firminfo in self.oem.get_firmware_inventory(components):
+            for firminfo in self.oem.get_firmware_inventory(components, self):
                 yield firminfo
         except exc.BypassGenericBehavior:
             return
@@ -1081,7 +1078,7 @@ class Command(object):
         return self._oem
 
     def get_description(self):
-        return self.oem.get_description()
+        return self.oem.get_description(self)
 
     def get_event_log(self, clear=False):
         bmcinfo = self._do_web_request(self._bmcurl)
@@ -1413,20 +1410,20 @@ class Command(object):
         return self.oem.get_diagnostic_data(savefile, progress, autosuffix)
 
     def get_licenses(self):
-        return self.oem.get_licenses()
+        return self.oem.get_licenses(self)
 
     def delete_license(self, name):
-        return self.oem.delete_license(name)
+        return self.oem.delete_license(name, self)
 
     def save_licenses(self, directory):
         if os.path.exists(directory) and not os.path.isdir(directory):
             raise exc.InvalidParameterValue(
                 'Not allowed to overwrite existing file: {0}'.format(
                     directory))
-        return self.oem.save_licenses(directory)
+        return self.oem.save_licenses(directory, self)
 
     def apply_license(self, filename, progress=None, data=None):
-        return self.oem.apply_license(filename, progress, data)
+        return self.oem.apply_license(filename, self, progress, data)
 
 
 if __name__ == '__main__':

pyghmi/redfish/oem/generic.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import base64
 from fnmatch import fnmatch
 import json
 import os
@@ -43,6 +44,29 @@ class SensorReading(object):
         self.units = units
         self.unavailable = unavailable
 
+
+def _to_boolean(attrval):
+    attrval = attrval.lower()
+    if not attrval:
+        return False
+    if ('true'.startswith(attrval) or 'yes'.startswith(attrval)
+            or 'enabled'.startswith(attrval) or attrval == '1'):
+        return True
+    if ('false'.startswith(attrval) or 'no'.startswith(attrval)
+            or 'disabled'.startswith(attrval) or attrval == '0'):
+        return False
+    raise Exception(
+        'Unrecognized candidate for boolean: {0}'.format(attrval))
+
+
+def _normalize_mac(mac):
+    if ':' not in mac:
+        mac = ':'.join((
+            mac[:2], mac[2:4], mac[4:6],
+            mac[6:8], mac[8:10], mac[10:12]))
+    return mac.lower()
+
+
 _healthmap = {
     'Critical': const.Health.Critical,
     'Unknown': const.Health.Warning,
@@ -339,6 +363,38 @@ class OEMHandler(object):
     def get_system_configuration(self, hideadvanced=True, fishclient=None):
         return self._getsyscfg(fishclient)[0]
 
+    def _get_attrib_registry(self, fishclient, attribreg):
+        overview = fishclient._do_web_request('/redfish/v1/')
+        reglist = overview['Registries']['@odata.id']
+        reglist = fishclient._do_web_request(reglist)
+        regurl = None
+        for cand in reglist.get('Members', []):
+            cand = cand.get('@odata.id', '')
+            candname = cand.split('/')[-1]
+            if candname == '':  # implementation uses trailing slash
+                candname = cand.split('/')[-2]
+            if candname == attribreg:
+                regurl = cand
+                break
+        if not regurl:
+            # Workaround a vendor bug where they link to a
+            # non-existant name
+            for cand in reglist.get('Members', []):
+                cand = cand.get('@odata.id', '')
+                candname = cand.split('/')[-1]
+                candname = candname.split('.')[0]
+                if candname == attribreg.split('.')[0]:
+                    regurl = cand
+                    break
+        if regurl:
+            reginfo = fishclient._do_web_request(regurl)
+            for reg in reginfo.get('Location', []):
+                if reg.get('Language', 'en').startswith('en'):
+                    reguri = reg['Uri']
+                    reginfo = self._get_biosreg(reguri, fishclient)
+                    return reginfo
+                    extrainfo, valtodisplay, _, self.attrdeps = reginfo
+
     def _getsyscfg(self, fishclient):
         biosinfo = self._do_web_request(fishclient._biosurl, cache=False)
         reginfo = ({}, {}, {}, {})
@@ -346,36 +402,9 @@ class OEMHandler(object):
         valtodisplay = {}
         self.attrdeps = {'Dependencies': [], 'Attributes': []}
         if 'AttributeRegistry' in biosinfo:
-            overview = fishclient._do_web_request('/redfish/v1/')
-            reglist = overview['Registries']['@odata.id']
-            reglist = fishclient._do_web_request(reglist)
-            regurl = None
-            for cand in reglist.get('Members', []):
-                cand = cand.get('@odata.id', '')
-                candname = cand.split('/')[-1]
-                if candname == '':  # implementation uses trailing slash
-                    candname = cand.split('/')[-2]
-                if candname == biosinfo['AttributeRegistry']:
-                    regurl = cand
-                    break
-            if not regurl:
-                # Workaround a vendor bug where they link to a
-                # non-existant name
-                for cand in reglist.get('Members', []):
-                    cand = cand.get('@odata.id', '')
-                    candname = cand.split('/')[-1]
-                    candname = candname.split('.')[0]
-                    if candname == biosinfo[
-                            'AttributeRegistry'].split('.')[0]:
-                        regurl = cand
-                        break
-            if regurl:
-                reginfo = fishclient._do_web_request(regurl)
-                for reg in reginfo.get('Location', []):
-                    if reg.get('Language', 'en').startswith('en'):
-                        reguri = reg['Uri']
-                        reginfo = self._get_biosreg(reguri, fishclient)
-                        extrainfo, valtodisplay, _, self.attrdeps = reginfo
+            reginfo = self._get_attrib_registry(fishclient, biosinfo['AttributeRegistry'])
+            if reginfo:
+                extrainfo, valtodisplay, _, self.attrdeps = reginfo
         currsettings = {}
         try:
             pendingsettings = fishclient._do_web_request(
@@ -412,10 +441,19 @@ class OEMHandler(object):
         rawsettings = fishclient._do_web_request(fishclient._biosurl,
                                                  cache=False)
         rawsettings = rawsettings.get('Attributes', {})
-        pendingsettings = fishclient._do_web_request(fishclient._setbiosurl)
+        pendingsettings = fishclient._do_web_request(
+            fishclient._setbiosurl)
+        return self._set_redfish_settings(
+            changeset, fishclient, currsettings, rawsettings,
+            pendingsettings, self.attrdeps, reginfo,
+            fishclient._setbiosurl)
+
+    def _set_redfish_settings(self, changeset, fishclient, currsettings,
+                              rawsettings, pendingsettings, attrdeps, reginfo,
+                              seturl):
         etag = pendingsettings.get('@odata.etag', None)
         pendingsettings = pendingsettings.get('Attributes', {})
-        dephandler = AttrDependencyHandler(self.attrdeps, rawsettings,
+        dephandler = AttrDependencyHandler(attrdeps, rawsettings,
                                            pendingsettings)
         for change in list(changeset):
             if change not in currsettings:
@@ -434,7 +472,7 @@ class OEMHandler(object):
             changeval = changeset[change]
             overrides, blameattrs = dephandler.get_overrides(change)
             meta = {}
-            for attr in self.attrdeps['Attributes']:
+            for attr in attrdeps['Attributes']:
                 if attr['AttributeName'] == change:
                     meta = dict(attr)
                     break
@@ -473,7 +511,7 @@ class OEMHandler(object):
                         changeset[change] = _to_boolean(changeset[change])
         redfishsettings = {'Attributes': changeset}
         fishclient._do_web_request(
-            fishclient._setbiosurl, redfishsettings, 'PATCH', etag=etag)
+            seturl, redfishsettings, 'PATCH', etag=etag)
 
     def attach_remote_media(self, url, username, password, vmurls):
         return None
@@ -481,10 +519,10 @@ class OEMHandler(object):
     def detach_remote_media(self):
         return None
 
-    def get_description(self):
+    def get_description(self, fishclient):
         return {}
 
-    def get_firmware_inventory(self, components):
+    def get_firmware_inventory(self, components, fishclient):
         return []
 
     def set_credentials(self, username, password):
@@ -533,6 +571,12 @@ class OEMHandler(object):
                 'Model': self._varsysinfo.get(
                     'SKU', self._varsysinfo.get('PartNumber', '')),
             }
+            if sysinfo['UUID'] and '-' not in sysinfo['UUID']:
+                sysinfo['UUID'] = '-'.join((
+                    sysinfo['UUID'][:8], sysinfo['UUID'][8:12],
+                    sysinfo['UUID'][12:16], sysinfo['UUID'][16:20],
+                    sysinfo['UUID'][20:]))
+            sysinfo['UUID'] = sysinfo['UUID'].lower()
             return sysinfo
         else:
             for invpair in self.get_inventory():
@@ -548,6 +592,12 @@ class OEMHandler(object):
             'Model': self._varsysinfo.get(
                 'SKU', self._varsysinfo.get('PartNumber', '')),
         }
+        if sysinfo['UUID'] and '-' not in sysinfo['UUID']:
+            sysinfo['UUID'] = '-'.join((
+                sysinfo['UUID'][:8], sysinfo['UUID'][8:12],
+                sysinfo['UUID'][12:16], sysinfo['UUID'][16:20],
+                sysinfo['UUID'][20:]))
+        sysinfo['UUID'] = sysinfo['UUID'].lower()
         yield ('System', sysinfo)
         self._hwnamemap = {}
         cpumemurls = []
@@ -599,22 +649,39 @@ class OEMHandler(object):
             yield (dname, ddata)
 
     def _get_adp_inventory(self, onlyname=False, withids=False, urls=None):
+        foundmacs = False
+        macinfobyadpname = {}
+        if 'NetworkInterfaces' in self._varsysinfo:
+            nifurls = self._do_web_request(self._varsysinfo['NetworkInterfaces']['@odata.id'])
+            nifurls = nifurls.get('Members', [])
+            nifurls = [x['@odata.id'] for x in nifurls]
+            for nifurl in nifurls:
+                nifinfo = self._do_web_request(nifurl)
+
+                nadurl = nifinfo.get('Links', {}).get('NetworkAdapter', {}).get("@odata.id")
+                if nadurl:
+                    nadinfo = self._do_web_request(nadurl)
+                    if 'Name' not in nadinfo:
+                        continue
+                    nicname = nadinfo['Name']
+                    yieldinf = {}
+                    macidx = 1
+                    for ctrlr in nadinfo.get('Controllers', []):
+                        porturls = [x['@odata.id'] for x in ctrlr.get(
+                            'Links', {}).get('Ports', [])]
+                        for porturl in porturls:
+                            portinfo = self._do_web_request(porturl)
+                            macs = [x for x in portinfo.get(
+                                'Ethernet', {}).get(
+                                    'AssociatedMACAddresses', [])]
+                            for mac in macs:
+                                label = 'MAC Address {}'.format(macidx)
+                                yieldinf[label] = _normalize_mac(mac)
+                                macidx += 1
+                                foundmacs = True
+                    macinfobyadpname[nicname] = yieldinf
         if not urls:
             urls = self._get_adp_urls()
-            if not urls:
-                # No PCIe device inventory, but *maybe* ethernet inventory...
-                aidx = 1
-                for nicinfo in self._get_eth_urls():
-                    nicinfo = self._do_web_request(nicinfo)
-                    nicname = nicinfo.get('Name', None)
-                    nicinfo = nicinfo.get('MACAddress', None)
-                    if not nicname:
-                        nicname = 'NIC'
-                    if nicinfo:
-                        yield (nicname,
-                               {'MAC Address {0}'.format(aidx): nicinfo})
-                        aidx += 1
-                return
         for inf in self._do_bulk_requests(urls):
             adpinfo, url = inf
             aname = adpinfo.get('Name', 'Unknown')
@@ -636,6 +703,8 @@ class OEMHandler(object):
                 yieldinf = {'Id': adpinfo.get('Id', aname)}
             else:
                 yieldinf = {}
+            if aname in macinfobyadpname:
+                yieldinf.update(macinfobyadpname[aname])
             funurls = [x['@odata.id'] for x in functions]
             for fun in self._do_bulk_requests(funurls):
                 funinfo, url = fun
@@ -648,14 +717,42 @@ class OEMHandler(object):
                 yieldinf['PCI Subsystem Vendor ID'] = funinfo[
                     'SubsystemVendorId'].replace('0x', '')
                 yieldinf['Type'] = funinfo['DeviceClass']
-                for nicinfo in funinfo.get('Links', {}).get(
-                        'EthernetInterfaces', []):
-                    nicinfo = self._do_web_request(nicinfo['@odata.id'])
-                    macaddr = nicinfo.get('MACAddress', None)
-                    if macaddr:
-                        yieldinf['MAC Address {0}'.format(nicidx)] = macaddr
-                        nicidx += 1
+                if aname not in macinfobyadpname:
+                    for nicinfo in funinfo.get('Links', {}).get(
+                            'EthernetInterfaces', []):
+                        nicinfo = self._do_web_request(nicinfo['@odata.id'])
+                        macaddr = nicinfo.get('MACAddress', None)
+                        if macaddr:
+                            macaddr = _normalize_mac(macaddr)
+                            foundmacs = True
+                            yieldinf['MAC Address {0}'.format(nicidx)] = macaddr
+                            nicidx += 1
+            if aname in macinfobyadpname:
+                del macinfobyadpname[aname]
             yield aname, yieldinf
+        if macinfobyadpname:
+            for adp in macinfobyadpname:
+                yield adp, macinfobyadpname[adp]
+        if not foundmacs:
+          # No PCIe device inventory, but *maybe* ethernet inventory...
+            idxsbyname = {}
+            for nicinfo in self._get_eth_urls():
+                nicinfo = self._do_web_request(nicinfo)
+                nicname = nicinfo.get('Name', None)
+                nicinfo = nicinfo.get('MACAddress', nicinfo.get('PermanentAddress', None))
+                if nicinfo and ':' not in nicinfo:
+                    nicinfo = ':'.join((
+                        nicinfo[:2], nicinfo[2:4], nicinfo[4:6], nicinfo[6:8],
+                        nicinfo[8:10], nicinfo[10:12]))
+                if not nicname:
+                    nicname = 'NIC'
+                if nicinfo:
+                    if nicname not in idxsbyname:
+                        idxsbyname[nicname] = 0
+                    idxsbyname[nicname] += 1
+                    nicinfo = nicinfo.lower()
+                    yield (nicname,
+                            {'MAC Address {}'.format(idxsbyname[nicname]): nicinfo})
 
     def _get_eth_urls(self):
         ethurls = self._varsysinfo.get('EthernetInterfaces', {})
@@ -780,20 +877,24 @@ class OEMHandler(object):
 
     def update_firmware(self, filename, data=None, progress=None, bank=None):
         usd = self._do_web_request('/redfish/v1/UpdateService')
-        if usd.get('HttpPushUriTargetsBusy', False):
-            raise exc.TemporaryError('Cannot run multtiple updates to '
-                                        'same target concurrently')
-        try:
-            upurl = usd['HttpPushUri']
-        except KeyError:
-            raise exc.UnsupportedFunctionality('Redfish firmware update only supported for implementations with push update support')
-        if 'HttpPushUriTargetsBusy' in usd:
-            self._do_web_request(
-                '/redfish/v1/UpdateService',
-                {'HttpPushUriTargetsBusy': True}, method='PATCH')
+        upurl = usd.get('MultipartHttpPushUri', None)
+        ismultipart = True
+        if not upurl:
+            ismultipart = False
+            if usd.get('HttpPushUriTargetsBusy', False):
+                raise exc.TemporaryError('Cannot run multtiple updates to '
+                                            'same target concurrently')
+            try:
+                upurl = usd['HttpPushUri']
+            except KeyError:
+                raise exc.UnsupportedFunctionality('Redfish firmware update only supported for implementations with push update support')
+            if 'HttpPushUriTargetsBusy' in usd:
+                self._do_web_request(
+                    '/redfish/v1/UpdateService',
+                    {'HttpPushUriTargetsBusy': True}, method='PATCH')
         try:
             uploadthread = webclient.FileUploader(
-                self.webclient, upurl, filename, data, formwrap=False,
+                self.webclient, upurl, filename, data, formwrap=ismultipart,
                 excepterror=False)
             uploadthread.start()
             wc = self.webclient
@@ -823,6 +924,7 @@ class OEMHandler(object):
             # sometimes we get an empty pgress when transitioning from the apply phase to
             # the validating phase; add a retry here so we don't exit the loop in this case
             retry = 3
+            pct = 0.0
             while not complete and retry > 0:
                 pgress = self._do_web_request(monitorurl, cache=False)
                 if not pgress:
@@ -837,7 +939,10 @@ class OEMHandler(object):
                              'Suspended'):
                     raise Exception(
                         json.dumps(json.dumps(pgress['Messages'])))
-                pct = float(pgress['PercentComplete'])
+                if 'PercentComplete' in pgress:
+                    pct = float(pgress['PercentComplete'])
+                else:
+                    print(repr(pgress))
                 complete = state == 'Completed'
                 progress({'phase': phase, 'progress': pct})
                 if complete:
@@ -910,17 +1015,62 @@ class OEMHandler(object):
         raise exc.UnsupportedFunctionality(
             'Retrieving diagnostic data is not implemented for this platform')
 
-    def get_licenses(self):
-        raise exc.UnsupportedFunctionality()
+    def _get_license_collection_url(self, fishclient):
+        overview = fishclient._do_web_request('/redfish/v1/')
+        licsrv = overview.get('LicenseService', {}).get('@odata.id', None)
+        if not licsrv:
+            raise exc.UnsupportedFunctionality()
+        lcs = fishclient._do_web_request(licsrv)
+        licenses = lcs.get('Licenses', {}).get('@odata.id',None)
+        if not licenses:
+            raise exc.UnsupportedFunctionality()
+        return licenses
 
-    def delete_license(self, name):
+    def get_extended_bmc_configuration(self, fishclient, hideadvanced=True):
         raise exc.UnsupportedFunctionality()
 
-    def save_licenses(self, directory):
-        raise exc.UnsupportedFunctionality()
+    def _get_licenses(self, fishclient):
+        licenses = self._get_license_collection_url(fishclient)
+        collection = fishclient._do_web_request(licenses)
+        alllic = [x['@odata.id'] for x in collection.get('Members', [])]
+        for license in alllic:
+            licdet = fishclient._do_web_request(license)
+            state = licdet.get('Status', {}).get('State')
+            if state != 'Enabled':
+                continue
+            yield licdet
 
-    def apply_license(self, filename, progress=None, data=None):
-        raise exc.UnsupportedFunctionality()
+    def get_licenses(self, fishclient):
+        for licdet in self._get_licenses(fishclient):
+            name = licdet['Name']
+            yield {'name': name, 'state': 'Active'}
+
+    def delete_license(self, name, fishclient):
+        for licdet in self._get_licenses(fishclient):
+            lname = licdet['Name']
+            if name == lname:
+                fishclient._do_web_request(licdet['@odata.id'], method='DELETE')
+
+    def save_licenses(self, directory, fishclient):
+        for licdet in self._get_licenses(fishclient):
+            dload = licdet.get('DownloadURI', None)
+            if dload:
+                filename = os.path.basename(dload)
+                savefile = os.path.join(directory, filename)
+                fd = webclient.FileDownloader(fishclient.wc, dload, savefile)
+                fd.start()
+                while fd.isAlive():
+                    fd.join(1)
+                yield savefile
+
+    def apply_license(self, filename, fishclient, progress=None, data=None):
+        licenses = self._get_license_collection_url(fishclient)
+        if data is None:
+            data = open(filename, 'rb')
+        licdata = data.read()
+        lic64 = base64.b64encode(licdata).decode()
+        licinfo = {"LicenseString": lic64}
+        fishclient._do_web_request(licenses, licinfo)
 
     def get_user_expiration(self, uid):
         return None

pyghmi/redfish/oem/lenovo/main.py

@@ -15,15 +15,28 @@
 import pyghmi.redfish.oem.generic as generic
 from pyghmi.redfish.oem.lenovo import tsma
 from pyghmi.redfish.oem.lenovo import xcc
+from pyghmi.redfish.oem.lenovo import xcc3
 
 
 def get_handler(sysinfo, sysurl, webclient, cache, cmd):
     leninf = sysinfo.get('Oem', {}).get('Lenovo', {})
+    mgrinfo = {}
+    if leninf:
+        mgrinf, status = webclient.grab_json_response_with_status('/redfish/v1/Managers/1')
+        if status != 200:
+            mgrinfo = {}
     if not leninf:
         bmcinfo = cmd.bmcinfo
         if 'Ami' in bmcinfo.get('Oem', {}):
             return tsma.TsmHandler(sysinfo, sysurl, webclient, cache)
-    if 'FrontPanelUSB' in leninf or 'USBManagementPortAssignment' in leninf or sysinfo.get('SKU', '').startswith('7X58'):
+    elif 'xclarity controller' in mgrinf.get('Model', '').lower():
+        if mgrinf['Model'].endswith('3'):
+            return xcc3.OEMHandler(sysinfo, sysurl, webclient, cache,
+                                    gpool=cmd._gpool)
+        else:
+            return xcc.OEMHandler(sysinfo, sysurl, webclient, cache,
+                              gpool=cmd._gpool)
+    elif 'FrontPanelUSB' in leninf or 'USBManagementPortAssignment' in leninf or sysinfo.get('SKU', '').startswith('7X58'):
         return xcc.OEMHandler(sysinfo, sysurl, webclient, cache,
                               gpool=cmd._gpool)
     else:

pyghmi/redfish/oem/lenovo/xcc.py

@@ -149,6 +149,13 @@ class OEMHandler(generic.OEMHandler):
         self.fwc = None
         self.fwo = None
 
+    def get_extended_bmc_configuration(self, fishclient, hideadvanced=True):
+        immsettings = self.get_system_configuration(fetchimm=True, hideadvanced=hideadvanced)
+        for setting in list(immsettings):
+            if not setting.startswith('IMM.'):
+                del immsettings[setting]
+        return immsettings
+
     def get_system_configuration(self, hideadvanced=True, fishclient=None,
                                  fetchimm=False):
         if not self.fwc:
@@ -572,7 +579,7 @@ class OEMHandler(generic.OEMHandler):
         summary['badreadings'] = fallbackdata
         return summary
 
-    def get_description(self):
+    def get_description(self, fishclient):
         description = self._do_web_request('/DeviceDescription.json')
         if description:
             description = description[0]
@@ -667,7 +674,7 @@ class OEMHandler(generic.OEMHandler):
             for diskent in adp.get('aimDisks', ()):
                 yield self._get_disk_firmware_single(diskent)
 
-    def get_firmware_inventory(self, components):
+    def get_firmware_inventory(self, components, fishclient):
         sysinf = self.wc.grab_json_response('/api/dataset/sys_info')
         for item in sysinf.get('items', {}):
             for firm in item.get('firmware', []):
@@ -1553,7 +1560,7 @@ class OEMHandler(generic.OEMHandler):
             progress({'phase': 'complete'})
         return savefile
 
-    def get_licenses(self):
+    def get_licenses(self, fishclient):
         licdata = self.wc.grab_json_response('/api/providers/imm_fod')
         for lic in licdata.get('items', [{}])[0].get('keys', []):
             if lic['status'] == 0:
@@ -1564,7 +1571,7 @@ class OEMHandler(generic.OEMHandler):
                     'state': 'Missing required license'
                 }
 
-    def delete_license(self, name):
+    def delete_license(self, name, fishclient):
         licdata = self.wc.grab_json_response('/api/providers/imm_fod')
         for lic in licdata.get('items', [{}])[0].get('keys', []):
             if lic.get('feature', None) == name:
@@ -1577,7 +1584,7 @@ class OEMHandler(generic.OEMHandler):
                 )
                 break
 
-    def save_licenses(self, directory):
+    def save_licenses(self, directory, fishclient):
         licdata = self.wc.grab_json_response('/api/providers/imm_fod')
         for lic in licdata.get('items', [{}])[0].get('keys', []):
             licid = ','.join((str(lic['type']), str(lic['id'])))
@@ -1594,7 +1601,7 @@ class OEMHandler(generic.OEMHandler):
                     self._refresh_token()
                 yield savefile
 
-    def apply_license(self, filename, progress=None, data=None):
+    def apply_license(self, filename, fishclient, progress=None, data=None):
         license_errors = {
             310: "License is for a different model of system",
             311: "License is for a different system serial number",
@@ -1618,7 +1625,7 @@ class OEMHandler(generic.OEMHandler):
             if rsp.get('return', 0) in license_errors:
                 raise pygexc.InvalidParameterValue(
                     license_errors[rsp['return']])
-        return self.get_licenses()
+        return self.get_licenses(fishclient)
 
     def user_delete(self, uid):
         userinfo = self.wc.grab_json_response('/api/dataset/imm_users')

pyghmi/redfish/oem/lenovo/xcc3.py

@@ -0,0 +1,137 @@
+import pyghmi.redfish.oem.generic as generic
+import pyghmi.exceptions as pygexc
+
+
+class OEMHandler(generic.OEMHandler):
+
+    def get_description(self, fishclient):
+        bmcstgs = fishclient._do_web_request('/redfish/v1/Managers/1/Oem/Lenovo/BMCSettings')
+        heightu = bmcstgs.get('Attributes', {}).get('ServerConfigHeightU')
+        return {'height': heightu}
+
+
+    def get_system_configuration(self, hideadvanced=True, fishclient=None):
+        stgs = self._getsyscfg(fishclient)[0]
+        outstgs = {}
+        for stg in stgs:
+            outstgs[f'UEFI.{stg}'] = stgs[stg]
+        return outstgs
+
+    def set_system_configuration(self, changeset, fishclient):
+        bmchangeset = {}
+        vpdchangeset = {}
+        for stg in list(changeset):
+            if stg.startswith('BMC.'):
+                bmchangeset[stg.replace('BMC.', '')] = changeset[stg]
+                del changeset[stg]
+            if stg.startswith('UEFI.'):
+                changeset[stg.replace('UEFI.' '')] = changeset[stg]
+                del changeset[stg]
+            if stg.startswith('VPD.'):
+                vpdchangeset[stg.replace('VPD.', '')] = changeset[stg]
+                del changeset[stg]
+        if changeset:
+            super().set_system_configuration(changeset, fishclient)
+        if bmchangeset:
+            self._set_xcc3_settings(bmchangeset, fishclient)
+        if vpdchangeset:
+            self._set_xcc3_vpd(vpdchangeset, fishclient)
+
+    def _set_xcc3_vpd(self, changeset, fishclient):
+        newvpd = {'Attributes': changeset}
+        fishclient._do_web_request(
+            '/redfish/v1/Chassis/1/Oem/Lenovo/SysvpdSettings/Actions/LenovoSysVpdSettings.SetVpdSettings',
+            newvpd)
+
+
+    def _set_xcc3_settings(self, changeset, fishclient):
+        currsettings, reginfo = self._get_lnv_bmcstgs(fishclient)
+        rawsettings = fishclient._do_web_request('/redfish/v1/Managers/1/Oem/Lenovo/BMCSettings',
+                                                 cache=False)
+        rawsettings = rawsettings.get('Attributes', {})
+        pendingsettings = {}
+        ret = self._set_redfish_settings(
+            changeset, fishclient, currsettings, rawsettings,
+            pendingsettings, self.lenovobmcattrdeps, reginfo,
+            '/redfish/v1/Managers/1/Oem/Lenovo/BMCSettings')
+        fishclient._do_web_request('/redfish/v1/Managers/1/Oem/Lenovo/BMCSettings', cache=False)
+        return ret
+
+    def get_extended_bmc_configuration(self, fishclient, hideadvanced=True):
+        cfgin = self._get_lnv_bmcstgs(fishclient)[0]
+        cfgout = {}
+        for stgname in cfgin:
+            cfgout[f'BMC.{stgname}'] = cfgin[stgname]
+        vpdin = self._get_lnv_vpd(fishclient)[0]
+        for stgname in vpdin:
+            cfgout[f'VPD.{stgname}'] = vpdin[stgname]
+        return cfgout
+
+    def _get_lnv_vpd(self, fishclient):
+        currsettings, reginfo = self._get_lnv_stgs(
+            fishclient, '/redfish/v1/Chassis/1/Oem/Lenovo/SysvpdSettings')
+        self.lenovobmcattrdeps = reginfo[3]
+        return currsettings, reginfo
+
+    def _get_lnv_bmcstgs(self, fishclient):
+        currsettings, reginfo = self._get_lnv_stgs(
+            fishclient, '/redfish/v1/Managers/1/Oem/Lenovo/BMCSettings')
+        self.lenovobmcattrdeps = reginfo[3]
+        return currsettings, reginfo
+
+    def _get_lnv_stgs(self, fishclient, url):
+        bmcstgs = fishclient._do_web_request(url)
+        bmcreg = bmcstgs.get('AttributeRegistry', None)
+        extrainfo = {}
+        valtodisplay = {}
+        currsettings = {}
+        reginfo = {}, {}, {}, {}
+        if bmcreg:
+            reginfo = self._get_attrib_registry(fishclient, bmcreg)
+            if reginfo:
+                extrainfo, valtodisplay, _, _ = reginfo
+        for setting in bmcstgs.get('Attributes', {}):
+            val = bmcstgs['Attributes'][setting]
+            currval = val
+            val = valtodisplay.get(setting, {}).get(val, val)
+            val = {'value': val}
+            val.update(**extrainfo.get(setting, {}))
+            currsettings[setting] = val
+        return currsettings, reginfo
+
+    def get_firmware_inventory(self, components, fishclient):
+        fwlist = fishclient._do_web_request(fishclient._fwinventory)
+        rawfwurls = [x['@odata.id'] for x in fwlist.get('Members', [])]
+        fwurls = []
+        for fwurl in rawfwurls:
+            if fwurl.startswith('/redfish/v1/UpdateService/FirmwareInventory/Bundle.'):
+                continue  # skip Bundle information for now
+            fwurls.append(fwurl)
+        self._fwnamemap = {}
+        for res in fishclient._do_bulk_requests(fwurls):
+            redres = res[0]
+            if redres.get('Name', '').startswith('Firmware:'):
+                redres['Name'] = redres['Name'].replace('Firmware:', '')
+            if redres['Name'].startswith('Firmware-PSoC') and 'Drive_Backplane' in redres["@odata.id"]:
+                redres['Name'] = 'Drive Backplane'
+            if redres['Name'].startswith('DEVICE-'):
+                redres['Name'] = redres['Name'].replace('DEVICE-', '')
+            if redres['Name'].startswith('POWER-PSU'):
+                redres['Name'] = redres['Name'].replace('POWER-', '')
+            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:])
+            if version:
+                redres['Version'] = version
+            cres = fishclient._extract_fwinfo(res)
+            if cres[0] is None:
+                continue
+            if buildid:
+                cres[1]['build'] = buildid
+            yield cres
+        raise pygexc.BypassGenericBehavior()
+
+

{pyghmi-1.5.70.dist-info → pyghmi-1.5.72.dist-info}/METADATA

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

{pyghmi-1.5.70.dist-info → pyghmi-1.5.72.dist-info}/RECORD

@@ -11,7 +11,7 @@ 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=1quCxG5K2jYr77JpYiGLwwOmt0xB2FPJ7T-axnMLTxU,90301
+pyghmi/ipmi/command.py,sha256=DkqKeuicNL02JY2pQzZJwJLRvgH3Uakr5DKm0ElPFkY,90345
 pyghmi/ipmi/console.py,sha256=Jle7uJI3ZQS6cMwbEisFEvXjmu5MVqMs17BcAlygR_4,23369
 pyghmi/ipmi/events.py,sha256=zgUidJIARHomwxasgeYAzDO1AEMfEOzb6XVxzry22Us,22569
 pyghmi/ipmi/fru.py,sha256=sw5ZBMrEVSBDgOUPVU_ksehQMJvrl2v-r7rVyA9xoiE,14430
@@ -20,14 +20,14 @@ pyghmi/ipmi/oem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/ipmi/oem/generic.py,sha256=HQ-9qTYIBpZqB1K75jTOTSUsirrKAQcI8BhLx0eAJ1g,18518
 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=woFD20UwZn5JjM-dBXsNW498e9_F6Sg9Z4_W7Y2QSuA,26005
+pyghmi/ipmi/oem/lenovo/config.py,sha256=jSA8_NACwzouLpAhsu591QQFaBYPEU7NHvhpEddLQpg,26105
 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=deTRv4mmzV-27gmGLnF0pu_xHgnJzT3Vk2gE-f5VChg,56492
-pyghmi/ipmi/oem/lenovo/imm.py,sha256=C9kH7M3lOYW2z211Oz7KQZgiOAh6KjTjnyzZ6h_ZGeM,111156
+pyghmi/ipmi/oem/lenovo/handler.py,sha256=8OBkpxpPiwRFnBBCbs7RI4HtrdPT9k-cpZTEbAuuiG4,56536
+pyghmi/ipmi/oem/lenovo/imm.py,sha256=2LFdzkTvgn4VaaXTHVazv6TTAosEAyIs77FMB6_fIBI,111202
 pyghmi/ipmi/oem/lenovo/inventory.py,sha256=FLJJinw-ibdHtf3KmrTzhWXbQrpxq3TSycVf96Hg7cw,5911
 pyghmi/ipmi/oem/lenovo/nextscale.py,sha256=ojLh17M87GnKUl-3yCTJcIJca1mpcrhlc7rQmhpby3A,43407
 pyghmi/ipmi/oem/lenovo/pci.py,sha256=S7p-5Q2qu2YhlffN-LEmIvjfXim6OlfYL7Q6r6VZqJ4,2020
@@ -43,17 +43,18 @@ 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=iUjF9d_ss1fmIW-CyPSfXQBiVABNk-4HsDUnelfa6C8,57241
+pyghmi/redfish/command.py,sha256=SEiaw74uQQTzGrRkWFRKRcGnVpHXd2Kvgch4Ty_7oks,57340
 pyghmi/redfish/oem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/oem/generic.py,sha256=1DQS9RFe7a6yWfFlcglnVLMJVaTPxdCKCPHF0ukXaOU,39736
+pyghmi/redfish/oem/generic.py,sha256=lOj8FgJOMC5rLj4IHM0Bfls4NkRNVFHrGw__FHjFjEc,46367
 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=MAJGAoOX-l5hMUiI7MXRsORPf0tGKWXWC8V1rDgb-KE,1665
+pyghmi/redfish/oem/lenovo/main.py,sha256=-50u7hTT8urunKTOult2MNMAqLU09sOv_cJZsViwGcU,2249
 pyghmi/redfish/oem/lenovo/tsma.py,sha256=puSj0fO5Dt5VpDoEMVTRY95CP9q18eXcAqq7TDK350E,34633
-pyghmi/redfish/oem/lenovo/xcc.py,sha256=oRLXiGk8gdQsz6qqP79bpC_KN0lQH_qG7XVH3N6k8KQ,82294
+pyghmi/redfish/oem/lenovo/xcc.py,sha256=wsAo-69qSV1eamFLBDx-dS3dn67V05xUrWfK7r8f0_g,82705
+pyghmi/redfish/oem/lenovo/xcc3.py,sha256=p0tDMXVm4Z7oheindI0RInth8xvCLBt8CqwS42T1cMQ,5843
 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 +63,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=jV091_s-HWNDVMKfMxB5XljqiwinQkfXJgHt1u6Umms,14526
-pyghmi-1.5.70.dist-info/AUTHORS,sha256=-0iHKtdQwAJfAGKcruCnvcQXrXuE_LgBZ3P15DJI1xY,2044
-pyghmi-1.5.70.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pyghmi-1.5.70.dist-info/METADATA,sha256=qfec80M9j57DKetia0gs7CzqMTJDcCzBW-rruYdN-7A,1119
-pyghmi-1.5.70.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-pyghmi-1.5.70.dist-info/entry_points.txt,sha256=WkbeJkEZzG9MOILxkaEPSEQ109YP9euntH9kcxbysuk,169
-pyghmi-1.5.70.dist-info/pbr.json,sha256=E7DnB_ZOTXuWLFkKYyyr0Osn89sl1zimBHAsBojDA94,46
-pyghmi-1.5.70.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
-pyghmi-1.5.70.dist-info/RECORD,,
+pyghmi-1.5.72.dist-info/AUTHORS,sha256=-0iHKtdQwAJfAGKcruCnvcQXrXuE_LgBZ3P15DJI1xY,2044
+pyghmi-1.5.72.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pyghmi-1.5.72.dist-info/METADATA,sha256=RHABrdEfRdrxJAbFBYVzLnYMfik-0KQmilz1mbfOq_I,1119
+pyghmi-1.5.72.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+pyghmi-1.5.72.dist-info/entry_points.txt,sha256=WkbeJkEZzG9MOILxkaEPSEQ109YP9euntH9kcxbysuk,169
+pyghmi-1.5.72.dist-info/pbr.json,sha256=xzV_2z-mjUTo-ASlE1utsOowAV3Aa33TPNq7HGCInsg,46
+pyghmi-1.5.72.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
+pyghmi-1.5.72.dist-info/RECORD,,

pyghmi-1.5.72.dist-info/pbr.json

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

pyghmi-1.5.70.dist-info/pbr.json

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