pyghmi 1.5.70__tar.gz → 1.5.72__tar.gz

{pyghmi-1.5.70 → pyghmi-1.5.72}/ChangeLog

@@ -1,6 +1,31 @@
 CHANGES
 =======
 
+1.5.72
+------
+
+* Rework get description to enable it to work fer XCC3
+* Modify build for snap versions
+* Amend deb package build to avoid extranoeus content
+* Use approved method to determine XCC vintage
+* Implement fixup of firmware inventory
+* Prefer XCC3 detection over XCC2
+* Fix str concatenation on redfish spec violations
+* Refactor redfish settings and leverage in XCC3
+
+1.5.71
+------
+
+* Wire up redfish for getting extended BMC settings
+* Add generic redfish license handling
+* Extend MAC collection in redfish
+* Normalize UUID format
+* Add multipart update support to redfish updates
+* Add BMC reset to redfish implementation
+* Fix the extended bmc configuration
+* Exposed advanced, extended BMC configuration
+* Restore UEFI configuration to IMM systems
+
 1.5.70
 ------
 

{pyghmi-1.5.70 → pyghmi-1.5.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.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 → pyghmi-1.5.72}/builddeb

@@ -11,7 +11,10 @@ if grep wheezy /etc/os-release; then
     export DSCARGS=""
 fi
 # If not PBR, use the setup.py.tmpl
-$PYEXEC -c 'import pbr' || ./makesetup
+sed -e 's/~/./' ./makesetup > ./makesetup.deb
+chmod +x ./makesetup.deb
+./makesetup.deb
+#$PYEXEC -c 'import pbr' || ./makesetup
 VERSION=`$PYEXEC setup.py --version`
 $PYEXEC setup.py sdist
 py2dsc $DSCARGS dist/pyghmi-$VERSION.tar.gz
@@ -21,4 +24,4 @@ dpkg-buildpackage -rfakeroot -uc -us -i
 cd -
 rm -rf $(find deb_dist -mindepth 1 -maxdepth 1 -type d)
 rm $1/*pyghmi*
-cp deb_dist/* $1/
+cp deb_dist/*.deb $1/

pyghmi-1.5.72/makesetup

@@ -0,0 +1,14 @@
+#!/bin/sh
+cd `dirname $0`
+VERSION=`git describe|cut -d- -f 1`
+NUMCOMMITS=`git describe|cut -d- -f 2`
+if [ "$NUMCOMMITS" != "$VERSION"  ]; then
+    LASTNUM=$(echo $VERSION|rev|cut -d . -f 1|rev)
+    LASTNUM=$((LASTNUM+1))
+    FIRSTPART=$(echo $VERSION|rev|cut -d . -f 2- |rev)
+    VERSION=${FIRSTPART}.${LASTNUM}
+    VERSION=$VERSION~dev$NUMCOMMITS+`git describe|cut -d- -f 3`
+fi
+echo $VERSION > VERSION
+sed -e "s/#VERSION#/$VERSION/" setup.py.tmpl > setup.py
+

{pyghmi-1.5.70 → pyghmi-1.5.72}/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-1.5.70 → pyghmi-1.5.72}/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-1.5.70 → pyghmi-1.5.72}/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-1.5.70 → pyghmi-1.5.72}/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-1.5.70 → pyghmi-1.5.72}/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-1.5.70 → pyghmi-1.5.72}/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