proposal for fixing failed fetch of crt situations

sucm/sucm_automation.py

@@ -8,9 +8,25 @@
 from .sucm_notifygroup import SucmNotifyGroup
 from .sucm_settings import app_logger
 
+def retry_failed_fetch():
+    certs_that_failed = SucmCertificate().get_fetch_failures()
+    if certs_that_failed:
+        for cert in certs_that_failed:
+            try:
+                cert_obj = SucmCertificate(cert_id=cert["cert_id"])
+                cert_obj.set_current_class_values_from_db()
+                cert_obj.renew_cert_with_csr()
+                app_logger.info(
+                    "%s has been renewed after previous fetch failure and is now pushed to vault.",
+                    cert["common_name"],
+                )
+                del cert_obj
+            except:
+                return
 
 def job_function():
     app_logger.info("Job started!")
+    retry_failed_fetch()
     certs_to_renew = SucmCertificate().get_renewable_certs()
     certs_to_remove = SucmCertificate().get_expired_certs()
     if certs_to_renew:

sucm/sucm_certificate.py

@@ -254,6 +254,16 @@ def get_expired_certs(self):
             data_list.append(details)
         return data_list
 
+    def get_fetch_failures(self):
+        all_data = sucm_db.get_records(
+            "Certificate", "Status = 'Failed to fetch CRT'"
+        )
+        data_list = []
+        for data in all_data:
+            details = self._create_cert_dict(data)
+            data_list.append(details)
+        return data_list
+
     def get_next_cert_id(self):
         return sucm_db.get_next_available_id("Certificate")
 
@@ -417,11 +427,16 @@ def _split_pem_chain(pem_chain):
         return pem_certificates
 
     def renew_cert_with_csr(self):
-        if self.status == "New CSR":
+        if self.status == "New CSR" of self.status == "Failed to fetch CRT":
             self._fetch_csr()
 
-            self._load_certificate_authority()
-            cert_data = self.cert_authority.fetch_cert(self.csr)
+            try:
+                self._load_certificate_authority()
+                cert_data = self.cert_authority.fetch_cert(self.csr)
+            except:
+                self.status = "Failed to fetch CRT"
+                self.commit_changes_to_db()
+                return
 
             self.crt = cert_data[0]
             self.expiry_date = cert_data[1]