Fix exception handling

sapcc · Feb 25, 2025 · 10bc79a · 10bc79a
1 parent da20033
commit 10bc79a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/octavia_f5/utils/cert_manager.py b/octavia_f5/utils/cert_manager.py
@@ -21,6 +21,7 @@
 from oslo_context import context as oslo_context
 from stevedore import driver as stevedore_driver
 
+from octavia.common import exceptions as octavia_exc
 from octavia.common.tls_utils import cert_parser
 from octavia_f5.common import constants
 from octavia_f5.restclient.as3objects import certificate as m_cert
@@ -42,8 +43,7 @@ def __init__(self):
 
     @tenacity.retry(
         retry=tenacity.retry_if_exception_type(
-            (urllib_exc.NewConnectionError,
-             requests_exc.ConnectionError)),
+            (octavia_exc.CertificateRetrievalException)),
         wait=tenacity.wait_incrementing(
             RETRY_INITIAL_DELAY, RETRY_BACKOFF, RETRY_MAX),
         stop=tenacity.stop_after_attempt(RETRY_ATTEMPTS))
@@ -84,8 +84,7 @@ def get_certificates(self, obj, context=None):
 
     @tenacity.retry(
         retry=tenacity.retry_if_exception_type(
-            (urllib_exc.NewConnectionError,
-             requests_exc.ConnectionError)),
+            (octavia_exc.CertificateRetrievalException)),
         wait=tenacity.wait_incrementing(
             RETRY_INITIAL_DELAY, RETRY_BACKOFF, RETRY_MAX),
         stop=tenacity.stop_after_attempt(RETRY_ATTEMPTS))