pyghmi 1.6.5__py3-none-any.whl → 1.6.6__py3-none-any.whl

pyghmi/ipmi/command.py

@@ -842,6 +842,12 @@ class Command(object):
         fetchdata = fetched['data']
         if bytearray(fetchdata)[0] != 17:
             return None
+        if param == 0x14:
+            vlaninfo = struct.unpack('<H', fetchdata[1:])[0]
+            if vlaninfo & 0x8000 == 0x8000:
+                return vlaninfo & 0xfff
+            else:
+                return 'off'
         if len(fetchdata) == 5:  # IPv4 address
             if prefixlen:
                 return _mask_to_cidr(fetchdata[1:])
@@ -936,7 +942,7 @@ class Command(object):
         return retdata
 
     def set_net_configuration(self, ipv4_address=None, ipv4_configuration=None,
-                              ipv4_gateway=None, channel=None):
+                              ipv4_gateway=None, vlan_id=None, channel=None):
         """Set network configuration data.
 
         Apply desired network configuration data, leaving unspecified
@@ -950,7 +956,7 @@ class Command(object):
         :param channel:  LAN channel to configure, defaults to autodetect
         """
         if (ipv4_address is None and ipv4_configuration is None
-                and ipv4_gateway is None):
+                and ipv4_gateway is None and vlan_id is None):
             return
         if channel is None:
             channel = self.get_network_channel()
@@ -977,6 +983,12 @@ class Command(object):
         if ipv4_gateway is not None:
             cmddata = bytearray((channel, 12)) + socket.inet_aton(ipv4_gateway)
             self.xraw_command(netfn=0xc, command=1, data=cmddata)
+        if vlan_id in ('off', 0, '0'):
+            cmddata = bytearray((channel, 0x14, 0, 0))
+            self.xraw_command(netfn=0xc, command=1, data=cmddata)
+        elif vlan_id is not None:
+            cmddata = bytearray((channel, 0x14)) + struct.pack('<H', int(vlan_id) | 0x8000)
+            self.xraw_command(netfn=0xc, command=1, data=cmddata)
 
     def get_storage_configuration(self):
         """"Get storage configuration data
@@ -1071,6 +1083,7 @@ class Command(object):
             retdata['ipv4_gateway_mac'] = self._fetch_lancfg_param(channel, 13)
             retdata['ipv4_backup_gateway_mac'] = self._fetch_lancfg_param(
                 channel, 15)
+        retdata['vlan_id'] = self._fetch_lancfg_param(channel, 0x14)
         self.oem_init()
         self._oem.add_extra_net_configuration(retdata, channel)
         return retdata
@@ -2166,14 +2179,14 @@ class Command(object):
 
         return True
 
-    def get_firmware(self, components=()):
+    def get_firmware(self, components=(), category=None):
         """Retrieve OEM Firmware information"""
 
         self.oem_init()
         mcinfo = self.xraw_command(netfn=6, command=1)
         major, minor = struct.unpack('BB', mcinfo['data'][2:4])
         bmcver = '{0}.{1}'.format(major, hex(minor)[2:])
-        return self._oem.get_oem_firmware(bmcver, components)
+        return self._oem.get_oem_firmware(bmcver, components, category)
 
     def get_capping_enabled(self):
         """Get PSU based power capping status

pyghmi/ipmi/oem/generic.py

@@ -279,7 +279,7 @@ class OEMHandler(object):
         fru['oem_parser'] = None
         return fru
 
-    def get_oem_firmware(self, bmcver, components):
+    def get_oem_firmware(self, bmcver, components, category):
         """Get Firmware information."""
 
         # Here the bmc version is passed into the OEM handler, to allow

pyghmi/ipmi/oem/lenovo/handler.py

@@ -842,7 +842,7 @@ class OEMHandler(generic.OEMHandler):
                 return False
         return False
 
-    def get_oem_firmware(self, bmcver, components):
+    def get_oem_firmware(self, bmcver, components, category):
         if self.has_tsm or self.has_ami or self.has_asrock:
             command = firmware.get_categories()["firmware"]
             fw_cmd = self.get_cmd_type("firmware", command)
@@ -865,7 +865,7 @@ class OEMHandler(generic.OEMHandler):
                                      bios_versions,
                                      self.has_asrock)
         elif self.has_imm:
-            return self.immhandler.get_firmware_inventory(bmcver, components)
+            return self.immhandler.get_firmware_inventory(bmcver, components, category)
         elif self.is_fpc:
             return nextscale.get_fpc_firmware(bmcver, self.ipmicmd,
                                               self._fpc_variant)

pyghmi/ipmi/oem/lenovo/imm.py

@@ -556,84 +556,86 @@ class IMMClient(object):
     def fetch_psu_firmware(self):
         return []
 
-    def fetch_agentless_firmware(self):
+    def fetch_agentless_firmware(self, needdisk=True, needadp=True):
         skipkeys = set([])
