Heartbeat code refactoring

code optimization & test improvement

Issue-ID: DCAEGEN2-2953
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Change-Id: I99229d966c13ad666ac994ab5a582aeeaa306639
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>

7 files changed, 23 insertions, 23 deletions

diff --git a/miss_htbt_service/mod/trapd_exit.py b/miss_htbt_service/mod/htbt_exit.py
index 7791b31..3779e15 100644
--- a/miss_htbt_service/mod/trapd_exit.py
+++ b/miss_htbt_service/mod/htbt_exit.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2017-2022 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2023 AT&T Intellectual Property. All rights reserved.
 # Copyright (c) 2019 Pantheon.tech. All rights reserved.
 # Copyright (c) 2020 Deutsche Telekom. All rights reserved.
 # ================================================================================
@@ -17,7 +17,7 @@
 # ============LICENSE_END=========================================================
 
 """
-trapc_exit_snmptrapd is responsible for removing any existing runtime PID
+htbt_exit is responsible for removing any existing runtime PID
 file, and exiting with the provided (param 1) exit code
 """
 
@@ -25,7 +25,7 @@ __docformat__ = "restructuredtext"
 
 import sys
 import os
-from mod.trapd_runtime_pid import rm_pid
+from mod.htbt_runtime_pid import rm_pid
 
 prog_name = os.path.basename(__file__)
 
diff --git a/miss_htbt_service/mod/trapd_get_cbs_config.py b/miss_htbt_service/mod/htbt_get_cbs_config.py
index 034b32b..613b46f 100644
--- a/miss_htbt_service/mod/trapd_get_cbs_config.py
+++ b/miss_htbt_service/mod/htbt_get_cbs_config.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2022 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2023 AT&T Intellectual Property. All rights reserved.
 # Copyright (c) 2019 Pantheon.tech. All rights reserved.
 # Copyright (c) 2020 Deutsche Telekom. All rights reserved.
 # Copyright (c) 2021 Samsung Electronics. All rights reserved.
@@ -28,15 +28,15 @@ __docformat__ = "restructuredtext"
 import json
 import os
 from onap_dcae_cbs_docker_client.client import get_config
-from mod import trapd_settings as tds
-from mod.trapd_exit import cleanup, cleanup_and_exit
-from mod.trapd_io import stdout_logger
+from mod import htbt_settings as tds
+from mod.htbt_exit import cleanup, cleanup_and_exit
+from mod.htbt_io import stdout_logger
 
 prog_name = os.path.basename(__file__)
 
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# function: trapd_get_config_sim
+# function: htbt_get_config_sim
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 
diff --git a/miss_htbt_service/mod/trapd_http_session.py b/miss_htbt_service/mod/htbt_http_session.py
index 17eb302..f0a409a 100644
--- a/miss_htbt_service/mod/trapd_http_session.py
+++ b/miss_htbt_service/mod/htbt_http_session.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2017-2022 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2023 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 # ============LICENSE_END=========================================================
 
 """
-trapd_http_session establishes an http session for future use in publishing
+htbt_http_session establishes an http session for future use in publishing
 messages to the dmaap cluster.
 """
 
diff --git a/miss_htbt_service/mod/trapd_io.py b/miss_htbt_service/mod/htbt_io.py
index 26445fc..3f16a7b 100644
--- a/miss_htbt_service/mod/trapd_io.py
+++ b/miss_htbt_service/mod/htbt_io.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================)
-# Copyright (c) 2018-2022 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2023 AT&T Intellectual Property. All rights reserved.
 # Copyright (c) 2019 Pantheon.tech. All rights reserved.
 # Copyright (c) 2020 Deutsche Telekom. All rights reserved.
 # ================================================================================
diff --git a/miss_htbt_service/mod/trapd_runtime_pid.py b/miss_htbt_service/mod/htbt_runtime_pid.py
index 823d29f..d086ed2 100644
--- a/miss_htbt_service/mod/trapd_runtime_pid.py
+++ b/miss_htbt_service/mod/htbt_runtime_pid.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2017-2022 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2023 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 # ============LICENSE_END=========================================================
 
 """
-trapd_runtime_pid maintains a 'PID file' (file that contains the
+htbt_runtime_pid maintains a 'PID file' (file that contains the
 PID of currently running trap receiver)
 """
 
diff --git a/miss_htbt_service/mod/trapd_settings.py b/miss_htbt_service/mod/htbt_settings.py
index 0f6a9a1..b5b58cc 100644
--- a/miss_htbt_service/mod/trapd_settings.py
+++ b/miss_htbt_service/mod/htbt_settings.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================)
-# Copyright (c) 2018-2022 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2023 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/miss_htbt_service/mod/trapd_vnf_table.py b/miss_htbt_service/mod/htbt_vnf_table.py
index f9fecbb..3396e80 100644
--- a/miss_htbt_service/mod/trapd_vnf_table.py
+++ b/miss_htbt_service/mod/htbt_vnf_table.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2017-2022 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2023 AT&T Intellectual Property. All rights reserved.
 # Copyright (c) 2019 Pantheon.tech. All rights reserved.
 # Copyright (c) 2020 Deutsche Telekom. All rights reserved.
 # Copyright (c) 2021 Samsung Electronics. All rights reserved.
@@ -21,7 +21,7 @@
 #  Author Kiran Mandal (km386e)
 
 """
-trapd_vnf_table verifies the successful creation of DB Tables.
+htbt_vnf_table verifies the successful creation of DB Tables.
 """
 import logging
 import os
@@ -57,9 +57,9 @@ def hb_properties():
 
 
 def verify_DB_creation_1(user_name, password, ip_address, port_num, db_name):
-    connection_db = pm.postgres_db_open(user_name, password, ip_address, port_num, db_name)
+    connection_db = pm.postgres_db_open()
     try:
-        _db_status = pm.db_table_creation_check(connection_db, "vnf_table_1")
+        _db_status = db.db_table_creation_check(connection_db, "vnf_table_1")
     except Exception:
         return None
 
@@ -68,20 +68,20 @@ def verify_DB_creation_1(user_name, password, ip_address, port_num, db_name):
 
 def verify_DB_creation_2(user_name, password, ip_address, port_num, db_name):
 
-    connection_db = pm.postgres_db_open(user_name, password, ip_address, port_num, db_name)
+    connection_db = pm.postgres_db_open()
     try:
-        _db_status = pm.db_table_creation_check(connection_db, "vnf_table_2")
+        _db_status = db.db_table_creation_check(connection_db, "vnf_table_2")
     except Exception:
         return None
 
     return _db_status
 
 
-def verify_DB_creation_hb_common(user_name, password, ip_address, port_num, db_name):
+def verify_DB_creation_hb_common():
 
-    connection_db = pm.postgres_db_open(user_name, password, ip_address, port_num, db_name)
+    connection_db = pm.postgres_db_open()
     try:
-        _db_status = pm.db_table_creation_check(connection_db, "hb_common")
+        _db_status = db.db_table_creation_check(connection_db, "hb_common")
     except Exception:
         return None