pyghmi 1.5.64__tar.gz → 1.5.66__tar.gz

{pyghmi-1.5.64 → pyghmi-1.5.66}/AUTHORS

@@ -41,6 +41,7 @@ Steve Baker <sbaker@redhat.com>
 Tim Rozet <trozet@redhat.com>
 Tovin Seven <vinhnt@vn.fujitsu.com>
 Vlad Spoiala <vspoiala1@lenovo.com>
+Vlad Spoiala1 <vspoiala1@lenovo.com>
 ghanshyam <gmann@ghanshyammann.com>
 huang.zhiping <huang.zhiping@99cloud.net>
 lijingxin <lijingxin@sinorail.com>

{pyghmi-1.5.64 → pyghmi-1.5.66}/ChangeLog

@@ -1,6 +1,22 @@
 CHANGES
 =======
 
+1.5.66
+------
+
+* Add retry mechanism to FW update
+
+1.5.65
+------
+
+* Add prefix to 7mm disks
+* Do not presume messages in result
+* Fix total and free capacity calculations
+* Have average CPU handle totally missing sensors
+* Handle missing sensors
+* Add normalized temperature/power data for redfish
+* Add normalized sensor data
+
 1.5.64
 ------
 

{pyghmi-1.5.64 → pyghmi-1.5.66}/PKG-INFO

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

{pyghmi-1.5.64 → pyghmi-1.5.66}/pyghmi/ipmi/command.py

@@ -778,6 +778,18 @@ class Command(object):
             summary['badreadings'] = fallbackreadings
         return summary
 
+    def get_system_power_watts(self):
+        self.oem_init()
+        return self._oem.get_system_power_watts(self)
+    
+    def get_inlet_temperature(self):
+        self.oem_init()
+        return self._oem.get_inlet_temperature(self)
+
+    def get_average_processor_temperature(self):
+        self.oem_init()
+        return self._oem.get_average_processor_temperature(self)
+
     def get_sensor_reading(self, sensorname):
         """Get a sensor reading by name
 

{pyghmi-1.5.64 → pyghmi-1.5.66}/pyghmi/ipmi/oem/generic.py

@@ -14,7 +14,8 @@
 
 import pyghmi.exceptions as exc
 import pyghmi.ipmi.private.constants as event_const
-
+import pyghmi.ipmi.sdr as ipmisdr
+import struct
 
 class OEMHandler(object):
     """Handler class for OEM capabilities.
@@ -41,6 +42,81 @@ class OEMHandler(object):
         """
         return {}
 
+    def get_system_power_watts(self, ipmicmd):
+        # Use DCMI getpower reading command
+        rsp = ipmicmd.xraw_command(netfn=0x2c, command=2, data=(0xdc, 1, 0, 0))
+        wattage = struct.unpack('<H', rsp['data'][1:3])[0]
+        return wattage
+    
+    def get_average_processor_temperature(self, ipmicmd):
+        # DCMI suggests preferrence for 0x37 ('Air inlet')
+        # If not that, then 0x40 ('Air inlet')
+        # in practice, some implementations use 0x27 ('External environment')
+        if not hasattr(self, '_processor_names'):
+            self._processor_names = []
+        readings = []
+        if not self._processor_names:
+            sdr = ipmicmd.init_sdr()
+            for sensename in sdr.sensors:
+                sensor = sdr.sensors[sensename]
+                if sensor.reading_type != 1:
+                    continue
+                if not sensor.baseunit:
+                    continue
+                if sensor.sensor_type != 'Temperature':
+                    continue
+                if sensor.entity == 'Processor':
+                    self._processor_names.append(sensor.sensor_name)
+        readingvalues = []
+        for procsensor in self._processor_names:
+            try:
+                reading = ipmicmd.get_sensor_reading(procsensor)
+            except exc.IpmiException:
+                continue
+            if reading.value is not None:
+                readingvalues.append(float(reading.value))
+        tmplreading = ipmisdr.SensorReading({'name': 'Average Processor Temperature', 'type': 'Temperature'}, '°C')
+        if readingvalues:
+            tmplreading.value = sum(readingvalues) / len(readingvalues)
+        else:
+            tmplreading.value = None
+            tmplreading.unavailable = 1
+        return tmplreading
+
+
+    def get_inlet_temperature(self, ipmicmd):
+        # DCMI suggests preferrence for 0x37 ('Air inlet')
+        # If not that, then 0x40 ('Air inlet')
+        # in practice, some implementations use 0x27 ('External environment')
+        if not hasattr(self, '_inlet_name'):
+            self._inlet_name = None
+        if self._inlet_name:
+            return ipmicmd.get_sensor_reading(self._inlet_name)
+        sdr = ipmicmd.init_sdr()
+        extenv = []
+        airinlets = []
+        for sensename in sdr.sensors:
+            sensor = sdr.sensors[sensename]
+            if sensor.reading_type != 1:
+                continue
+            if not sensor.baseunit:
+                continue
+            if sensor.sensor_type != 'Temperature':
+                continue
+            if sensor.entity == 'External environment':
+                extenv.append(sensor.sensor_name)
+            if sensor.entity == 'Air inlet':
+                airinlets.append(sensor.sensor_name)
+        if airinlets:
+            if len(airinlets) > 1:
+                raise Exception('TODO: how to deal with multiple inlets')
+            self._inlet_name = airinlets[0]
+        elif extenv:
+            if len(extenv) > 1:
+                raise Exception('TODO: how to deal with multiple external environments')
+            self._inlet_name = extenv[0]
+        return ipmicmd.get_sensor_reading(self._inlet_name)
+
     def process_event(self, event, ipmicmd, seldata):
         """Modify an event according with OEM understanding.
 

