X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fresources%2Fscripts%2FsdcBePy%2Fcommon%2FhealthCheck.py;h=8d63ef3d985f92a2739a7d96f3f80c3a13aa6f60;hb=532abef3013434369b0d6a126b417db7b6134bd2;hp=7d8558d644097513f80df02ed4047391ab495a29;hpb=fca8a0b1af32083b8ea025135b120091aec9714f;p=sdc.git diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/common/healthCheck.py b/catalog-be/src/main/resources/scripts/sdcBePy/common/healthCheck.py index 7d8558d644..8d63ef3d98 100644 --- a/catalog-be/src/main/resources/scripts/sdcBePy/common/healthCheck.py +++ b/catalog-be/src/main/resources/scripts/sdcBePy/common/healthCheck.py @@ -4,18 +4,17 @@ import time from argparse import ArgumentParser from datetime import datetime +from sdcBePy import properties from sdcBePy.common.bColors import BColors +from sdcBePy.common.properties import init_properties from sdcBePy.common.sdcBeProxy import SdcBeProxy colors = BColors() -RETRY_TIME = 10 -RETRY_ATTEMPTS = 10 - -def check_backend(sdc_be_proxy=None, reply_append_count=1, be_host=None, be_port=None, scheme=None, debug=False): +def check_backend(sdc_be_proxy=None, reply_append_count=1, be_host=None, be_port=None, header=None, scheme=None, debug=False, ca_cert=None, tls_cert=None, tls_key=None, tls_key_pw=None): if sdc_be_proxy is None: - sdc_be_proxy = SdcBeProxy(be_host, be_port, scheme, debug=debug) + sdc_be_proxy = SdcBeProxy(be_host, be_port, header, scheme, tls_cert, tls_key, tls_key_pw, ca_cert, debug=debug) for i in range(1, reply_append_count + 1): if sdc_be_proxy.check_backend() == 200: @@ -24,13 +23,14 @@ def check_backend(sdc_be_proxy=None, reply_append_count=1, be_host=None, be_port else: print('[WARRING]: ' + datetime.now().strftime('%Y/%m/%d %H:%M:%S') + colors.FAIL + ' Backend not responding, try #' + str(i) + colors.END_C) - time.sleep(RETRY_TIME) + time.sleep(properties.retry_time) return False -def run(be_host, be_port, protocol): - if not check_backend(reply_append_count=RETRY_ATTEMPTS, be_host=be_host, be_port=be_port, scheme=protocol): +def run(be_host, be_port, header, protocol, tls_key, tls_cert, tls_key_pw, ca_cert): + if not check_backend(reply_append_count=properties.retry_attempts, be_host=be_host, + be_port=be_port, header=header, scheme=protocol, ca_cert=ca_cert, tls_cert=tls_cert, tls_key=tls_key, tls_key_pw=tls_key_pw): print('[ERROR]: ' + time.strftime('%Y/%m/%d %H:%M:%S') + colors.FAIL + ' Backend is DOWN :-(' + colors.END_C) sys.exit() @@ -40,11 +40,17 @@ def get_args(): parser.add_argument('-i', '--ip', required=True) parser.add_argument('-p', '--port', required=True) + parser.add_argument('--header') parser.add_argument('--https', action='store_true') + parser.add_argument('--tls_key') + parser.add_argument('--tls_cert') + parser.add_argument('--tls_key_pw') + parser.add_argument('--ca_cert') args = parser.parse_args() - return [args.ip, args.port, 'https' if args.https else 'http'] + init_properties(10, 10) + return [args.ip, args.port, args.header, 'https' if args.https else 'http', args.tls_key, args.tls_cert, args.tls_key_pw, args.ca_cert] def main():