[STRIMZI_CA] Add strimzi ca to cert check 12/128112/2
authorefiacor <fiachra.corcoran@est.tech>
Mon, 28 Mar 2022 10:03:22 +0000 (11:03 +0100)
committerefiacor <fiachra.corcoran@est.tech>
Tue, 29 Mar 2022 08:41:49 +0000 (09:41 +0100)
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I246820e8d101834cbee43300a818c68dc03b2f14
Issue-ID: INT-2097

test/security/check_certificates/check_certificates/check_certificates_validity.py

index e0c0848..5d19a73 100644 (file)
@@ -60,6 +60,7 @@ CERT_MODES = ['nodeport', 'ingress', 'internal']
 EXP_CRITERIA_MIN = 30
 EXP_CRITERIA_MAX = 389
 EXPECTED_CERT_STRING = "C=US;O=ONAP;OU=OSAAF;CN=intermediateCA_9"
+EXPECTED_STRIMZI_CA_CERT_STRING = "O=io.strimzi;CN=cluster-ca v0"
 RESULT_PATH = "."
 
 
@@ -156,7 +157,7 @@ def get_certifificate_info(host, port):
         issuer_info += (issuer_info_key.decode('utf-8') + "=" +
                         issuer_info_val.decode('utf-8') + ";")
     cert_validity = False
-    if issuer_info[:-1] == EXPECTED_CERT_STRING:
+    if issuer_info[:-1] in [EXPECTED_CERT_STRING, EXPECTED_STRIMZI_CA_CERT_STRING]:
         cert_validity = True
 
     return {'expiration_date': exp_date,