-        cd = self.get_cached_data('lenovo_cached_adapters_fu')
-        if cd:
-            adapterdata, fwu = cd
-        else:
-            adapterdata = None
-        if not adapterdata:
-            if self.updating:
-                raise pygexc.TemporaryError(
-                    'Cannot read extended inventory during firmware update')
-            if self.wc:
-                adapterdata = self.wc.grab_json_response(
-                    self.ADP_URL, referer=self.adp_referer)
-                if self.ADP_FU_URL:
-                    fwu = self.wc.grab_json_response(
-                        self.ADP_FU_URL, referer=self.adp_referer)
-                else:
-                    fwu = {}
-                if adapterdata:
-                    self.datacache['lenovo_cached_adapters_fu'] = (
-                        (adapterdata, fwu), util._monotonic_time())
-        if adapterdata and 'items' in adapterdata:
-            anames = {}
-            for adata in adapterdata['items']:
-                aname = adata[self.ADP_NAME]
-                if aname in anames:
-                    anames[aname] += 1
-                    aname = '{0} {1}'.format(aname, anames[aname])
-                else:
-                    anames[aname] = 1
-                donenames = set([])
-                for fundata in adata[self.ADP_FUN]:
-                    fdata = fundata.get('firmwares', ())
-                    for firm in fdata:
-                        fname = firm['firmwareName'].rstrip()
-                        if '.' in fname:
-                            fname = firm['description'].rstrip()
-                        if fname in donenames:
-                            # ignore redundant entry
-                            continue
-                        if not fname:
-                            continue
-                        donenames.add(fname)
-                        bdata = {}
-                        if 'versionStr' in firm and firm['versionStr']:
-                            bdata['version'] = firm['versionStr']
-                        if ('releaseDate' in firm
-                                and firm['releaseDate']
-                                and firm['releaseDate'] != 'N/A'):
-                            try:
-                                bdata['date'] = self._parse_builddate(
-                                    firm['releaseDate'])
-                            except ValueError:
-                                pass
-                        yield '{0} {1}'.format(aname, fname), bdata
-                for fwi in fwu.get('items', []):
-                    if fwi.get('key', -1) == adata.get('key', -2):
-                        skipkeys.add(fwi['key'])
-                        if fwi.get('fw_status', 0) == 2:
+        if needadp:
+            cd = self.get_cached_data('lenovo_cached_adapters_fu')
+            if cd:
+                adapterdata, fwu = cd
+            else:
+                adapterdata = None
+            if not adapterdata:
+                if self.updating:
+                    raise pygexc.TemporaryError(
+                        'Cannot read extended inventory during firmware update')
+                if self.wc:
+                    adapterdata = self.wc.grab_json_response(
+                        self.ADP_URL, referer=self.adp_referer)
+                    if self.ADP_FU_URL:
+                        fwu = self.wc.grab_json_response(
+                            self.ADP_FU_URL, referer=self.adp_referer)
+                    else:
+                        fwu = {}
+                    if adapterdata:
+                        self.datacache['lenovo_cached_adapters_fu'] = (
+                            (adapterdata, fwu), util._monotonic_time())
+            if adapterdata and 'items' in adapterdata:
+                anames = {}
+                for adata in adapterdata['items']:
+                    aname = adata[self.ADP_NAME]
+                    if aname in anames:
+                        anames[aname] += 1
+                        aname = '{0} {1}'.format(aname, anames[aname])
+                    else:
+                        anames[aname] = 1
+                    donenames = set([])
+                    for fundata in adata[self.ADP_FUN]:
+                        fdata = fundata.get('firmwares', ())
+                        for firm in fdata:
+                            fname = firm['firmwareName'].rstrip()
+                            if '.' in fname:
+                                fname = firm['description'].rstrip()
+                            if fname in donenames:
+                                # ignore redundant entry
+                                continue
+                            if not fname:
+                                continue
+                            donenames.add(fname)
                             bdata = {}
-                            if 'fw_pkg_version' in fwi and fwi['fw_pkg_version']:
-                                bdata['version'] = fwi['fw_pkg_version']
-                            elif 'fw_version_pend' in fwi:
-                                bdata['version'] = fwi['fw_version_pend']
-                            yield '{0} Pending Update'.format(aname), bdata
-        for fwi in fwu.get('items', []):
-            if fwi.get('key', -1) > 0 and fwi['key'] not in skipkeys:
-                bdata = {}
-                bdata['version'] = fwi['fw_version']
-                yield fwi['adapterName'], bdata
-                if fwi.get('fw_status', 0) == 2:
+                            if 'versionStr' in firm and firm['versionStr']:
+                                bdata['version'] = firm['versionStr']
+                            if ('releaseDate' in firm
+                                    and firm['releaseDate']
+                                    and firm['releaseDate'] != 'N/A'):
+                                try:
+                                    bdata['date'] = self._parse_builddate(
+                                        firm['releaseDate'])
+                                except ValueError:
+                                    pass
+                            yield '{0} {1}'.format(aname, fname), bdata
+                    for fwi in fwu.get('items', []):
+                        if fwi.get('key', -1) == adata.get('key', -2):
+                            skipkeys.add(fwi['key'])
+                            if fwi.get('fw_status', 0) == 2:
+                                bdata = {}
+                                if 'fw_pkg_version' in fwi and fwi['fw_pkg_version']:
+                                    bdata['version'] = fwi['fw_pkg_version']
+                                elif 'fw_version_pend' in fwi:
+                                    bdata['version'] = fwi['fw_version_pend']
+                                yield '{0} Pending Update'.format(aname), bdata
+            for fwi in fwu.get('items', []):
+                if fwi.get('key', -1) > 0 and fwi['key'] not in skipkeys:
                     bdata = {}
-                    if 'fw_version_pend' in fwi:
-                        bdata['version'] = fwi['fw_version_pend']
-                    yield '{0} Pending Update'.format(fwi['adapterName']), bdata
-        for disk in self.disk_inventory():
-            yield disk
+                    bdata['version'] = fwi['fw_version']
+                    yield fwi['adapterName'], bdata
+                    if fwi.get('fw_status', 0) == 2:
+                        bdata = {}
+                        if 'fw_version_pend' in fwi:
+                            bdata['version'] = fwi['fw_version_pend']
+                        yield '{0} Pending Update'.format(fwi['adapterName']), bdata
+        if needdisk:
+            for disk in self.disk_inventory():
+                yield disk
         self.weblogout()
 
     def disk_inventory(self, mode=0):
@@ -829,11 +831,13 @@ class IMMClient(object):
         self.weblogout()
         return hwmap
 
-    def get_firmware_inventory(self, bmcver, components):
+    def get_firmware_inventory(self, bmcver, components, category):
         # First we fetch the system firmware found in imm properties
         # then check for agentless, if agentless, get adapter info using
         # https, using the caller TLS verification scheme
         components = set(components)
+        if 'core' in components:
+            category = 'core'
         if not components or set(('imm', 'xcc', 'bmc', 'core')) & components:
             rsp = self.ipmicmd.xraw_command(netfn=0x3a, command=0x50)
             immverdata = self.parse_imm_buildinfo(rsp['data'])
@@ -1811,12 +1815,16 @@ class XCCClient(IMMClient):
                    {'model': psu['model'],
                     'version': psu['version']})
 
-    def get_firmware_inventory(self, bmcver, components):
+    def get_firmware_inventory(self, bmcver, components, category):
         # First we fetch the system firmware found in imm properties
         # then check for agentless, if agentless, get adapter info using
         # https, using the caller TLS verification scheme
+        if 'core' in components:
+            category = 'core'
+        if not category:
+            category = 'all'
         components = set(components)
