pyghmi 1.5.67__tar.gz → 1.5.69__tar.gz

{pyghmi-1.5.67 → pyghmi-1.5.69}/ChangeLog

@@ -1,6 +1,19 @@
 CHANGES
 =======
 
+1.5.69
+------
+
+* Handle out of order setting instances
+
+1.5.68
+------
+
+* Fix handling of empty bays during cap manipulation
+* Fix SMM height
+* Extent redfish inventory enumeration of XCC
+* No longer consider unrecognized states as 'warning'
+
 1.5.67
 ------
 

{pyghmi-1.5.67 → pyghmi-1.5.69}/PKG-INFO

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

{pyghmi-1.5.67 → pyghmi-1.5.69}/pyghmi/ipmi/oem/lenovo/config.py

@@ -372,7 +372,13 @@ class LenovoFirmwareConfig(object):
                         if not instances:
                             protect = True  # not supported yet
                         else:
-                            current = [x.text for x in instances]
+                            instbynum = {}
+                            defidx = 1
+                            for x in instances:
+                                xid = int(x.get('ID', defidx))
+                                instbynum[xid] = x
+                                defidx += 1
+                            current = [instbynum[idx].text for idx in sorted(instbynum)]
                         default = onedata.get('default', None)
                         if default == '':
                             default = None

{pyghmi-1.5.67 → pyghmi-1.5.69}/pyghmi/ipmi/oem/lenovo/handler.py

@@ -1191,7 +1191,7 @@ class OEMHandler(generic.OEMHandler):
         if self.has_xcc:
             return self.immhandler.get_description()
         if self.is_fpc:
-            return {'height': self._fpc_variant, 'slot': 0}
+            return {'height': self._fpc_variant & 0xf, 'slot': 0}
         return super(OEMHandler, self).get_description()
 
     def get_extended_bmc_configuration(self):

{pyghmi-1.5.67 → pyghmi-1.5.69}/pyghmi/ipmi/oem/lenovo/nextscale.py

@@ -527,8 +527,11 @@ class SMMClient(object):
             }
             for baynum in range(numbays):
                 baynum += 1
-                baycapinfo = self.ipmicmd.xraw_command(
-                    0x32, 0x9d, data=[baynum])
+                try:
+                    baycapinfo = self.ipmicmd.xraw_command(
+                        0x32, 0x9d, data=[baynum])
+                except Exception:
+                    continue
                 capmin, capmax, protcap, usercap, thermcap = struct.unpack(
                     '<HHHHH', baycapinfo['data'][retoffset:retoffset + 10])
                 settings['bay{0}_user_cap'.format(baynum)] = {
@@ -543,8 +546,11 @@ class SMMClient(object):
                     'help': 'Show the current protective cap for the system '
                             'in bay {0}'.format(baynum)
                 }
-                baycapstate = self.ipmicmd.xraw_command(
-                    0x32, 0xa0, data=[baynum])
+                try:
+                    baycapstate = self.ipmicmd.xraw_command(
+                        0x32, 0xa0, data=[baynum])
+                except Exception:
+                    continue
                 baycapstate = bool(baycapstate['data'][retoffset])
                 settings['bay{0}_user_cap_active'.format(baynum)] = {
                     'value': 'Enable' if baycapstate else 'Disable',

{pyghmi-1.5.67 → pyghmi-1.5.69}/pyghmi/ipmi/sdr.py

@@ -469,11 +469,11 @@ class SDREntry(object):
                 health = sensedata['severity']
             else:
                 desc = "Unknown state %d" % state
-                health = const.Health.Warning
+                health = const.Health.Ok
         except KeyError:
             desc = "Unknown state %d for reading type %d/sensor type %d" % (
                 state, self.reading_type, self.sensor_type_number)
-            health = const.Health.Warning
+            health = const.Health.Ok
         return desc, health
 
     def decode_sensor_reading(self, ipmicmd, reading):

{pyghmi-1.5.67 → pyghmi-1.5.69}/pyghmi/redfish/oem/generic.py

@@ -781,12 +781,12 @@ 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 pygexc.TemporaryError('Cannot run multtiple updates to '
+            raise exc.TemporaryError('Cannot run multtiple updates to '
                                         'same target concurrently')
         try:
             upurl = usd['HttpPushUri']
         except KeyError:
-            raise pygexc.UnsupportedFunctionality('Redfish firmware update only supported for implementations with push update support')
+            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',

{pyghmi-1.5.67 → pyghmi-1.5.69}/pyghmi/redfish/oem/lenovo/xcc.py

@@ -1646,6 +1646,11 @@ class OEMHandler(generic.OEMHandler):
         yield "System"
         for key in natural_sort(hwmap):
             yield key
+        for cpuinv in self._get_cpu_inventory():
+            yield cpuinv[0]
+        for meminv in self._get_mem_inventory():
+            yield meminv[0]
+
 
     def get_inventory_of_component(self, compname):
         if compname.lower() == 'system':
@@ -1662,7 +1667,12 @@ class OEMHandler(generic.OEMHandler):
         try:
             return hwmap[compname]
         except KeyError:
-
+            for cpuinv in self._get_cpu_inventory():
+                if cpuinv[0] == compname:
+                    return cpuinv[1]
+            for meminv in self._get_mem_inventory():
+                if meminv[0] == compname:
+                    return meminv[1]
             return None
 
     def get_inventory(self, withids=False):

{pyghmi-1.5.67 → pyghmi-1.5.69}/pyghmi.egg-info/PKG-INFO

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

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

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

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

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