pyghmi 1.5.65__tar.gz → 1.5.67__tar.gz

{pyghmi-1.5.65 → pyghmi-1.5.67}/ChangeLog

@@ -1,6 +1,17 @@
 CHANGES
 =======
 
+1.5.67
+------
+
+* Catch more XCC variants
+* More gracefully fail on normalized readings
+
+1.5.66
+------
+
+* Add retry mechanism to FW update
+
 1.5.65
 ------
 

{pyghmi-1.5.65 → pyghmi-1.5.67}/MANIFEST.in

@@ -1,4 +1,5 @@
 include AUTHORS
+include LICENSE
 include ChangeLog
 exclude .gitignore
 exclude .gitreview

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

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

{pyghmi-1.5.65 → pyghmi-1.5.67}/pyghmi/ipmi/oem/generic.py

@@ -115,6 +115,9 @@ class OEMHandler(object):
             if len(extenv) > 1:
                 raise Exception('TODO: how to deal with multiple external environments')
             self._inlet_name = extenv[0]
+        if not self._inlet_name:
+            raise exc.UnsupportedFunctionality(
+                'Unable to detect inlet sensor name for this platform')
         return ipmicmd.get_sensor_reading(self._inlet_name)
 
     def process_event(self, event, ipmicmd, seldata):

{pyghmi-1.5.65 → pyghmi-1.5.67}/pyghmi/ipmi/oem/lenovo/imm.py

@@ -2062,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'])

{pyghmi-1.5.65 → pyghmi-1.5.67}/pyghmi/redfish/command.py

@@ -1153,6 +1153,8 @@ class Command(object):
         chassisurl = chassis['@odata.id']
         chassisinfo = self._do_web_request(chassisurl)
         envurl = chassisinfo.get('EnvironmentMetrics', {}).get('@odata.id', '')
+        if not envurl:
+            return {}
         envmetric = self._do_web_request(envurl, cache=1)
         retval = {
             'watts': envmetric.get('PowerWatts', {}).get('Reading', None),
@@ -1180,16 +1182,24 @@ class Command(object):
 
     def get_system_power_watts(self):
         totalwatts = 0
+        gotpower = False
         for chassis in self.sysinfo.get('Links', {}).get('Chassis', []):
             envinfo = self._get_chassis_env(chassis)
-            totalwatts += envinfo['watts']
+            currwatts = envinfo.get('watts', None)
+            if currwatts is not None:
+                gotpower = True
+                totalwatts += envinfo['watts']
+        if not gotpower:
+            raise exc.UnsupportedFunctionality("System does not provide Power under redfish EnvironmentMetrics")
         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'])
+            currinlet = envinfo.get('inlet', None)
+            if currinlet:
+                inlets.append(currinlet)
         if inlets:
             val = sum(inlets) / len(inlets)
             unavail = False

{pyghmi-1.5.65 → pyghmi-1.5.67}/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'])

{pyghmi-1.5.65 → pyghmi-1.5.67}/pyghmi/redfish/oem/lenovo/main.py

@@ -23,7 +23,7 @@ def get_handler(sysinfo, sysurl, webclient, cache, cmd):
         bmcinfo = cmd.bmcinfo
         if 'Ami' in bmcinfo.get('Oem', {}):
             return tsma.TsmHandler(sysinfo, sysurl, webclient, cache)
-    if 'FrontPanelUSB' in leninf or sysinfo.get('SKU', '').startswith('7X58'):
+    if '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.65 → pyghmi-1.5.67}/pyghmi/redfish/oem/lenovo/xcc.py

@@ -1278,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'])

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

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

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

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

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

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