-        if (not components
+        if category in ('all', 'core') and (not components
                 or set(('core', 'imm', 'bmc', 'xcc')) & components):
             rsp = self.ipmicmd.xraw_command(netfn=0x3a, command=0x50)
             immverdata = self.parse_imm_buildinfo(rsp['data'])
@@ -1854,7 +1862,7 @@ class XCCClient(IMMClient):
                 'date': '/v2/ibmc/dm/fw/imm3/primary_pending_build_date'})
             if bdata:
                 yield '{0} Pending Update'.format(self.bmcname), bdata
-        if not components or set(('core', 'uefi', 'bios')) & components:
+        if category in ('all', 'core') and not components or set(('core', 'uefi', 'bios')) & components:
             bdata = self.fetch_grouped_properties({
                 'build': '/v2/bios/build_id',
                 'version': '/v2/bios/build_version',
@@ -1867,7 +1875,7 @@ class XCCClient(IMMClient):
                 'build': '/v2/bios/pending_build_id'})
             if bdata:
                 yield 'UEFI Pending Update', bdata
-        if not components or set(('lxpm', 'core')) & components:
+        if category in ('all', 'core') and not components or set(('lxpm', 'core')) & components:
             bdata = self.fetch_grouped_properties({
                 'build': '/v2/tdm/build_id',
                 'version': '/v2/tdm/build_version',
@@ -1888,7 +1896,7 @@ class XCCClient(IMMClient):
             })
             if bdata:
                 yield 'LXPM Linux Driver Bundle', bdata
-        if not components or set(('lxum', 'core')):
+        if category in ('all', 'core') and (not components or set(('lxum', 'core'))):
             sysinf = self.wc.grab_json_response('/api/dataset/sys_info')
             for item in sysinf.get('items', {}):
                 for firm in item.get('firmware', []):
@@ -1899,7 +1907,7 @@ class XCCClient(IMMClient):
                     }
                     if firm['type'] == 10:
                         yield ('LXUM', firminfo)
-        if not components or set(('core', 'fpga')) in components:
+        if category in ('all', 'core') and (not components or set(('core', 'fpga')) in components):
             try:
                 fpga = self.ipmicmd.xraw_command(netfn=0x3a, command=0x6b,
                                                  data=(0,))
@@ -1909,11 +1917,12 @@ class XCCClient(IMMClient):
             except pygexc.IpmiException as ie:
                 if ie.ipmicode != 193:
                     raise
-        if (not components or components - set((
-                'core', 'uefi', 'bios', 'xcc', 'bmc', 'imm', 'fpga',
-                'lxpm'))):
-            for firm in self.fetch_agentless_firmware():
-                yield firm
+        needdiskfirmware = category in ('all', 'disks')
+        needadapterfirmware = category in ('all', 'adapters')
+        needpsufirmware = category in ('all', 'misc')
+        for firm in self.fetch_agentless_firmware(needdisk=needdiskfirmware, needadp=needadapterfirmware):
+            yield firm
+        if needpsufirmware:
             for firm in self.fetch_psu_firmware():
                 yield firm
 
@@ -2089,13 +2098,14 @@ class XCCClient(IMMClient):
                               'progress': 100 * wc.get_upload_progress()})
             if uploadthread.rspstatus >= 300 or uploadthread.rspstatus < 200:
                 rsp = uploadthread.rsp
-                errmsg = ''
+                errmsg = f'Upload failed with HTTP status {uploadthread.rspstatus}'
                 try:
                     rsp = json.loads(rsp)
                     errmsg = (
                         rsp['error']['@Message.ExtendedInfo'][0]['Message'])
                 except Exception:
-                    raise Exception(uploadthread.rsp)
+                    errmsg = errmsg + ': ' + str(rsp)
+                    raise Exception(errmsg)
                 raise Exception(errmsg)
             rsp = json.loads(uploadthread.rsp)
             monitorurl = rsp['@odata.id']

pyghmi/redfish/command.py

@@ -188,43 +188,11 @@ class Command(object):
         self._varsensormap = {}
         self.powerurl = None
         self.sysurl = None
-        if 'Managers' in overview:
-            bmcoll = systems = overview['Managers']['@odata.id']
-            res = self.wc.grab_json_response_with_status(bmcoll)
-            if res[1] == 401:
-                raise exc.PyghmiException('Access Denied')
-            elif res[1] < 200 or res[1] >= 300:
-                raise exc.PyghmiException(repr(res[0]))
-            bmcs = res[0]['Members']
-            if len(bmcs) == 1:
-                self._varbmcurl = bmcs[0]['@odata.id']
+        tmpoem = oem.get_oem_handler({}, sysurl, self.wc, self._urlcache, self,
+                                    rootinfo=overview)
+        self._varbmcurl = tmpoem.get_default_mgrurl()
         if 'Systems' in overview:
-            systems = overview['Systems']['@odata.id']
-            res = self.wc.grab_json_response_with_status(systems)
-            if res[1] == 401:
-                raise exc.PyghmiException('Access Denied')
-            elif res[1] < 200 or res[1] >= 300:
-                raise exc.PyghmiException(repr(res[0]))
-            members = res[0]
-            systems = members['Members']
-            if sysurl:
-                for system in systems:
-                    if system['@odata.id'] == sysurl or system['@odata.id'].split('/')[-1] == sysurl:
-                        self.sysurl = system['@odata.id']
-                        break
-                else:
-                    raise exc.PyghmiException(
-                        'Specified sysurl not found: {0}'.format(sysurl))
-            else:
-                if len(systems) > 1:
-                    systems = [x for x in systems if 'DPU' not in x['@odata.id']]
-                if len(systems) > 1:
-                    raise exc.PyghmiException(
-                        'Multi system manager, sysurl is required parameter')
-                if len(systems):
-                    self.sysurl = systems[0]['@odata.id']
-                else:
-                    self.sysurl = None
+            self.sysurl = tmpoem.get_default_sysurl()
             self.powerurl = self.sysinfo.get('Actions', {}).get(
                 '#ComputerSystem.Reset', {}).get('target', None)
 
@@ -271,6 +239,16 @@ class Command(object):
             okroles.add('ReadOnly')
         return okroles
 
