aboutsummaryrefslogtreecommitdiffstats
path: root/miss_htbt_service
diff options
context:
space:
mode:
authorSatoshi Fujii <fujii-satoshi@jp.fujitsu.com>2021-06-15 13:01:54 +0000
committerSatoshi Fujii <fujii-satoshi@jp.fujitsu.com>2021-06-18 07:39:23 +0000
commit92b7f70deb207f618f65ccc00e135e6b31fd56f0 (patch)
treeba152eb62d12f84f607e423350b244bb083fbf7c /miss_htbt_service
parent6ebeaa909fb5c09f2ade3971c87d496b6a3a028a (diff)
Remove unused imports and bump version to 2.3.0
Remove unused import statements from script. Bumped up version to 2.3.0. Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com> Issue-ID: DCAEGEN2-2833 Change-Id: I015e89f1b56ca12483e432bf67123f33140d722c
Diffstat (limited to 'miss_htbt_service')
-rw-r--r--miss_htbt_service/cbs_polling.py13
-rw-r--r--miss_htbt_service/check_health.py7
-rw-r--r--miss_htbt_service/config_notif.py17
-rw-r--r--miss_htbt_service/db_monitoring.py12
-rw-r--r--miss_htbt_service/get_logger.py3
-rw-r--r--miss_htbt_service/htbtworker.py12
-rw-r--r--miss_htbt_service/misshtbtd.py9
-rw-r--r--miss_htbt_service/mod/trapd_vnf_table.py8
8 files changed, 36 insertions, 45 deletions
diff --git a/miss_htbt_service/cbs_polling.py b/miss_htbt_service/cbs_polling.py
index 1b9d00c..aa6ac8d 100644
--- a/miss_htbt_service/cbs_polling.py
+++ b/miss_htbt_service/cbs_polling.py
@@ -1,33 +1,32 @@
#!/usr/bin/env python3
+# ============LICENSE_START=======================================================
# Copyright 2018-2020 AT&T Intellectual Property, Inc. All rights reserved.
# Copyright (c) 2019 Pantheon.tech. All rights reserved.
# Copyright 2020 Deutsche Telekom. All rights reserved.
-#
+# Copyright 2021 Fujitsu Ltd.
+# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+# ============LICENSE_END=========================================================
#
# Author Prakash Hosangady(ph553f@att.com)
# CBS Polling
# Set the hb_common table with state="RECONFIGURATION" periodically
# to get the new configuration downloaded
-import requests
-import sched, datetime, time
-import string
import sys
import os
import socket
-import logging
-import htbtworker as pm
+import time
import misshtbtd as db
import get_logger
diff --git a/miss_htbt_service/check_health.py b/miss_htbt_service/check_health.py
index 03c390b..4266273 100644
--- a/miss_htbt_service/check_health.py
+++ b/miss_htbt_service/check_health.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
# ============LICENSE_START=======================================================
# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright 2021 Fujitsu Ltd.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,12 +16,10 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-from http.server import HTTPServer, BaseHTTPRequestHandler
+import json
+from http.server import BaseHTTPRequestHandler
from urllib import parse
-#from BaseHTTPServer import BaseHTTPRequestHandler
-#import urlparse
-import json
class GetHandler(BaseHTTPRequestHandler):
diff --git a/miss_htbt_service/config_notif.py b/miss_htbt_service/config_notif.py
index 284584a..913d8a5 100644
--- a/miss_htbt_service/config_notif.py
+++ b/miss_htbt_service/config_notif.py
@@ -1,39 +1,40 @@
#!/usr/bin/env python3
+# ============LICENSE_START=======================================================
# Copyright 2018-2020 AT&T Intellectual Property, Inc. 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.
-#
+# Copyright 2021 Fujitsu Ltd.
+# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+# ============LICENSE_END=========================================================
#
# Author Prakash Hosangady (ph553f)
# Read the hb_common table
# Update the state to RECONFIGURATION and save the hb_common table
import os
-import sched, datetime, time
-import string
-import sys
+import os.path as path
import socket
import yaml
import json
+import time
import psycopg2
-from pathlib import Path
-import os.path as path
-import mod.trapd_settings as tds
+
# use the fully qualified name here to let monkeypatching work
# from .mod.trapd_get_cbs_config import get_cbs_config
import mod.trapd_get_cbs_config
+import mod.trapd_settings as tds
hb_properties_file = path.abspath(path.join(__file__, "../config/hbproperties.yaml"))
diff --git a/miss_htbt_service/db_monitoring.py b/miss_htbt_service/db_monitoring.py
index 0c59772..df1bae7 100644
--- a/miss_htbt_service/db_monitoring.py
+++ b/miss_htbt_service/db_monitoring.py
@@ -1,33 +1,33 @@
#!/usr/bin/env python3
+# ============LICENSE_START=======================================================
# Copyright 2018-2020 AT&T Intellectual Property, Inc. All rights reserved.
# Copyright (c) 2019 Pantheon.tech. All rights reserved.
# Copyright 2020 Deutsche Telekom. All rights reserved.
-#
+# Copyright 2021 Fujitsu Ltd.
+# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+# ============LICENSE_END=========================================================
#
# Author Prakash Hosangady(ph553f)
# DB Monitoring
# Tracks Heartbeat messages on each of the VNFs stored in postgres DB
# and generates Missing Heartbeat signal for Policy Engine
-import math
-import sched, datetime, time
import json
-import string
import sys
import os
-import logging
import socket
+import time
import requests
import htbtworker as pm
import misshtbtd as db
diff --git a/miss_htbt_service/get_logger.py b/miss_htbt_service/get_logger.py
index 7d9d8d6..c94e333 100644
--- a/miss_htbt_service/get_logger.py
+++ b/miss_htbt_service/get_logger.py
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright 2021 Fujitsu Ltd.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-import os
-import logging
import logging.handlers
'''Configures the module root logger'''
diff --git a/miss_htbt_service/htbtworker.py b/miss_htbt_service/htbtworker.py
index 9472473..a2ffeca 100644
--- a/miss_htbt_service/htbtworker.py
+++ b/miss_htbt_service/htbtworker.py
@@ -1,19 +1,22 @@
#!/usr/bin/env python3
+# ============LICENSE_START=======================================================
# Copyright 2018-2020 AT&T Intellectual Property, Inc. All rights reserved.
# Copyright (c) 2019 Pantheon.tech. All rights reserved.
# Copyright 2020 Deutsche Telekom. All rights reserved.
-#
+# Copyright 2021 Fujitsu Ltd.
+# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+# ============LICENSE_END=========================================================
#
# Author Prakash Hosangady(ph553f@att.com)
# Simple Microservice
@@ -24,8 +27,9 @@ import psycopg2
import requests
import os
import os.path as path
-import json,sys,time
-import logging
+import json
+import sys
+import time
import misshtbtd as db
import get_logger
diff --git a/miss_htbt_service/misshtbtd.py b/miss_htbt_service/misshtbtd.py
index 1223308..868020c 100644
--- a/miss_htbt_service/misshtbtd.py
+++ b/miss_htbt_service/misshtbtd.py
@@ -4,6 +4,7 @@
# Copyright (c) 2019 Pantheon.tech. All rights reserved.
# Copyright 2020 Deutsche Telekom. All rights reserved.
# Copyright 2021 Samsung Electronics. All rights reserved.
+# Copyright 2021 Fujitsu Ltd.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -26,28 +27,22 @@
# - Download the CBS configuration and populate the DB
#
# Author Prakash Hosangady(ph553f@att.com)
+
import traceback
import os
import sys
import json
-import datetime
import time
-import math
import multiprocessing
-import logging
import subprocess
import yaml
import socket
import os.path as path
from pathlib import Path
-
import htbtworker as heartbeat
import get_logger
from mod import trapd_settings as tds
-from mod.trapd_runtime_pid import save_pid, rm_pid
from mod.trapd_get_cbs_config import get_cbs_config
-from mod.trapd_exit import cleanup_and_exit
-from mod.trapd_http_session import init_session_obj
hb_properties_file = path.abspath(path.join(__file__, "../config/hbproperties.yaml"))
diff --git a/miss_htbt_service/mod/trapd_vnf_table.py b/miss_htbt_service/mod/trapd_vnf_table.py
index b1691ba..001b566 100644
--- a/miss_htbt_service/mod/trapd_vnf_table.py
+++ b/miss_htbt_service/mod/trapd_vnf_table.py
@@ -5,6 +5,7 @@
# Copyright (c) 2019 Pantheon.tech. All rights reserved.
# Copyright 2020 Deutsche Telekom. All rights reserved.
# Copyright 2021 Samsung Electronics. All rights reserved.
+# Copyright 2021 Fujitsu Ltd.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -25,17 +26,11 @@
trapd_vnf_table verifies the successful creation of DB Tables.
"""
-
-import psycopg2
import os
-import sys
-import logging
import yaml
import os.path as path
-import json
import time
import subprocess
-from onap_dcae_cbs_docker_client.client import get_config
import get_logger
import db_monitoring as dbmon
@@ -44,7 +39,6 @@ import misshtbtd as db
import config_notif as cf
import cbs_polling as cbs
-
prog_name = os.path.basename(__file__)
hb_properties_file = path.abspath(path.join(__file__, "../../config/hbproperties.yaml"))
_logger = get_logger.get_logger(__name__)