{pyghmi-1.5.64 → pyghmi-1.5.66}/pyghmi/ipmi/oem/lenovo/energy.py

@@ -28,6 +28,7 @@ class EnergyManager(object):
         # get the handle (which has always been the same, but just in case
         self.iana = bytearray(b'\x66\x4a\x00')
         self._usefapm = False
+        self._mypowermeters = ()
         try:
             rsp = ipmicmd.xraw_command(netfn=0x3a, command=0x32, data=[4, 2, 0, 0, 0])
             if len(rsp['data']) >= 8:

{pyghmi-1.5.64 → pyghmi-1.5.66}/pyghmi/ipmi/oem/lenovo/imm.py

@@ -104,7 +104,7 @@ def fixup_str(propstr):
 def str_to_size(sizestr):
     if 'GB' in sizestr:
         sizestr = sizestr.replace('GB', '')
-        sizestr = int(float(sizestr) * 1024)
+        sizestr = int(float(sizestr) * 1000)
     elif 'GiB' in sizestr:
         sizestr = sizestr.replace('GiB', '')
         sizestr = int(float(sizestr) * 1024)
@@ -1336,8 +1336,12 @@ class XCCClient(IMMClient):
 
     def get_disk_hardware(self, diskent, prefix=''):
         bdata = {}
-        if not prefix and diskent.get('location', '').startswith('M.2'):
-            prefix = 'M.2-'
+        if not prefix:
+            location = diskent.get('location', '')
+            if location.startswith('M.2'):
+                prefix = 'M.2-'
+            elif location.startswith('7MM'):
+                prefix = '7MM-'
         diskname = 'Disk {1}{0}'.format(diskent['slotNo'], prefix)
         bdata['Model'] = diskent['productName'].rstrip()
         bdata['Serial Number'] = diskent['serialNo'].rstrip()
@@ -1347,8 +1351,12 @@ class XCCClient(IMMClient):
 
     def get_disk_firmware(self, diskent, prefix=''):
         bdata = {}
-        if not prefix and diskent.get('location', '').startswith('M.2'):
-            prefix = 'M.2-'
+        if not prefix:
+            location = diskent.get('location', '')
+            if location.startswith('M.2'):
+                prefix = 'M.2-'
+            elif location.startswith('7MM'):
+                prefix = '7MM-'
         diskname = 'Disk {1}{0}'.format(diskent['slotNo'], prefix)
         bdata['model'] = diskent[
             'productName'].rstrip()
@@ -2054,13 +2062,18 @@ class XCCClient(IMMClient):
             complete = False
             phase = "apply"
             statetype = 'TaskState'
-            while not complete:
+            # 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
+            while not complete and retry > 0:
                 pgress, status = self.grab_redfish_response_with_status(
                     monitorurl)
                 if status < 200 or status >= 300:
                     raise Exception(pgress)
                 if not pgress:
-                    break
+                    retry -= 1
+                    ipmisession.Session.pause(3)
+                    continue
                 for msg in pgress.get('Messages', []):
                     if 'Verify failed' in msg.get('Message', ''):
                         raise Exception(msg['Message'])
@@ -2072,7 +2085,8 @@ class XCCClient(IMMClient):
                 complete = state == 'Completed'
                 progress({'phase': phase, 'progress': pct})
                 if complete:
-                    if 'OperationTransitionedToJob' in pgress['Messages'][0]['MessageId']:
+                    msgs = pgress.get('Messages', [])
+                    if msgs and 'OperationTransitionedToJob' in msgs[0].get('MessageId', ''):
                         monitorurl = pgress['Messages'][0]['MessageArgs'][0]
                         phase = 'validating'
                         statetype = 'JobState'

{pyghmi-1.5.64 → pyghmi-1.5.66}/pyghmi/redfish/command.py

