Retry on 404s for keystone ldap

zaza/openstack/charm_tests/keystone/tests_ldap_k8s.py

@@ -14,8 +14,9 @@
 """Keystone LDAP tests on k8s."""
 
 import json
-
+import tenacity
 import contextlib
+import keystoneauth1.exceptions.http.NotFound as http_NotFound
 import zaza.openstack.charm_tests.keystone.tests as ks_tests
 import zaza.openstack.charm_tests.tempest.tests as tempest_tests
 import zaza.charm_lifecycle.utils as lifecycle_utils
@@ -101,6 +102,18 @@ def _get_ldap_config(self):
             "ldap-config-flags": config_flags,
             "domain-name": "userdomain"}
 
+    @tenacity.retry(wait=tenacity.wait_exponential(multiplier=2, max=60),
+                    reraise=True, stop=tenacity.stop_after_attempt(5),
+                    retry=tenacity.retry_if_exception_type(http_NotFound))
+    def _find_keystone_v3_group(self, group, domain):
+        super()._find_keystone_v3_group(group, domain)
+
+    @tenacity.retry(wait=tenacity.wait_exponential(multiplier=2, max=60),
+                    reraise=True, stop=tenacity.stop_after_attempt(5),
+                    retry=tenacity.retry_if_exception_type(http_NotFound))
+    def _find_keystone_v3_user(username, domain, group=None):
+        super()._find_keystone_v3_user(username, domain, group=group)
+
 
 class KeystoneTempestTestK8S(tempest_tests.TempestTestScaleK8SBase):
     """Test keystone k8s scale out and scale back."""