Merge pull request #686 from wilkmar/retry_launchpad_request

Add retry mechanism for the Launchpad API

Author: freyes

unit_tests/utilities/test_zaza_utilities_launchpad.py

@@ -22,7 +22,7 @@
 class TestUtilitiesLaunchpad(ut_utils.BaseTestCase):
 
     def test_get_ubuntu_series(self):
-        self.patch_object(launchpad.requests, 'get')
+        self.patch_object(launchpad.requests.Session, 'get')
         expect = {'entries': {}}
         r = unittest.mock.MagicMock()
         r.text = json.dumps(expect)

zaza/utilities/launchpad.py

@@ -16,6 +16,8 @@
 import json
 import requests
 import typing
+from requests.adapters import HTTPAdapter
+from requests.packages.urllib3.util.retry import Retry
 
 
 def get_ubuntu_series(
@@ -26,8 +28,21 @@ def get_ubuntu_series(
     https://launchpad.net/+apidoc/devel.html#distribution
     https://launchpad.net/+apidoc/devel.html#distro_series
     """
-    r = requests.get('https://api.launchpad.net/devel/ubuntu/series')
-    return json.loads(r.text)
+    retries = Retry(
+        total=10,
+        backoff_factor=2,
+        status_forcelist=[429, 500, 502, 503, 504],
+        allowed_methods=["GET"]
+    )
+    s = requests.Session()
+    s.mount("https://", HTTPAdapter(max_retries=retries))
+
+    try:
+        r = s.get('https://api.launchpad.net/devel/ubuntu/series')
+        r.raise_for_status()
+        return json.loads(r.text)
+    finally:
+        s.close()
 
 
 def get_ubuntu_series_by_version() -> typing.Dict[str, typing.Dict[str, any]]: