From e97a5ce265f7e1d3380fab9c4132e2b002e8636c Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Mon, 27 Jul 2020 10:02:19 +0000 Subject: Run in Python 3.8 Use image recommended by SECCOM Issue-ID: DCAEGEN2-2292 Signed-off-by: Michal Jagiello Change-Id: I8d77f150c9fe314bf26bac2c9fac7ebc9782c9d8 --- miss_htbt_service/mod/trapd_exit.py | 3 ++- miss_htbt_service/mod/trapd_get_cbs_config.py | 7 ++++--- miss_htbt_service/mod/trapd_io.py | 5 +++-- miss_htbt_service/mod/trapd_vnf_table.py | 13 +++++++------ 4 files changed, 16 insertions(+), 12 deletions(-) (limited to 'miss_htbt_service/mod') diff --git a/miss_htbt_service/mod/trapd_exit.py b/miss_htbt_service/mod/trapd_exit.py index b1bd68f..c741fe5 100644 --- a/miss_htbt_service/mod/trapd_exit.py +++ b/miss_htbt_service/mod/trapd_exit.py @@ -3,6 +3,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. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,7 +28,7 @@ __docformat__ = 'restructuredtext' import sys import os import string -from .trapd_runtime_pid import save_pid, rm_pid +from mod.trapd_runtime_pid import save_pid, 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/trapd_get_cbs_config.py index d0b8110..1fa3572 100644 --- a/miss_htbt_service/mod/trapd_get_cbs_config.py +++ b/miss_htbt_service/mod/trapd_get_cbs_config.py @@ -3,6 +3,7 @@ # ================================================================================ # Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. All rights reserved. +# Copyright 2020 Deutsche Telekom. 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. @@ -33,9 +34,9 @@ import time import traceback import collections from onap_dcae_cbs_docker_client.client import get_config -from . import trapd_settings as tds -from .trapd_exit import cleanup,cleanup_and_exit -from .trapd_io import stdout_logger +from mod import trapd_settings as tds +from mod.trapd_exit import cleanup,cleanup_and_exit +from mod.trapd_io import stdout_logger prog_name = os.path.basename(__file__) diff --git a/miss_htbt_service/mod/trapd_io.py b/miss_htbt_service/mod/trapd_io.py index 4f0904e..d60f060 100644 --- a/miss_htbt_service/mod/trapd_io.py +++ b/miss_htbt_service/mod/trapd_io.py @@ -3,6 +3,7 @@ # ================================================================================ # Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. All rights reserved. +# Copyright 2020 Deutsche Telekom. 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. @@ -36,8 +37,8 @@ import time import traceback import unicodedata # dcae_snmptrap -from . import trapd_settings as tds -from .trapd_exit import cleanup_and_exit +import mod.trapd_settings as tds +from mod.trapd_exit import cleanup_and_exit prog_name = os.path.basename(__file__) diff --git a/miss_htbt_service/mod/trapd_vnf_table.py b/miss_htbt_service/mod/trapd_vnf_table.py index eeb4dc6..6b883af 100644 --- a/miss_htbt_service/mod/trapd_vnf_table.py +++ b/miss_htbt_service/mod/trapd_vnf_table.py @@ -3,6 +3,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. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -35,12 +36,12 @@ import time import subprocess from onap_dcae_cbs_docker_client.client import get_config -from .. import get_logger -from .. import db_monitoring as dbmon -from .. import htbtworker as pm -from .. import misshtbtd as db -from .. import config_notif as cf -from .. import cbs_polling as cbs +import get_logger +import db_monitoring as dbmon +import htbtworker as pm +import misshtbtd as db +import config_notif as cf +import cbs_polling as cbs prog_name = os.path.basename(__file__) -- cgit 1.2.3-korg