diff options
| author |   vv770d <vv770d@att.com> | 2021-07-21 18:03:16 +0000 |
|---|---|---|
| committer | Vijay Venkatesh Kumar <vv770d@att.com> | 2021-07-21 19:57:47 +0000 |
| commit | c2c6ff8aa475ebeaf55681c3836ba41a62782d09 (patch) | |
| tree | 31080aebc0502f39ab456eb69f3e5d214ee5fc87 /miss_htbt_service | |
| parent | b3bbb06443128982f367c7bc169a319072ed066b (diff) | |
Switch to 2.2.1 CBS client lib2.3.1
Change-Id: Id4569bf141dc7c48e15eed5d624042e498dde4ea
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-2852
Signed-off-by: vv770d <vv770d@att.com>
Diffstat (limited to 'miss_htbt_service')
| -rw-r--r-- | miss_htbt_service/misshtbtd.py | 6 | ||||
| -rw-r--r-- | miss_htbt_service/mod/trapd_get_cbs_config.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/miss_htbt_service/misshtbtd.py b/miss_htbt_service/misshtbtd.py index 89ae05f..0ebffe7 100644 --- a/miss_htbt_service/misshtbtd.py +++ b/miss_htbt_service/misshtbtd.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # ============LICENSE_START======================================================= -# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. All rights reserved. # Copyright 2020 Deutsche Telekom. All rights reserved. # Copyright 2021 Samsung Electronics. All rights reserved. @@ -239,7 +239,7 @@ def read_hb_properties(jsfile): with open(jsfile, 'r') as outfile: cfg = json.load(outfile) except Exception as err: - msg = "CBS Json file load error - ", err + msg = "CBS Json file load error - " + str(err) _logger.error(msg) return read_hb_properties_default() @@ -259,7 +259,7 @@ def read_hb_properties(jsfile): if "SERVICE_NAME" in cfg: os.environ['SERVICE_NAME'] = str(cfg['SERVICE_NAME']) except Exception as err: - msg = "CBS Json file read parameter error - ", err + msg = "CBS Json file read parameter error - " + str(err) _logger.error(msg) return read_hb_properties_default() return ip_address, port_num, user_name, password, db_name, cbs_polling_required, cbs_polling_interval diff --git a/miss_htbt_service/mod/trapd_get_cbs_config.py b/miss_htbt_service/mod/trapd_get_cbs_config.py index 431f93b..70dac53 100644 --- a/miss_htbt_service/mod/trapd_get_cbs_config.py +++ b/miss_htbt_service/mod/trapd_get_cbs_config.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018-2021 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. All rights reserved. # Copyright 2020 Deutsche Telekom. All rights reserved. # Copyright 2021 Samsung Electronics. All rights reserved. @@ -61,12 +61,13 @@ def get_cbs_config(): try: msg = "Unable to fetch CBS config or it is erroneously empty - trying override/simulator config" tds.c_config = get_config() + stdout_logger("CBS client lib response : " + str(tds.c_config)) if tds.c_config == {}: stdout_logger(msg) # if no CBS present, default to JSON config specified via CBS_HTBT_JSON env var except Exception as e: - msg = "ONAP controller not present, trying json config override via CBS_HTBT_JSON env variable" + msg = "ONAP controller not present, trying json config override via CBS_HTBT_JSON env variableo, " + str(e) stdout_logger(msg) try: |