+    def get_trusted_cas(self):
+        for ca in self.oem.get_trusted_cas():
+            yield ca
+    
+    def add_trusted_ca(self, pemdata):
+        return self.oem.add_trusted_ca(pemdata)
+    
+    def del_trusted_ca(self, certid):
+        return self.oem.del_trusted_ca(certid)
+            
     def get_users(self):
         """get list of users and channel access information (helper)
 
@@ -1026,13 +1004,13 @@ class Command(object):
             self._do_web_request(nicurl, patch, 'PATCH')
 
     def set_net_configuration(self, ipv4_address=None, ipv4_configuration=None,
-                              ipv4_gateway=None, name=None):
+                              ipv4_gateway=None, vlan_id=None, name=None):
         patch = {}
         ipinfo = {}
         dodhcp = None
         netmask = None
         if (ipv4_address is None and ipv4_configuration is None
-                and ipv4_gateway is None):
+                and ipv4_gateway is None and vlan_id is None):
             return
         if ipv4_address:
             if '/' in ipv4_address:
@@ -1054,6 +1032,10 @@ class Command(object):
               or 'IPv4StaticAddresses' in patch):
             dodhcp = False
             patch['DHCPv4'] = {'DHCPEnabled': False}
+        if vlan_id in ('off', 0, '0'):
+            patch['VLAN'] = {'VLANEnable': False}
+        elif vlan_id:
+            patch['VLAN'] = {'VLANEnable': True, 'VLANId': int(vlan_id)}
         if patch:
             nicurl = self._get_bmc_nic_url(name)
             try:
@@ -1079,6 +1061,11 @@ class Command(object):
         if gws:
             for gw in gws:
                 retdata['static_gateway'] = gw['Address']
+        tagged = netcfg.get('VLAN', {}).get('VLANEnabled', False)
+        if tagged:
+            retdata['vlan_id'] = netcfg.get('VLAN', {}).get('VLANId', None)
+        else:
+            retdata['vlan_id'] = 'off'
         return retdata
 
     def get_net_configuration(self, name=None):
@@ -1101,6 +1088,11 @@ class Command(object):
         hasgateway = _mask_to_cidr(currip['Gateway'])
         retval['ipv4_gateway'] = currip['Gateway'] if hasgateway else None
         retval['ipv4_configuration'] = currip['AddressOrigin']
+        tagged = netcfg.get('VLAN', {}).get('VLANEnable', False)
+        if tagged:
+            retval['vlan_id'] = netcfg.get('VLAN', {}).get('VLANId', None)
+        else:
+            retval['vlan_id'] = 'off'
         return retval
 
     def get_hostname(self):
@@ -1111,10 +1103,10 @@ class Command(object):
         self._do_web_request(self._bmcnicurl,
                              {'HostName': hostname}, 'PATCH')
 
-    def get_firmware(self, components=()):
+    def get_firmware(self, components=(), category=None):
         self._fwnamemap = {}
         try:
-            for firminfo in self.oem.get_firmware_inventory(components, self):
+            for firminfo in self.oem.get_firmware_inventory(components, self, category):
                 yield firminfo
         except exc.BypassGenericBehavior:
             return

pyghmi/redfish/oem/dell/main.py

@@ -15,6 +15,6 @@
 from pyghmi.redfish.oem.dell import idrac
 
 
-def get_handler(sysinfo, sysurl, webclient, cache, cmd):
+def get_handler(sysinfo, sysurl, webclient, cache, cmd, rootinfo={}):
     return idrac.OEMHandler(sysinfo, sysurl, webclient, cache,
                             gpool=cmd._gpool)

pyghmi/redfish/oem/generic.py

@@ -23,6 +23,7 @@ from datetime import timedelta
 from dateutil import tz
 import socket
 import time
+import uuid
 
 import pyghmi.constants as const
 import pyghmi.exceptions as exc
@@ -31,6 +32,27 @@ import pyghmi.util.webclient as webclient
 from pyghmi.util.parse import parse_time
 
 
+def _pem_to_dict(pemdata, uefi=False):
+    """Pull PEM into a dict
+
+    Accepts a file-like or a string or bytes.
+
+    A dict with the PEM as a value for CertificateString is created.
+    If uefi, then "UefiSignatureOwner" is also created with a random GUID.
+    This is how redfish expects certificate information for CAs to be provided for
+    UEFI and for itself.
+    """
+    if hasattr(pemdata, 'read'):
+        pemdata = pemdata.read()
+    if isinstance(pemdata, bytes):
+        pemdata = pemdata.decode('utf-8')
+    cert_dict = {
+        'CertificateString': pemdata,
+        'CertificateType': 'PEM',
+        }
+    if uefi:
+        cert_dict['UefiSignatureOwner'] = str(uuid.uuid4())
+    return cert_dict
 
 class SensorReading(object):
     def __init__(self, healthinfo, sensor=None, value=None, units=None,
@@ -188,17 +210,75 @@ class OEMHandler(object):
     hostnic = None
     usegenericsensors = True
 
-    def __init__(self, sysinfo, sysurl, webclient, cache, gpool=None):
+    def _invalidate_url_cache(self, url):
+        if url is None:
+            return
+        if url in self._urlcache:
+            del self._urlcache[url]
+        if url + '?$expand=.' in self._urlcache:
+            del self._urlcache[url + '?$expand=.']
+
+    def __init__(self, sysinfo, sysurl, webclient, cache, gpool=None, rootinfo={}):
         self._gpool = gpool
         self._varsysinfo = sysinfo
         self._varsysurl = sysurl
+        self._varbmcurl = None
         self._urlcache = cache
         self.webclient = webclient
         self._hwnamemap = {}
+        self._rootinfo = rootinfo
+        if not self._rootinfo:
+            self._rootinfo = self.webclient.grab_json_response(
+                '/redfish/v1/')
+        self._varbmcurl = None
+        self._varsysurl = sysurl
 
     def get_screenshot(self, outfile):
         raise exc.UnsupportedFunctionality(
             'Retrieving screenshot is not implemented for this platform')
+    
+    def get_default_mgrurl(self):
+        if not self._varbmcurl and 'Managers' in self._rootinfo:
+            bmcoll = self._rootinfo['Managers']['@odata.id']
+            res = self.webclient.grab_json_response_with_status(bmcoll)
+            if res[1] == 401:
+                raise exc.PyghmiException('Access Denied')
+            elif res[1] < 200 or res[1] >= 300:
+                raise exc.PyghmiException(repr(res[0]))
+            bmcs = res[0]['Members']
+            if len(bmcs) == 1:
+                self._varbmcurl = bmcs[0]['@odata.id']
+        return self._varbmcurl
+    
+    def get_default_sysurl(self):
+        if not self._varsysurl and 'Systems' in self._rootinfo:
+            systems = self._rootinfo['Systems']['@odata.id']
+            res = self.webclient.grab_json_response_with_status(systems)
+            if res[1] == 401:
+                raise exc.PyghmiException('Access Denied')
+            elif res[1] < 200 or res[1] >= 300:
+                raise exc.PyghmiException(repr(res[0]))
+            members = res[0]
+            systems = members['Members']
+            if self._varsysurl:
+                for system in systems:
+                    if system['@odata.id'] == self._varsysurl or system['@odata.id'].split('/')[-1] == self._varsysurl:
+                        self._varsysurl = system['@odata.id']
+                        break
+                else:
+                    raise exc.PyghmiException(
+                        'Specified sysurl not found: {0}'.format(self._varsysurl))
+            else:
+                if len(systems) > 1:
+                    systems = [x for x in systems if 'DPU' not in x['@odata.id']]
+                if len(systems) > 1:
+                    raise exc.PyghmiException(
+                        'Multi system manager, sysurl is required parameter')
+                if len(systems):
+                    self._varsysurl = systems[0]['@odata.id']
+                else:
+                    self._varsysurl = None
+        return self._varsysurl
 
     def supports_expand(self, url):
         # Unfortunately, the state of expand in redfish is pretty dicey,
@@ -236,6 +316,68 @@ class OEMHandler(object):
                 cputemps.append(temp)
         return cputemps
 
+    @property
+    def _bmcurl(self):
+        if not self._varbmcurl:
+            self._varbmcurl = self.sysinfo.get('Links', {}).get(
+                'ManagedBy', [{}])[0].get('@odata.id', None)
+        return self._varbmcurl
+
+    @property
+    def sysinfo(self):
+        return self._do_web_request(self._varsysurl)
+
+    def add_trusted_ca(self, pemdata):
+        mgrinfo = self._do_web_request(self._bmcurl)
+        secpolicy = mgrinfo.get('SecurityPolicy', {}).get('@odata.id', None)
+        if secpolicy:
+            secinfo = self._do_web_request(secpolicy)
+            certcoll = secinfo.get('TLS', {}).get('Client', {}).get('TrustedCertificates', {}).get('@odata.id', None)
+            self._invalidate_url_cache(certcoll)
+            if certcoll:
+                certpayload = _pem_to_dict(pemdata)
+                self._do_web_request(certcoll, certpayload)
+                return True
+        raise exc.PyghmiException('Platform does not support adding trusted CAs')
+
+    def del_trusted_ca(self, certid):
+        mgrinfo = self._do_web_request(self._bmcurl)
+        secpolicy = mgrinfo.get('SecurityPolicy', {}).get('@odata.id', None)
+        if secpolicy:
+            secinfo = self._do_web_request(secpolicy)
+            certcoll = secinfo.get('TLS', {}).get('Client', {}).get('TrustedCertificates', {}).get('@odata.id', None)
+            if certcoll:
+                certs = self._get_expanded_data(certcoll)
+                certs = certs.get('Members', [])
+                for cert in certs:
+                    if cert.get('Id', '') == certid:
+                        self._do_web_request(cert['@odata.id'], method='DELETE')
+                        self._invalidate_url_cache(certcoll)
+                        return True
+        raise exc.PyghmiException(f'No such certificate found: {certid}')
+
+    def get_trusted_cas(self):
+        mgrinfo = self._do_web_request(self._bmcurl)
+        secpolicy = mgrinfo.get('SecurityPolicy', {}).get('@odata.id', None)
+        if secpolicy:
+            secinfo = self._do_web_request(secpolicy)
+            certcoll = secinfo.get('TLS', {}).get('Client', {}).get('TrustedCertificates', {}).get('@odata.id', None)
+            if certcoll:
+                certs = self._get_expanded_data(certcoll)
+                certs = certs.get('Members', [])
+                for cert in certs:
+                    certdesc = {
+                        'id': cert.get('Id', ''),
+                        'name': cert.get('Name', ''),
+                        'pem': cert.get('CertificateString', None),
+                        'subject': cert.get('Subject', {}).get('CommonName', ''),
+                        'sans': cert.get('Subject', {}).get('AlternativeNames', []),
+                        'issuer': cert.get('Issuer', {}).get('CommonName', ''),
+                        'validfrom': cert.get('ValidNotBefore', ''),
+                        'validto': cert.get('ValidNotAfter', ''),
+                    }
+                    yield certdesc
+
     def get_event_log(self, clear=False, fishclient=None, extraurls=[]):
         bmcinfo = self._do_web_request(fishclient._bmcurl)
         lsurl = bmcinfo.get('LogServices', {}).get('@odata.id', None)
@@ -257,7 +399,16 @@ class OEMHandler(object):
         lurls.extend(extraurls)
         for lurl in lurls:
             lurl = lurl['@odata.id']
-            loginfo = self._do_web_request(lurl, cache=(not clear))
+            try:
+                loginfo = self._do_web_request(lurl, cache=(not clear))
+            except Exception:
+                record = {}
+                record['log_id'] = os.path.basename(lurl)
+                record['message'] = 'Could not retrieve log at {0}'.format(lurl)
+                record['severity'] = const.Health.Ok
+                record['timestamp'] = datetime.now().strftime('%Y-%m-%dT%H:%M:%S')
+                yield record
+                continue
             entriesurl = loginfo.get('Entries', {}).get('@odata.id', None)
             if not entriesurl:
                 continue
@@ -667,7 +818,7 @@ class OEMHandler(object):
     def _extract_fwinfo(self, inf):
         return {}
 
-    def get_firmware_inventory(self, components, fishclient):
+    def get_firmware_inventory(self, components, fishclient, category=None):
         return []
 
     def set_credentials(self, username, password):
@@ -1088,14 +1239,15 @@ class OEMHandler(object):
             if (uploadthread.rspstatus >= 300
                     or uploadthread.rspstatus < 200):
                 rsp = uploadthread.rsp
-                errmsg = ''
+                errmsg = f'Update attempt resulted in response status {uploadthread.rspstatus}'
                 try:
                     rsp = json.loads(rsp)
                     errmsg = (
                         rsp['error'][
                             '@Message.ExtendedInfo'][0]['Message'])
                 except Exception:
-                    raise Exception(uploadthread.rsp)
+                    errmsg = errmsg + ': ' + repr(rsp)
+                    raise Exception(errmsg)
                 raise Exception(errmsg)
             return self.continue_update(uploadthread, progress)
         finally:
@@ -1215,6 +1367,8 @@ class OEMHandler(object):
             res = self._get_cache(url)
         if res:
             return res
+        # If doing a method that may change remote url state, invalidate cache
+        self._invalidate_url_cache(url)
         wc = self.webclient.dupe()
         if etag:
             wc.stdheaders['If-Match'] = etag

pyghmi/redfish/oem/lenovo/main.py

@@ -18,19 +18,27 @@ from pyghmi.redfish.oem.lenovo import xcc
 from pyghmi.redfish.oem.lenovo import xcc3
 from pyghmi.redfish.oem.lenovo import smm3
 
-def get_handler(sysinfo, sysurl, webclient, cache, cmd):
+def get_handler(sysinfo, sysurl, webclient, cache, cmd, rootinfo={}):
+    if not sysinfo:  # we are before establishing there is one system, and one manager...
+        systems, status = webclient.grab_json_response_with_status('/redfish/v1/Systems')
+        if status == 200:
+            for system in systems.get('Members', []):
+                if system.get('@odata.id', '').endswith('/1'):
+                    sysurl = system['@odata.id']
+                    sysinfo, status = webclient.grab_json_response_with_status(sysurl)
+                    break
     leninf = sysinfo.get('Oem', {}).get('Lenovo', {})
     mgrinfo = {}
     if leninf:
-        mgrinf, status = webclient.grab_json_response_with_status('/redfish/v1/Managers/1')
+        mgrinfo, 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)
-    elif 'xclarity controller' in mgrinf.get('Model', '').lower():
-        if mgrinf['Model'].endswith('3'):
+    elif 'xclarity controller' in mgrinfo.get('Model', '').lower():
+        if mgrinfo['Model'].endswith('3'):
             return xcc3.OEMHandler(sysinfo, sysurl, webclient, cache,
                                     gpool=cmd._gpool)
         else:

pyghmi/redfish/oem/lenovo/xcc.py

@@ -699,33 +699,57 @@ class OEMHandler(generic.OEMHandler):
             for diskent in adp.get('aimDisks', ()):
                 yield self._get_disk_firmware_single(diskent)
 
-    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', []):
-                firminfo = {
-                    'version': firm['version'],
-                    'build': firm['build'],
-                    'date': parse_time(firm['release_date']),
-                }
-                if firm['type'] == 5:
-                    yield ('XCC', firminfo)
-                elif firm['type'] == 6:
-                    yield ('XCC Backup', firminfo)
-                elif firm['type'] == 0:
-                    yield ('UEFI', firminfo)
-                elif firm['type'] == 7:
-                    yield ('LXPM', firminfo)
-                elif firm['type'] == 8:
-                    yield ('LXPM Windows Driver Bundle', firminfo)
-                elif firm['type'] == 9:
-                    yield ('LXPM Linux Driver Bundle', firminfo)
-                elif firm['type'] == 10:
-                    yield ('LXUM', firminfo)
-        for adpinfo in self._get_agentless_firmware(components):
-            yield adpinfo
-        for adpinfo in self._get_disk_firmware(components):
-            yield adpinfo
+    def get_firmware_inventory(self, components, fishclient, category=None):
+
+        if components and 'core' in components:
+            category = 'core'
+            components = components - set(['core'])
+        if not category:
+            category = 'all'
+        if category in ('all', 'core'):
+            sysinf = self.wc.grab_json_response('/api/dataset/sys_info')
+            for item in sysinf.get('items', {}):
+                for firm in item.get('firmware', []):
+                    firminfo = {
+                        'version': firm['version'],
+                        'build': firm['build'],
+                        'date': parse_time(firm['release_date']),
+                    }
+                    if firm['type'] == 5:
+                        yield ('XCC', firminfo)
+                    elif firm['type'] == 6:
+                        yield ('XCC Backup', firminfo)
+                    elif firm['type'] == 0:
+                        yield ('UEFI', firminfo)
+                    elif firm['type'] == 7:
+                        yield ('LXPM', firminfo)
+                    elif firm['type'] == 8:
+                        yield ('LXPM Windows Driver Bundle', firminfo)
+                    elif firm['type'] == 9:
+                        yield ('LXPM Linux Driver Bundle', firminfo)
+                    elif firm['type'] == 10:
+                        yield ('LXUM', firminfo)
+        if components:
+            components = set([x.lower() for x in components])
+            components = components - set((
+                'core', 'uefi', 'bios', 'xcc', 'bmc', 'imm', 'fpga',
+                'lxpm'))
+            if not components:
+                return
+        if not components:
+            components = set(('all',))
+        needadapterfirmware = False
+        needdiskfirmware = False
+        if category in ('all', 'adapters'):
+            needadapterfirmware = True
+        if category in ('all', 'disks'):
+            needdiskfirmware = True
+        if needadapterfirmware:
+            for adpinfo in self._get_agentless_firmware(components):
+                yield adpinfo
+        if needdiskfirmware:
+            for adpinfo in self._get_disk_firmware(components):
+                yield adpinfo
         raise pygexc.BypassGenericBehavior()
 
     def get_storage_configuration(self, logout=True):
@@ -1296,14 +1320,15 @@ class OEMHandler(generic.OEMHandler):
             if (uploadthread.rspstatus >= 300
                     or uploadthread.rspstatus < 200):
                 rsp = uploadthread.rsp
-                errmsg = ''
+                errmsg = f'Update attempt resulted in response status {uploadthread.rspstatus}'
                 try:
                     rsp = json.loads(rsp)
                     errmsg = (
                         rsp['error'][
                             '@Message.ExtendedInfo'][0]['Message'])
                 except Exception:
-                    raise Exception(uploadthread.rsp)
+                    errmsg = f'Update attempt resulted in response status {uploadthread.rspstatus}: "{repr(rsp)}"'
+                    raise Exception(errmsg)
                 raise Exception(errmsg)
             rsp = json.loads(uploadthread.rsp)
             monitorurl = rsp['@odata.id']

pyghmi/redfish/oem/lenovo/xcc3.py

@@ -128,7 +128,9 @@ class OEMHandler(generic.OEMHandler):
             anames = {}
             for adata, _ in adapterdata:
                 skipadapter = False
-                clabel = adata['Slot']['Location']['PartLocation']['LocationType']
+                clabel = adata['Slot']['Location']['PartLocation'].get('LocationType','')
+                if not clabel:
+                    clabel = adata['Slot']['Location']['PartLocation'].get('ServiceLabel', '').split("=")[0]
                 if clabel != 'Embedded':
                     aslot = adata['Slot']['Location']['PartLocation']['LocationOrdinalValue']
                     clabel = 'Slot {0}'.format(aslot)
@@ -240,10 +242,16 @@ class OEMHandler(generic.OEMHandler):
         standalonedisks = []
         pools = []
         for item in rsp.get('Members',[]):
+            # Drives shown at 'Direct attached drives' in XCC
+            # cannot be used for RAID creation
+            if item['Id'].lower() == 'direct_attached_nvme':
+                continue
             cdisks = [item['Drives'][i]['@odata.id'] for i in range(len(item['Drives']))]
             cid = '{0},{1}'.format(
                         item['Id'],
                         item['StorageControllers'][0]['Location']['PartLocation'].get('LocationOrdinalValue', -1))
+            if item['Id'].lower() == 'vroc':
+                cid = 'vroc,0'
             storage_pools = self._get_expanded_data(item['StoragePools']['@odata.id'])
             for p in storage_pools['Members']:
                 vols = self._get_expanded_data(p['AllocatedVolumes']['@odata.id'])
@@ -1122,7 +1130,7 @@ class OEMHandler(generic.OEMHandler):
         if progress:
             progress({'phase': 'complete'})
 
-    def get_firmware_inventory(self, components, fishclient):
+    def get_firmware_inventory(self, components, fishclient, category):
         sfs = fishclient._do_web_request('/api/providers/system_firmware_status')
         pendingscm = sfs.get('fpga_scm_pending_build', None)
         pendinghpm = sfs.get('fpga_hpm_pending_build', None)

pyghmi/redfish/oem/lookup.py

@@ -22,18 +22,23 @@ OEMMAP = {
 }
 
 
-def get_oem_handler(sysinfo, sysurl, webclient, cache, cmd):
+def get_oem_handler(sysinfo, sysurl, webclient, cache, cmd, rootinfo={}):
+    if rootinfo.get('Vendor', None) in OEMMAP:
+        return OEMMAP[rootinfo['Vendor']].get_handler(sysinfo, sysurl,
+                                                     webclient, cache, cmd, rootinfo)
     for oem in sysinfo.get('Oem', {}):
         if oem in OEMMAP:
             return OEMMAP[oem].get_handler(sysinfo, sysurl, webclient, cache,
-                                           cmd)
+                                           cmd, rootinfo)
     for oem in sysinfo.get('Links', {}).get('OEM', []):
         if oem in OEMMAP:
             return OEMMAP[oem].get_handler(sysinfo, sysurl, webclient, cache,
-                                           cmd)
+                                           cmd, rootinfo)
+    if rootinfo:  # rootinfo indicates early invocation, bmcinfo not ready yet
+        return generic.OEMHandler(sysinfo, sysurl, webclient, cache, cmd._gpool, rootinfo)
     bmcinfo = cmd.bmcinfo
     for oem in bmcinfo.get('Oem', {}):
         if oem in OEMMAP:
             return OEMMAP[oem].get_handler(sysinfo, sysurl, webclient, cache,
-                                           cmd)
-    return generic.OEMHandler(sysinfo, sysurl, webclient, cache, cmd._gpool)
+                                           cmd, rootinfo)
+    return generic.OEMHandler(sysinfo, sysurl, webclient, cache, cmd._gpool, rootinfo)

{pyghmi-1.6.5.dist-info → pyghmi-1.6.6.dist-info}/METADATA

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

{pyghmi-1.6.5.dist-info → pyghmi-1.6.6.dist-info}/RECORD

@@ -11,13 +11,13 @@ 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=hSxL67zvlROMVyUtERc7UDRlJ7Bbk28seGG_RCtuWa0,90945
+pyghmi/ipmi/command.py,sha256=hG5ekt_dExSLrTV6fkr4nFh1U5LylArYdCZolR26DtU,91643
 pyghmi/ipmi/console.py,sha256=Jle7uJI3ZQS6cMwbEisFEvXjmu5MVqMs17BcAlygR_4,23369
 pyghmi/ipmi/events.py,sha256=zgUidJIARHomwxasgeYAzDO1AEMfEOzb6XVxzry22Us,22569
 pyghmi/ipmi/fru.py,sha256=sw5ZBMrEVSBDgOUPVU_ksehQMJvrl2v-r7rVyA9xoiE,14430
 pyghmi/ipmi/sdr.py,sha256=U4NH-ca1zwEmU_dKT2wvXY2vEvXh33dV9rIUlmf_5Xw,32999
 pyghmi/ipmi/oem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/ipmi/oem/generic.py,sha256=Ih8BoVebCCmgmHgbO1gJuprecRXG8vi2n4bZ-Oy6r7c,18966
+pyghmi/ipmi/oem/generic.py,sha256=ssNf1IH2_6yPkg38bRePVEwLzue4UUa7l7nsqsyQEP4,18976
 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=aNN5dvbGlNpWlrrvlWthyAO0PGn6A9Pf75wjhVleu_k,26692
@@ -26,8 +26,8 @@ pyghmi/ipmi/oem/lenovo/dimm.py,sha256=L8k1aBgtvxqyubDBNKdDkz80pDE8Sck1eMLcMz1GhF
 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=ubLUJS9c3yuZiCH1m2I5-NFI9CbpRh3_okijQxARoxM,57236
-pyghmi/ipmi/oem/lenovo/imm.py,sha256=MFd26rim8d3yVrKWxXVchaXNch93ACelgDqmjxVZu9s,113461
+pyghmi/ipmi/oem/lenovo/handler.py,sha256=MGfQd08Fd013tH9CwkmfwT7Tkh8BvbdVgeZ4T68GOW8,57256
+pyghmi/ipmi/oem/lenovo/imm.py,sha256=h33_6yNbTgFhhyiBwdWaUOjcpjpQ1gbXK1YPv0DuOC0,114400
 pyghmi/ipmi/oem/lenovo/inventory.py,sha256=FLJJinw-ibdHtf3KmrTzhWXbQrpxq3TSycVf96Hg7cw,5911
 pyghmi/ipmi/oem/lenovo/nextscale.py,sha256=bvY7MLOGMioXT7F6HBt5BBftGAEYNo2GkBNjwysPAWs,43734
 pyghmi/ipmi/oem/lenovo/pci.py,sha256=S7p-5Q2qu2YhlffN-LEmIvjfXim6OlfYL7Q6r6VZqJ4,2020
@@ -43,19 +43,19 @@ pyghmi/ipmi/private/simplesession.py,sha256=cNGaoT0uWIKDut6gUG9kAOX_b_qTzdB26R6I
 pyghmi/ipmi/private/spd.py,sha256=oEPSXm19X2eNXDiyW_6fVjBFqhuuMAtBI9quRJgclH4,27094
 pyghmi/ipmi/private/util.py,sha256=ayYodiSydlrrt0_pQppoRB1T6n-KNOiHZSfAlCMcpG0,3847
 pyghmi/redfish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/command.py,sha256=XoXSNgnYEanPFGaf6VPdLbGk6EIeep1eK3ouDDG0Nl0,61356
+pyghmi/redfish/command.py,sha256=WyxyJDqYTdnMJiZ4gnYsj9kBSXhXbBIZcLY0Ok72NKY,60849
 pyghmi/redfish/oem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/oem/generic.py,sha256=KPivHBUL_eliAT4xI8fLgS7LbF-1mH_BpkMKFRoN1Fo,57656
-pyghmi/redfish/oem/lookup.py,sha256=pfJW5xSkUY61OirMeYy0b1SbjBFz6IDfN5ZOYog_Yq4,1530
+pyghmi/redfish/oem/generic.py,sha256=T6DYrH5Tp3v4fzK9tFd3X5UjXp4ljofCGbwm6T88Rpk,64549
+pyghmi/redfish/oem/lookup.py,sha256=9zVqiNMzUS_zwlIp8luZHbN1VTOlyIVQAKnPh1KDf48,1957
 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/dell/main.py,sha256=LnX4p_IOsJNJYbv7p344izj1diLoJZvRLFwCv1aHlAY,806
 pyghmi/redfish/oem/lenovo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/oem/lenovo/main.py,sha256=bnx8LuC_C4_OluNR8JSHIxtSlM4_jdBb4cUzJM6mazE,2597
+pyghmi/redfish/oem/lenovo/main.py,sha256=SLiEHa28NxItqt89SDeM05Em9bJE5dkxNhJ8oCWFtXY,3098
 pyghmi/redfish/oem/lenovo/smm3.py,sha256=QHasf5QofFuYqtHPeqcwCEJUbd0PV5_C6u-Y8FVdqCk,7598
 pyghmi/redfish/oem/lenovo/tsma.py,sha256=6GELCuriumARj_kv7fgqtUpo9ekiWHpQcM9v_mnGILI,34645
-pyghmi/redfish/oem/lenovo/xcc.py,sha256=ydUn4mwyHcgWKmoDY66O_EVuUo43-Oy7JU8Y_6Km4kA,84251
-pyghmi/redfish/oem/lenovo/xcc3.py,sha256=8LxWzqXCkNmQ9PT-bu2ZSvgziTar3u1J37x8IRBshx8,55843
+pyghmi/redfish/oem/lenovo/xcc.py,sha256=-tLtHv9lPvVSdzNvRhZaG0zFWFJYKv4n0-80gBH_h3E,85401
+pyghmi/redfish/oem/lenovo/xcc3.py,sha256=VV2-apjbjKG806_6Zh05AapdlrLAe-GRs6-3ahVAFHI,56271
 pyghmi/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/tests/unit/base.py,sha256=xWImA7zPRgfrEe2xAdRZ6w_dLwExGRBJ5CBybssUQGg,744
@@ -64,11 +64,11 @@ pyghmi/tests/unit/ipmi/test_sdr.py,sha256=vb3iLY0cnHJ2K_m4xgYUjEcbPd_ZYhYx-uBowB
 pyghmi/util/__init__.py,sha256=GZLBWJiun2Plb_VE9dDSh4_PQMCha3gA7QLUqx3oSYI,25
 pyghmi/util/parse.py,sha256=6VlyBCEcE8gy8PJWmEDdtCyWATaKwPaTswCdioPCWOE,2120
 pyghmi/util/webclient.py,sha256=i1rJ7NBlPQFTRv7kgzbTaOHsWuPeXcMAjRXm_i8CI0A,15652
-pyghmi-1.6.5.dist-info/AUTHORS,sha256=yv4aQom_PII-SNqbeeKrfH-spcG85PRPsZ71Iqjl_fU,2083
-pyghmi-1.6.5.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pyghmi-1.6.5.dist-info/METADATA,sha256=NwQSpwKaIXyG_7u6DZLjy06x0Xkcao9oV8XcGLNT6HM,1136
-pyghmi-1.6.5.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-pyghmi-1.6.5.dist-info/entry_points.txt,sha256=-OpJliDzATxmuPXK0VR3Ma-Yk_i4ZhfIIB-12A26dSI,168
-pyghmi-1.6.5.dist-info/pbr.json,sha256=r8aaroFMObDxmIIa6_e_w9lYyPvv1WHskqCleNGcnY0,46
-pyghmi-1.6.5.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
-pyghmi-1.6.5.dist-info/RECORD,,
+pyghmi-1.6.6.dist-info/AUTHORS,sha256=yv4aQom_PII-SNqbeeKrfH-spcG85PRPsZ71Iqjl_fU,2083
+pyghmi-1.6.6.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pyghmi-1.6.6.dist-info/METADATA,sha256=iloesXFPEZB8FN0TeZqEecJ7N8cu32uZZJ0YNQLlZRo,1136
+pyghmi-1.6.6.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+pyghmi-1.6.6.dist-info/entry_points.txt,sha256=-OpJliDzATxmuPXK0VR3Ma-Yk_i4ZhfIIB-12A26dSI,168
+pyghmi-1.6.6.dist-info/pbr.json,sha256=x80AgrPN_697hTcIaJgg-7AmGBFEMVnPZC9dLcdPS_g,46
+pyghmi-1.6.6.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
+pyghmi-1.6.6.dist-info/RECORD,,

pyghmi-1.6.6.dist-info/pbr.json

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

pyghmi-1.6.5.dist-info/pbr.json

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