@@ -142,6 +142,16 @@ class SensorReading(object):
         self.imprecision = None
         self.units = units
         self.unavailable = unavailable
+    
+    def __repr__(self):
+        return repr({
+            'value': self.value,
+            'state_ids': self.state_ids,
+            'units': self.units,
+            'imprecision': self.imprecision,
+            'name': self.name,
+            'unavailable': self.unavailable,
+        })
 
 
 class Command(object):
@@ -509,6 +519,8 @@ class Command(object):
     def _do_web_request(self, url, payload=None, method=None, cache=True,
                         etag=None):
         res = None
+        if cache is True:
+            cache = 30
         if cache and payload is None and method is None:
             res = self._get_cache(url, cache)
         if res:
@@ -652,6 +664,14 @@ class Command(object):
         for subchassis in chassisinfo.get('Links', {}).get('Contains', []):
             self._mapchassissensors(subchassis)
 
+    def _get_thermals(self, chassis):
+        chassisurl = chassis['@odata.id']
+        chassisinfo = self._do_web_request(chassisurl)
+        thermurl = chassisinfo.get('Thermal', {}).get('@odata.id', '')
+        if thermurl:
+            therminf = self._do_web_request(thermurl, cache=1)
+            return therminf.get('Temperatures', [])
+
     @property
     def _bmcurl(self):
         if not self._varbmcurl:
@@ -1129,6 +1149,56 @@ class Command(object):
                     log.get('Severity', 'Warning'), const.Health.Ok)
                 yield record
 
+    def _get_chassis_env(self, chassis):
+        chassisurl = chassis['@odata.id']
+        chassisinfo = self._do_web_request(chassisurl)
+        envurl = chassisinfo.get('EnvironmentMetrics', {}).get('@odata.id', '')
+        envmetric = self._do_web_request(envurl, cache=1)
+        retval = {
+            'watts': envmetric.get('PowerWatts', {}).get('Reading', None),
+            'inlet': envmetric.get('TemperatureCelsius', {}).get('Reading', None)
+        }
+        return retval
+
+    def get_average_processor_temperature(self):
+        cputemps = []
+        for chassis in self.sysinfo.get('Links', {}).get('Chassis', []):
+            thermals = self._get_thermals(chassis)
+            for temp in thermals:
+                if temp.get('PhysicalContext', '') != 'CPU':
+                    continue
+                if temp.get('ReadingCelsius', None) is None:
+                    continue
+                cputemps.append(temp['ReadingCelsius'])
+        if not cputemps:
+            return  SensorReading(
+            None, {'name': 'Average Processor Temperature'}, value=None, units='°C',
+                   unavailable=True)
+        avgtemp = sum(cputemps) / len(cputemps)
+        return SensorReading(
+            None, {'name': 'Average Processor Temperature'}, value=avgtemp, units='°C')
+
+    def get_system_power_watts(self):
+        totalwatts = 0
+        for chassis in self.sysinfo.get('Links', {}).get('Chassis', []):
+            envinfo = self._get_chassis_env(chassis)
+            totalwatts += envinfo['watts']
+        return totalwatts
+
+    def get_inlet_temperature(self):
+        inlets = []
+        for chassis in self.sysinfo.get('Links', {}).get('Chassis', []):
+            envinfo = self._get_chassis_env(chassis)
+            inlets.append(envinfo['inlet'])
+        if inlets:
+            val = sum(inlets) / len(inlets)
+            unavail = False
+        else:
+            val = None
+            unavail = True
+        return SensorReading(
+                        None, {'name': 'Inlet Temperature'}, value=val, units='°C',
+                        unavailable=unavail)
     def get_sensor_descriptions(self):
         for sensor in natural_sort(self._sensormap):
             yield self._sensormap[sensor]

{pyghmi-1.5.64 → pyghmi-1.5.66}/pyghmi/redfish/oem/generic.py

@@ -820,10 +820,15 @@ class OEMHandler(object):
             complete = False
             phase = "apply"
             statetype = 'TaskState'
-            while not complete:
+            # 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
+            while not complete and retry > 0:
                 pgress = self._do_web_request(monitorurl, cache=False)
                 if not pgress:
-                    break
+                    retry -= 1
+                    time.sleep(3)
+                    continue
                 for msg in pgress.get('Messages', []):
                     if 'Verify failed' in msg.get('Message', ''):
                         raise Exception(msg['Message'])
@@ -836,7 +841,8 @@ class OEMHandler(object):
                 complete = state == 'Completed'
                 progress({'phase': phase, 'progress': pct})
                 if complete:
