Rename radas_sign_timeout_retry_count and radas_sign_timeout_retry_interval

Author: yma955

charon/config.py

@@ -13,6 +13,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+
 import logging
 import os
 from typing import Dict, List, Optional
@@ -34,6 +35,10 @@ def __init__(self, data: Dict):
         self.__client_key: str = data.get("client_key", None)
         self.__client_key_pass_file: str = data.get("client_key_pass_file", None)
         self.__root_ca: str = data.get("root_ca", "/etc/pki/tls/certs/ca-bundle.crt")
+        self.__radas_sign_timeout_retry_count: int = data.get("radas_sign_timeout_retry_count", 10)
+        self.__radas_sign_timeout_retry_interval: int = data.get(
+            "radas_sign_timeout_retry_interval", 60
+        )
 
     def validate(self) -> bool:
         if not self.__umb_host:
@@ -60,7 +65,7 @@ def validate(self) -> bool:
         return True
 
     def umb_target(self) -> str:
-        return f'amqps://{self.__umb_host}:{self.__umb_host_port}'
+        return f"amqps://{self.__umb_host}:{self.__umb_host_port}"
 
     def result_queue(self) -> str:
         return self.__result_queue
@@ -77,7 +82,7 @@ def client_key(self) -> str:
     def client_key_password(self) -> str:
         pass_file = self.__client_key_pass_file
         if os.access(pass_file, os.R_OK):
-            with open(pass_file, 'r') as f:
+            with open(pass_file, "r") as f:
                 return f.read()
         elif pass_file:
             logger.warning("The key password file is not accessible. Will ignore the password.")
@@ -86,6 +91,12 @@ def client_key_password(self) -> str:
     def root_ca(self) -> str:
         return self.__root_ca
 
+    def radas_sign_timeout_retry_count(self) -> int:
+        return self.__radas_sign_timeout_retry_count
+
+    def radas_sign_timeout_retry_interval(self) -> int:
+        return self.__radas_sign_timeout_retry_interval
+
 
 class CharonConfig(object):
     """CharonConfig is used to store all configurations for charon

charon/constants.py

@@ -176,5 +176,5 @@
 
 DEFAULT_REGISTRY = "localhost"
 DEFAULT_SIGN_RESULT_LOC = "/tmp/sign"
-DEFAULT_RADAS_SIGN_TIMEOUT_COUNT = 10
-DEFAULT_RADAS_SIGN_WAIT_INTERVAL_SEC = 60
+DEFAULT_RADAS_SIGN_TIMEOUT_RETRY_COUNT = 10
+DEFAULT_RADAS_SIGN_TIMEOUT_RETRY_INTERVAL = 60

charon/pkgs/radas_signature_handler.py

@@ -26,8 +26,8 @@
 from typing import List, Any, Tuple, Callable, Dict
 from charon.config import get_config
 from charon.constants import DEFAULT_SIGN_RESULT_LOC
-from charon.constants import DEFAULT_RADAS_SIGN_TIMEOUT_COUNT
-from charon.constants import DEFAULT_RADAS_SIGN_WAIT_INTERVAL_SEC
+from charon.constants import DEFAULT_RADAS_SIGN_TIMEOUT_RETRY_COUNT
+from charon.constants import DEFAULT_RADAS_SIGN_TIMEOUT_RETRY_INTERVAL
 from charon.pkgs.oras_client import OrasClient
 
 logger = logging.getLogger(__name__)
@@ -132,19 +132,22 @@ def generate_radas_sign(top_level: str) -> Tuple[List[str], List[str]]:
     Generate .asc files based on RADAS sign result json file
     """
     conf = get_config()
-    timeout_count = (
-        conf.get_radas_sign_timeout_count() if conf else DEFAULT_RADAS_SIGN_TIMEOUT_COUNT
+    rconf = conf.get_radas_config() if conf else None
+    timeout_retry_count = (
+        rconf.radas_sign_timeout_retry_count() if rconf else DEFAULT_RADAS_SIGN_TIMEOUT_RETRY_COUNT
     )
-    wait_interval_sec = (
-        conf.get_radas_sign_wait_interval_sec() if conf else DEFAULT_RADAS_SIGN_WAIT_INTERVAL_SEC
+    timeout_retry_interval = (
+        rconf.radas_sign_timeout_retry_interval()
+        if conf
+        else DEFAULT_RADAS_SIGN_TIMEOUT_RETRY_INTERVAL
     )
     wait_count = 0
     while SignHandler.is_processing():
         wait_count += 1
-        if wait_count > timeout_count:
+        if wait_count > timeout_retry_count:
             logger.warning("Timeout when waiting for sign response.")
             break
-        time.sleep(wait_interval_sec)
+        time.sleep(timeout_retry_interval)
 
     files = SignHandler.get_downloaded_files()
     if not files: