From 92b7f70deb207f618f65ccc00e135e6b31fd56f0 Mon Sep 17 00:00:00 2001 From: Satoshi Fujii Date: Tue, 15 Jun 2021 13:01:54 +0000 Subject: 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 Issue-ID: DCAEGEN2-2833 Change-Id: I015e89f1b56ca12483e432bf67123f33140d722c --- Changelog.md | 5 +++++ miss_htbt_service/cbs_polling.py | 13 ++++++------- miss_htbt_service/check_health.py | 7 +++---- miss_htbt_service/config_notif.py | 17 +++++++++-------- miss_htbt_service/db_monitoring.py | 12 ++++++------ miss_htbt_service/get_logger.py | 3 +-- miss_htbt_service/htbtworker.py | 12 ++++++++---- miss_htbt_service/misshtbtd.py | 9 ++------- miss_htbt_service/mod/trapd_vnf_table.py | 8 +------- pom.xml | 2 +- setup.py | 2 +- tests/test_binding.py | 15 +-------------- tests/test_config_notif.py | 4 ++-- tests/test_trapd_exit.py | 2 +- tests/test_trapd_get_cbs_config.py | 6 +----- tests/test_trapd_http_session.py | 3 +-- tests/test_trapd_runtime_pid.py | 4 +--- tests/test_trapd_settings.py | 2 +- tests/test_trapd_vnf_table.py | 7 +------ version.properties | 2 +- 20 files changed, 53 insertions(+), 82 deletions(-) diff --git a/Changelog.md b/Changelog.md index fa33c15..6d5c8ae 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [2.3.0.] - 18/06/2021 +### Changed +- Cleanup code + - Removed unused imports + ## [2.2.0.] - 07/04/2021 ### Changed - Switched to currently recommended version of docker integration-python:8.0.0. 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__) diff --git a/pom.xml b/pom.xml index 85ce88b..c8010be 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ limitations under the License. org.onap.dcaegen2.services heartbeat dcaegen2-services-heartbeat - 2.2.0 + 2.3.0 UTF-8 . diff --git a/setup.py b/setup.py index 4df5a29..7087b5b 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ from setuptools import setup, find_packages setup( name='miss_htbt_service', description='Missing heartbeat microservice to communicate with policy-engine', - version='2.2.0', + version='2.3.0', #packages=find_packages(exclude=["tests.*", "tests"]), packages=find_packages(), install_requires=[ diff --git a/tests/test_binding.py b/tests/test_binding.py index 25ab192..82e9f7f 100644 --- a/tests/test_binding.py +++ b/tests/test_binding.py @@ -2,6 +2,7 @@ # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. 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. @@ -16,24 +17,10 @@ # limitations under the License. # ============LICENSE_END========================================================= -import os -import io import requests import httpretty -import sys import subprocess -import pytest import json -import base64 -import errno -import time -from pip._internal import main as _main -from onap_dcae_cbs_docker_client.client import get_config -from miss_htbt_service import htbtworker -from miss_htbt_service import misshtbtd -from miss_htbt_service import db_monitoring -from miss_htbt_service.mod.trapd_vnf_table import hb_properties -import unittest MODULE_EXTENSIONS = ('.py', '.pyc', '.pyo') diff --git a/tests/test_config_notif.py b/tests/test_config_notif.py index 707717c..01ea737 100644 --- a/tests/test_config_notif.py +++ b/tests/test_config_notif.py @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2020 AT&T Intellectual Property. 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. @@ -16,13 +17,12 @@ # ============LICENSE_END========================================================= import config_notif -# from miss_htbt_service.mod.trapd_get_cbs_config import get_cbs_config import mod.trapd_get_cbs_config import mod.trapd_settings from . import monkey_psycopg2 import psycopg2 -import tempfile, sys, json, os +import tempfile, json, os def assert_default_values(ip_address, port_num, user_name, password, db_name, cbs_polling_required, cbs_polling_interval): """ diff --git a/tests/test_trapd_exit.py b/tests/test_trapd_exit.py index abb6bf4..93e8f9a 100644 --- a/tests/test_trapd_exit.py +++ b/tests/test_trapd_exit.py @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. 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. @@ -17,7 +18,6 @@ import pytest import unittest -import sys from miss_htbt_service.mod import trapd_exit pid_file="/tmp/test_pid_file" diff --git a/tests/test_trapd_get_cbs_config.py b/tests/test_trapd_get_cbs_config.py index 8691a89..ea859af 100644 --- a/tests/test_trapd_get_cbs_config.py +++ b/tests/test_trapd_get_cbs_config.py @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. 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. @@ -18,12 +19,7 @@ import pytest import unittest import os -import sys -from onap_dcae_cbs_docker_client.client import get_config -from miss_htbt_service.mod.trapd_exit import cleanup_and_exit -from miss_htbt_service.mod.trapd_io import stdout_logger -from miss_htbt_service.mod import trapd_settings as tds from miss_htbt_service.mod import trapd_get_cbs_config class test_get_cbs_config(unittest.TestCase): diff --git a/tests/test_trapd_http_session.py b/tests/test_trapd_http_session.py index 948dd5e..d36ced0 100644 --- a/tests/test_trapd_http_session.py +++ b/tests/test_trapd_http_session.py @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. 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,9 +16,7 @@ # limitations under the License. # ============LICENSE_END========================================================= -import pytest import unittest -import sys from miss_htbt_service.mod import trapd_http_session class test_init_session_obj(unittest.TestCase): diff --git a/tests/test_trapd_runtime_pid.py b/tests/test_trapd_runtime_pid.py index ecb063c..d03e246 100644 --- a/tests/test_trapd_runtime_pid.py +++ b/tests/test_trapd_runtime_pid.py @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. 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,11 +16,8 @@ # limitations under the License. # ============LICENSE_END========================================================= -import pytest import unittest -import sys from miss_htbt_service.mod import trapd_runtime_pid -from miss_htbt_service.mod import trapd_io class test_save_pid(unittest.TestCase): """ diff --git a/tests/test_trapd_settings.py b/tests/test_trapd_settings.py index 33fb0ab..5d6cd0d 100644 --- a/tests/test_trapd_settings.py +++ b/tests/test_trapd_settings.py @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. 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,7 +16,6 @@ # limitations under the License. # ============LICENSE_END========================================================= -import pytest import unittest from miss_htbt_service.mod import trapd_settings as tds diff --git a/tests/test_trapd_vnf_table.py b/tests/test_trapd_vnf_table.py index d0bf51c..3d1d34b 100644 --- a/tests/test_trapd_vnf_table.py +++ b/tests/test_trapd_vnf_table.py @@ -4,6 +4,7 @@ # Copyright (c) 2017-2020 AT&T Intellectual Property. 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. @@ -24,12 +25,6 @@ test_trapd_vnf_table contains test cases related to DB Tables and cbs polling. """ import unittest -import sys -import pytest -import logging -import misshtbtd as db -import htbtworker as pm -import db_monitoring as dbmon import get_logger from mod.trapd_vnf_table import ( verify_DB_creation_1, verify_DB_creation_2, verify_DB_creation_hb_common, diff --git a/version.properties b/version.properties index 3ad2137..8d40756 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=2 -minor=2 +minor=3 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} -- cgit 1.2.3-korg