pyghmi 1.5.71__tar.gz → 1.5.72__tar.gz

{pyghmi-1.5.71 → pyghmi-1.5.72}/ChangeLog

@@ -1,6 +1,18 @@
 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
 ------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyghmi
-Version: 1.5.71
+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.71 → 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.71 → 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]}
@@ -977,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
@@ -1092,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)

{pyghmi-1.5.71 → pyghmi-1.5.72}/pyghmi/redfish/oem/generic.py

@@ -44,11 +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]))
+        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,
@@ -345,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 = ({}, {}, {}, {})
@@ -352,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(
@@ -418,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:
@@ -440,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
@@ -479,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
@@ -487,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):

{pyghmi-1.5.71 → pyghmi-1.5.72}/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-1.5.71 → pyghmi-1.5.72}/pyghmi/redfish/oem/lenovo/xcc.py

@@ -579,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]
@@ -674,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', []):

pyghmi-1.5.72/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.71 → pyghmi-1.5.72}/pyghmi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyghmi
-Version: 1.5.71
+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.71 → pyghmi-1.5.72}/pyghmi.egg-info/SOURCES.txt

@@ -92,6 +92,7 @@ pyghmi/redfish/oem/lenovo/__init__.py
 pyghmi/redfish/oem/lenovo/main.py
 pyghmi/redfish/oem/lenovo/tsma.py
 pyghmi/redfish/oem/lenovo/xcc.py
+pyghmi/redfish/oem/lenovo/xcc3.py
 pyghmi/tests/__init__.py
 pyghmi/tests/unit/__init__.py
 pyghmi/tests/unit/base.py

pyghmi-1.5.72/pyghmi.egg-info/pbr.json

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

pyghmi-1.5.71/makesetup

@@ -1,10 +0,0 @@
-#!/bin/sh
-cd `dirname $0`
-VERSION=`git describe|cut -d- -f 1`
-NUMCOMMITS=`git describe|cut -d- -f 2`
-if [ "$NUMCOMMITS" != "$VERSION"  ]; then
-    VERSION=$VERSION.dev$NUMCOMMITS+g`git describe|cut -d- -f 3`
-fi
-echo $VERSION > VERSION
-sed -e "s/#VERSION#/$VERSION/" setup.py.tmpl > setup.py
-

pyghmi-1.5.71/pyghmi.egg-info/pbr.json

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