pyghmi 1.5.65__tar.gz → 1.5.66__tar.gz

{pyghmi-1.5.65 → pyghmi-1.5.66}/ChangeLog

@@ -1,6 +1,11 @@
 CHANGES
 =======
 
+1.5.66
+------
+
+* Add retry mechanism to FW update
+
 1.5.65
 ------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyghmi
-Version: 1.5.65
+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.65 → pyghmi-1.5.66}/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.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'])

{pyghmi-1.5.65 → pyghmi-1.5.66}/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.66}/pyghmi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyghmi
-Version: 1.5.65
+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.65/pyghmi.egg-info/pbr.json

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