-                    if 'OperationTransitionedToJob' in pgress['Messages'][0]['MessageId']:
+                    msgs = pgress.get('Messages', [])
+                    if msgs and 'OperationTransitionedToJob' in msgs[0].get('MessageId', ''):
                         monitorurl = pgress['Messages'][0]['MessageArgs'][0]
                         phase = 'validating'
                         statetype = 'JobState'

{pyghmi-1.5.64 → pyghmi-1.5.66}/pyghmi/redfish/oem/lenovo/xcc.py

@@ -102,6 +102,22 @@ def natural_sort(iterable):
         return sorted(iterable)
 
 
+def str_to_size(sizestr):
+    if 'GB' in sizestr:
+        sizestr = sizestr.replace('GB', '')
+        sizestr = int(float(sizestr) * 1000)
+    elif 'GiB' in sizestr:
+        sizestr = sizestr.replace('GiB', '')
+        sizestr = int(float(sizestr) * 1024)
+    elif 'TB' in sizestr:
+        sizestr = sizestr.replace('TB', '')
+        sizestr = int(float(sizestr) * 1000 * 1000)
+    elif 'TiB' in sizestr:
+        sizestr = sizestr.replace('TiB', '')
+        sizestr = int(float(sizestr) * 1024 * 1024)
+    return sizestr
+
+
 class OEMHandler(generic.OEMHandler):
     logouturl = '/api/providers/logout'
     bmcname = 'XCC'
@@ -630,8 +646,12 @@ class OEMHandler(generic.OEMHandler):
 
     def _get_disk_firmware_single(self, diskent, prefix=''):
         bdata = {}
-        if not prefix and diskent.get('location', '').startswith('M.2'):
-            prefix = 'M.2-'
+        if not prefix:
+            location = diskent.get('location', '')
+            if location.startswith('M.2'):
+                prefix = 'M.2-'
+            elif location.startswith('7MM'):
+                prefix = '7MM-'
         diskname = 'Disk {1}{0}'.format(diskent['slotNo'], prefix)
         bdata['model'] = diskent[
             'productName'].rstrip()
@@ -708,12 +728,8 @@ class OEMHandler(generic.OEMHandler):
                             spares.append(diskinfo)
                         else:
                             disks.append(diskinfo)
-                    totalsize = pool['totalCapacityStr'].replace(
-                        'GB', '').replace('GiB', '')
-                    totalsize = int(float(totalsize) * 1024)
-                    freesize = pool['freeCapacityStr'].replace(
-                        'GB', '').replace('GiB', '')
-                    freesize = int(float(freesize) * 1024)
+                    totalsize = str_to_size(pool['totalCapacityStr'])
+                    freesize = str_to_size(pool['freeCapacityStr'])
                     pools.append(storage.Array(
                         disks=disks, raid=pool['rdlvlstr'], volumes=volumes,
                         id=(cid, pool['id']), hotspares=spares,
@@ -1262,10 +1278,15 @@ class OEMHandler(generic.OEMHandler):
             complete = False
             phase = "apply"
             statetype = 'TaskState'
-            while not complete:
+            # 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
+            while not complete and retry > 0:
                 pgress = self._do_web_request(monitorurl, cache=False)
                 if not pgress:
-                    break
+                    retry -= 1
+                    time.sleep(3)
+                    continue
                 for msg in pgress.get('Messages', []):
                     if 'Verify failed' in msg.get('Message', ''):
                         raise Exception(msg['Message'])
@@ -1278,7 +1299,8 @@ class OEMHandler(generic.OEMHandler):
                 complete = state == 'Completed'
                 progress({'phase': phase, 'progress': pct})
                 if complete:
-                    if 'OperationTransitionedToJob' in pgress['Messages'][0]['MessageId']:
+                    msgs = pgress.get('Messages', [])
+                    if msgs and 'OperationTransitionedToJob' in msgs[0].get('MessageId', ''):
                         monitorurl = pgress['Messages'][0]['MessageArgs'][0]
                         phase = 'validating'
                         statetype = 'JobState'
@@ -1816,8 +1838,12 @@ class OEMHandler(generic.OEMHandler):
 
     def get_disk_hardware(self, diskent, prefix=''):
         bdata = {}
-        if not prefix and diskent.get('location', '').startswith('M.2'):
-            prefix = 'M.2-'
+        if not prefix:
+            location = diskent.get('location', '')
+            if location.startswith('M.2'):
+                prefix = 'M.2-'
+            elif location.startswith('7MM'):
+                prefix = '7MM-'
         diskname = 'Disk {1}{0}'.format(diskent['slotNo'], prefix)
         bdata['Model'] = diskent['productName'].rstrip()
         bdata['Serial Number'] = diskent['serialNo'].rstrip()

{pyghmi-1.5.64 → pyghmi-1.5.66}/pyghmi.egg-info/PKG-INFO

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

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

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

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

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