run the black formatting tool on python code2.0.6

Change-Id: I41badbf7ea2b2cd243e9f2acd5c9f2d3ec907964
Issue-ID: DCAEGEN2-2995
Signed-off-by: Hansen, Tony (th1395) <th1395@att.com>

14 files changed, 235 insertions, 182 deletions

diff --git a/tests/__init__.py b/tests/__init__.py
index af0fbb2..1d97a6a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-# ================================================================================
-# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# ============LICENSE_START=======================================================
+# Copyright (c) 2018-2021 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.
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 
 # empty __init__.py so that pytest can add correct path to coverage report, -- per pytest
diff --git a/tests/snmp.setup.py b/tests/snmp.setup.py
index ed565f2..c5a533c 100644
--- a/tests/snmp.setup.py
+++ b/tests/snmp.setup.py
@@ -1,6 +1,5 @@
-# org.onap.dcae
-# ================================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# ============LICENSE_START=======================================================
+# Copyright (c) 2017-2021 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.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 import argparse
 import array
@@ -44,6 +41,7 @@ import uuid as uuid_mod
 from collections import Counter
 from onap_dcae_cbs_docker_client.client import get_config
 from pysnmp.carrier.asyncio.dgram import udp, udp6
+
 # from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import ntfrcv
@@ -60,14 +58,14 @@ install_reqs = parse_requirements("requirements.txt", session=PipSession())
 reqs = [str(ir.req) for ir in install_reqs]
 
 setup(
-    name = "dcaegen2-collectors-snmptrap",
-    description = "snmp trap receiver for ONAP docker image",
-    version = "1.4.0",
+    name="dcaegen2-collectors-snmptrap",
+    description="snmp trap receiver for ONAP docker image",
+    version="1.4.0",
     packages=find_packages(),
-    author = "Dave L",
-    author_email = "dl3158@att.com",
-    license='Apache 2',
-    keywords = "",
-    url = "",
-    install_requires=reqs
+    author="Dave L",
+    author_email="dl3158@att.com",
+    license="Apache 2",
+    keywords="",
+    url="",
+    install_requires=reqs,
 )
diff --git a/tests/test_snmptrapd.py b/tests/test_snmptrapd.py
index cdd19a4..dee2aa0 100644
--- a/tests/test_snmptrapd.py
+++ b/tests/test_snmptrapd.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2021 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.
@@ -31,19 +31,19 @@ import trapd_get_cbs_config
 from pysnmp.hlapi import *
 from pysnmp import debug
 
+
 class test_snmptrapd(unittest.TestCase):
     """
     Test the save_pid mod
     """
 
-    pytest_json_data = "{ \"snmptrapd\": { \"version\": \"2.0.3\", \"title\": \"ONAP SNMP Trap Receiver\" }, \"protocols\": { \"transport\": \"udp\", \"ipv4_interface\": \"0.0.0.0\", \"ipv4_port\": 6162, \"ipv6_interface\": \"::1\", \"ipv6_port\": 6162 }, \"cache\": { \"dns_cache_ttl_seconds\": 60 }, \"publisher\": { \"http_timeout_milliseconds\": 1500, \"http_retries\": 3, \"http_milliseconds_between_retries\": 750, \"http_primary_publisher\": \"true\", \"http_peer_publisher\": \"unavailable\", \"max_traps_between_publishes\": 10, \"max_milliseconds_between_publishes\": 10000 }, \"streams_publishes\": { \"sec_fault_unsecure\": { \"type\": \"message_router\", \"aaf_password\": null, \"dmaap_info\": { \"location\": \"mtl5\", \"client_id\": null, \"client_role\": null, \"topic_url\": \"http://uebsb91kcdc.it.att.com:3904/events/ONAP-COLLECTOR-SNMPTRAP\" }, \"aaf_username\": null } }, \"files\": { \"runtime_base_dir\": \"/tmp/opt/app/snmptrap\", \"log_dir\": \"logs\", \"data_dir\": \"data\", \"pid_dir\": \"tmp\", \"arriving_traps_log\": \"snmptrapd_arriving_traps.log\", \"snmptrapd_diag\": \"snmptrapd_prog_diag.log\", \"traps_stats_log\": \"snmptrapd_stats.csv\", \"perm_status_file\": \"snmptrapd_status.log\", \"eelf_base_dir\": \"/tmp/opt/app/snmptrap/logs\", \"eelf_error\": \"error.log\", \"eelf_debug\": \"debug.log\", \"eelf_audit\": \"audit.log\", \"eelf_metrics\": \"metrics.log\", \"roll_frequency\": \"day\", \"minimum_severity_to_log\": 2 }, \"trap_config\": { \"sw_interval_in_seconds\": 60, \"notify_oids\": { \".1.3.6.1.4.1.9.0.1\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.2\": { \"sw_high_water_in_interval\": 101, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.3\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.4\": { \"sw_high_water_in_interval\": 10, \"sw_low_water_in_interval\": 3, \"category\": \"logonly\" } } }, \"snmpv3_config\": { \"usm_users\": [ { \"user\": \"usr-sha-aes256\", \"engineId\": \"8000000001020304\", \"usmHMACSHAAuth\": \"authkey1\", \"usmAesCfb256\": \"privkey1\" }, { \"user\": \"user1\", \"engineId\": \"8000000000000001\", \"usmHMACMD5Auth\": \"authkey1\", \"usmDESPriv\": \"privkey1\" }, { \"user\": \"user2\", \"engineId\": \"8000000000000002\", \"usmHMACSHAAuth\": \"authkey2\", \"usmAesCfb128\": \"privkey2\" }, { \"user\": \"user3\", \"engineId\": \"8000000000000003\", \"usmHMACSHAAuth\": \"authkey3\", \"usmAesCfb256\": \"privkey3\" } ] } }"
+    pytest_json_data = '{ "snmptrapd": { "version": "2.0.3", "title": "ONAP SNMP Trap Receiver" }, "protocols": { "transport": "udp", "ipv4_interface": "0.0.0.0", "ipv4_port": 6162, "ipv6_interface": "::1", "ipv6_port": 6162 }, "cache": { "dns_cache_ttl_seconds": 60 }, "publisher": { "http_timeout_milliseconds": 1500, "http_retries": 3, "http_milliseconds_between_retries": 750, "http_primary_publisher": "true", "http_peer_publisher": "unavailable", "max_traps_between_publishes": 10, "max_milliseconds_between_publishes": 10000 }, "streams_publishes": { "sec_fault_unsecure": { "type": "message_router", "aaf_password": null, "dmaap_info": { "location": "mtl5", "client_id": null, "client_role": null, "topic_url": "http://uebsb91kcdc.it.att.com:3904/events/ONAP-COLLECTOR-SNMPTRAP" }, "aaf_username": null } }, "files": { "runtime_base_dir": "/tmp/opt/app/snmptrap", "log_dir": "logs", "data_dir": "data", "pid_dir": "tmp", "arriving_traps_log": "snmptrapd_arriving_traps.log", "snmptrapd_diag": "snmptrapd_prog_diag.log", "traps_stats_log": "snmptrapd_stats.csv", "perm_status_file": "snmptrapd_status.log", "eelf_base_dir": "/tmp/opt/app/snmptrap/logs", "eelf_error": "error.log", "eelf_debug": "debug.log", "eelf_audit": "audit.log", "eelf_metrics": "metrics.log", "roll_frequency": "day", "minimum_severity_to_log": 2 }, "trap_config": { "sw_interval_in_seconds": 60, "notify_oids": { ".1.3.6.1.4.1.9.0.1": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.2": { "sw_high_water_in_interval": 101, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.3": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.4": { "sw_high_water_in_interval": 10, "sw_low_water_in_interval": 3, "category": "logonly" } } }, "snmpv3_config": { "usm_users": [ { "user": "usr-sha-aes256", "engineId": "8000000001020304", "usmHMACSHAAuth": "authkey1", "usmAesCfb256": "privkey1" }, { "user": "user1", "engineId": "8000000000000001", "usmHMACMD5Auth": "authkey1", "usmDESPriv": "privkey1" }, { "user": "user2", "engineId": "8000000000000002", "usmHMACSHAAuth": "authkey2", "usmAesCfb128": "privkey2" }, { "user": "user3", "engineId": "8000000000000003", "usmHMACSHAAuth": "authkey3", "usmAesCfb256": "privkey3" } ] } }'
 
     # create copy of snmptrapd.json for pytest
     pytest_json_config = "/tmp/opt/app/snmptrap/etc/snmptrapd.json"
-    with open(pytest_json_config, 'w') as outfile:
+    with open(pytest_json_config, "w") as outfile:
         outfile.write(pytest_json_data)
 
- 
     def test_usage_err(self):
         """
         Test usage error
@@ -54,7 +54,6 @@ class test_snmptrapd(unittest.TestCase):
             assert pytest_wrapped_sys_exit.type == SystemExit
             assert pytest_wrapped_sys_exit.value.code == 1
 
- 
     def test_load_all_configs(self):
         """
         Test load of all configs
@@ -65,7 +64,7 @@ class test_snmptrapd(unittest.TestCase):
         sw.sw_init()
 
         # request load of CBS data
-        os.environ.update(CBS_SIM_JSON='/tmp/opt/app/snmptrap/etc/snmptrapd.json')
+        os.environ.update(CBS_SIM_JSON="/tmp/opt/app/snmptrap/etc/snmptrapd.json")
         result = trapd_get_cbs_config.get_cbs_config()
         self.assertEqual(result, True)
 
@@ -82,7 +81,7 @@ class test_snmptrapd(unittest.TestCase):
         tds.init()
 
         # request load of CBS data
-        os.environ.update(CBS_SIM_JSON='/tmp/opt/app/snmptrap/etc/snmptrapd.json')
+        os.environ.update(CBS_SIM_JSON="/tmp/opt/app/snmptrap/etc/snmptrapd.json")
         result = trapd_get_cbs_config.get_cbs_config()
         self.assertEqual(result, True)
 
@@ -99,29 +98,54 @@ class test_snmptrapd(unittest.TestCase):
         tds.init()
 
         # request load of CBS data
-        os.environ.update(CBS_SIM_JSON='/tmp/opt/app/snmptrap/etc/snmptrapd.json')
+        os.environ.update(CBS_SIM_JSON="/tmp/opt/app/snmptrap/etc/snmptrapd.json")
         result = trapd_get_cbs_config.get_cbs_config()
 
         # set last day to current
         tds.last_day = datetime.datetime.now().day
 
         # trap dict for logging
-        tds.trap_dict = {'uuid': '06f6e91c-3236-11e8-9953-005056865aac', 'agent address': '1.2.3.4', 'agent name': 'test-agent.nodomain.com', 'cambria.partition': 'test-agent.nodomain.com', 'community': '', 'community len': 0, 'epoch_serno': 15222068260000, 'protocol version': 'v2c', 'time received': 1522206826.2938566, 'trap category': 'ONAP-COLLECTOR-SNMPTRAP', 'sysUptime': '218567736', 'notify OID': '1.3.6.1.4.1.9999.9.9.999', 'notify OID len': 10}
+        tds.trap_dict = {
+            "uuid": "06f6e91c-3236-11e8-9953-005056865aac",
+            "agent address": "1.2.3.4",
+            "agent name": "test-agent.nodomain.com",
+            "cambria.partition": "test-agent.nodomain.com",
+            "community": "",
+            "community len": 0,
+            "epoch_serno": 15222068260000,
+            "protocol version": "v2c",
+            "time received": 1522206826.2938566,
+            "trap category": "ONAP-COLLECTOR-SNMPTRAP",
+            "sysUptime": "218567736",
+            "notify OID": "1.3.6.1.4.1.9999.9.9.999",
+            "notify OID len": 10,
+        }
 
         # open eelf logs
         trapd_io.open_eelf_logs()
 
         # open trap logs
-        tds.arriving_traps_filename = tds.c_config['files']['runtime_base_dir'] + "/" + \
-            tds.c_config['files']['log_dir'] + "/" + \
-            (tds.c_config['files']['arriving_traps_log'])
+        tds.arriving_traps_filename = (
+            tds.c_config["files"]["runtime_base_dir"]
+            + "/"
+            + tds.c_config["files"]["log_dir"]
+            + "/"
+            + (tds.c_config["files"]["arriving_traps_log"])
+        )
         tds.arriving_traps_fd = trapd_io.open_file(tds.arriving_traps_filename)
 
         # name and open json trap log
-        tds.json_traps_filename = tds.c_config['files']['runtime_base_dir'] + "/" + tds.c_config['files']['log_dir'] + "/" + "DMAAP_" + (
-            tds.c_config['streams_publishes']['sec_fault_unsecure']['dmaap_info']['topic_url'].split('/')[-1]) + ".json"
+        tds.json_traps_filename = (
+            tds.c_config["files"]["runtime_base_dir"]
+            + "/"
+            + tds.c_config["files"]["log_dir"]
+            + "/"
+            + "DMAAP_"
+            + (tds.c_config["streams_publishes"]["sec_fault_unsecure"]["dmaap_info"]["topic_url"].split("/")[-1])
+            + ".json"
+        )
         tds.json_traps_fd = trapd_io.open_file(tds.json_traps_filename)
-        msg = ("published traps logged to: %s" % tds.json_traps_filename)
+        msg = "published traps logged to: %s" % tds.json_traps_filename
         trapd_io.stdout_logger(msg)
         trapd_io.ecomp_logger(tds.LOG_TYPE_DEBUG, tds.SEV_INFO, tds.CODE_GENERAL, msg)
 
@@ -139,7 +163,7 @@ class test_snmptrapd(unittest.TestCase):
         tds.init()
 
         # request load of CBS data
-        os.environ.update(CBS_SIM_JSON='/tmp/opt/app/snmptrap/etc/snmptrapd.json')
+        os.environ.update(CBS_SIM_JSON="/tmp/opt/app/snmptrap/etc/snmptrapd.json")
         trapd_get_cbs_config.get_cbs_config()
 
         # open eelf logs
@@ -154,20 +178,26 @@ class test_snmptrapd(unittest.TestCase):
         tds.init()
 
         # request load of CBS data
-        os.environ.update(CBS_SIM_JSON='/tmp/opt/app/snmptrap/etc/snmptrapd.json')
+        os.environ.update(CBS_SIM_JSON="/tmp/opt/app/snmptrap/etc/snmptrapd.json")
         trapd_get_cbs_config.get_cbs_config()
 
-        errorIndication, errorStatus, errorIndex, varbinds = next(sendNotification(SnmpEngine(),
-             CommunityData('not_public'),
-             UdpTransportTarget(('localhost', 6162)),
-             ContextData(),
-             'trap',
-             [ObjectType(ObjectIdentity('.1.3.6.1.4.1.999.1'), OctetString('test trap - ignore')),
-              ObjectType(ObjectIdentity('.1.3.6.1.4.1.999.2'), OctetString('ONAP pytest trap'))])
+        errorIndication, errorStatus, errorIndex, varbinds = next(
+            sendNotification(
+                SnmpEngine(),
+                CommunityData("not_public"),
+                UdpTransportTarget(("localhost", 6162)),
+                ContextData(),
+                "trap",
+                [
+                    ObjectType(ObjectIdentity(".1.3.6.1.4.1.999.1"), OctetString("test trap - ignore")),
+                    ObjectType(ObjectIdentity(".1.3.6.1.4.1.999.2"), OctetString("ONAP pytest trap")),
+                ],
+            )
         )
 
         result = errorIndication
         self.assertEqual(result, None)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_snmptrapd_send_test_trap.py b/tests/test_snmptrapd_send_test_trap.py
index 0e23def..8158629 100755
--- a/tests/test_snmptrapd_send_test_trap.py
+++ b/tests/test_snmptrapd_send_test_trap.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2021 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.
@@ -21,32 +21,37 @@ from pysnmp import debug
 
 iters = range(0, 10, 1)
 for i in iters:
-    errorIndication, errorStatus, errorIndex, varbinds = next(sendNotification(SnmpEngine(),
-         CommunityData('not_public'),
-         UdpTransportTarget(('localhost', 6164)),
-         ContextData(),
-         'trap',
-         [ObjectType(ObjectIdentity('.1.3.6.1.4.1.999.1'), OctetString('test trap - ignore')),
-          ObjectType(ObjectIdentity('.1.3.6.1.4.1.999.2'), OctetString('ONAP pytest trap'))])
+    errorIndication, errorStatus, errorIndex, varbinds = next(
+        sendNotification(
+            SnmpEngine(),
+            CommunityData("not_public"),
+            UdpTransportTarget(("localhost", 6164)),
+            ContextData(),
+            "trap",
+            [
+                ObjectType(ObjectIdentity(".1.3.6.1.4.1.999.1"), OctetString("test trap - ignore")),
+                ObjectType(ObjectIdentity(".1.3.6.1.4.1.999.2"), OctetString("ONAP pytest trap")),
+            ],
+        )
     )
-    
+
     if errorIndication:
         print(errorIndication)
     else:
         print("successfully sent first trap example, number %d" % i)
 
 for i in iters:
-    errorIndication, errorStatus, errorIndex, varbinds = next(sendNotification(SnmpEngine(),
-         CommunityData('public'),
-         UdpTransportTarget(('localhost', 6164)),
-         ContextData(),
-         'trap',
-            NotificationType(
-                ObjectIdentity('.1.3.6.1.4.1.74.2.46.12.1.1')
-            ).addVarBinds(
-                ('.1.3.6.1.4.1.999.1', OctetString('ONAP pytest trap - ignore (varbind 1)')),
-                ('.1.3.6.1.4.1.999.2', OctetString('ONAP pytest trap - ignore (varbind 2)'))
-            )
+    errorIndication, errorStatus, errorIndex, varbinds = next(
+        sendNotification(
+            SnmpEngine(),
+            CommunityData("public"),
+            UdpTransportTarget(("localhost", 6164)),
+            ContextData(),
+            "trap",
+            NotificationType(ObjectIdentity(".1.3.6.1.4.1.74.2.46.12.1.1")).addVarBinds(
+                (".1.3.6.1.4.1.999.1", OctetString("ONAP pytest trap - ignore (varbind 1)")),
+                (".1.3.6.1.4.1.999.2", OctetString("ONAP pytest trap - ignore (varbind 2)")),
+            ),
         )
     )
 
diff --git a/tests/test_trapd_exit.py b/tests/test_trapd_exit.py
index 3bbc386..0e38461 100644
--- a/tests/test_trapd_exit.py
+++ b/tests/test_trapd_exit.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2021 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.
@@ -18,36 +18,38 @@ import pytest
 import unittest
 import trapd_exit
 
-pid_file="/tmp/test_pid_file"
-pid_file_dne="/tmp/test_pid_file_NOT"
- 
+pid_file = "/tmp/test_pid_file"
+pid_file_dne = "/tmp/test_pid_file_NOT"
+
+
 class test_cleanup_and_exit(unittest.TestCase):
     """
     Test the cleanup_and_exit mod
     """
- 
+
     def test_normal_exit(self):
         """
         Test normal exit works as expected
         """
-        open(pid_file, 'w')
-    
+        open(pid_file, "w")
+
         with pytest.raises(SystemExit) as pytest_wrapped_sys_exit:
-            result = trapd_exit.cleanup_and_exit(0,pid_file)
+            result = trapd_exit.cleanup_and_exit(0, pid_file)
             assert pytest_wrapped_sys_exit.type == SystemExit
             assert pytest_wrapped_sys_exit.value.code == 0
 
         # compare = str(result).startswith("SystemExit: 0")
         # self.assertEqual(compare, True)
- 
+
     def test_abnormal_exit(self):
         """
         Test exit with missing PID file exits non-zero
         """
         with pytest.raises(SystemExit) as pytest_wrapped_sys_exit:
-            result = trapd_exit.cleanup_and_exit(0,pid_file_dne)
+            result = trapd_exit.cleanup_and_exit(0, pid_file_dne)
             assert pytest_wrapped_sys_exit.type == SystemExit
             assert pytest_wrapped_sys_exit.value.code == 1
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_trapd_get_cbs_config.py b/tests/test_trapd_get_cbs_config.py
index 67bccfc..b7c5d7b 100644
--- a/tests/test_trapd_get_cbs_config.py
+++ b/tests/test_trapd_get_cbs_config.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 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.
@@ -41,16 +41,16 @@ except Exception as e:
 
 # env var for CBS_SIM_JSON
 try:
-    os.environ['CBS_SIM_JSON'] = "/tmp/opt/app/snmptrap/etc/snmptrapd.json"
+    os.environ["CBS_SIM_JSON"] = "/tmp/opt/app/snmptrap/etc/snmptrapd.json"
 except Exception as e:
     print("Error while running %s : %s" % (os.path.basename(__file__), str(e.strerror)))
     sys.exit(1)
 
-pytest_json_data = "{ \"snmptrapd\": { \"version\": \"1.4.0\", \"title\": \"ONAP SNMP Trap Receiver\" }, \"protocols\": { \"transport\": \"udp\", \"ipv4_interface\": \"0.0.0.0\", \"ipv4_port\": 6162, \"ipv6_interface\": \"::1\", \"ipv6_port\": 6162 }, \"cache\": { \"dns_cache_ttl_seconds\": 60 }, \"publisher\": { \"http_timeout_milliseconds\": 1500, \"http_retries\": 3, \"http_milliseconds_between_retries\": 750, \"http_primary_publisher\": \"true\", \"http_peer_publisher\": \"unavailable\", \"max_traps_between_publishes\": 10, \"max_milliseconds_between_publishes\": 10000 }, \"streams_publishes\": { \"sec_fault_unsecure\": { \"type\": \"message_router\", \"aaf_password\": null, \"dmaap_info\": { \"location\": \"mtl5\", \"client_id\": null, \"client_role\": null, \"topic_url\": \"http://localhost:3904/events/ONAP-COLLECTOR-SNMPTRAP\" }, \"aaf_username\": null } }, \"files\": { \"runtime_base_dir\": \"/tmp/opt/app/snmptrap\", \"log_dir\": \"logs\", \"data_dir\": \"data\", \"pid_dir\": \"tmp\", \"arriving_traps_log\": \"snmptrapd_arriving_traps.log\", \"snmptrapd_diag\": \"snmptrapd_prog_diag.log\", \"traps_stats_log\": \"snmptrapd_stats.csv\", \"perm_status_file\": \"snmptrapd_status.log\", \"eelf_base_dir\": \"/tmp/opt/app/snmptrap/logs\", \"eelf_error\": \"error.log\", \"eelf_debug\": \"debug.log\", \"eelf_audit\": \"audit.log\", \"eelf_metrics\": \"metrics.log\", \"roll_frequency\": \"day\", \"minimum_severity_to_log\": 2 }, \"trap_config\": { \"sw_interval_in_seconds\": 60, \"notify_oids\": { \".1.3.6.1.4.1.9.0.1\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.2\": { \"sw_high_water_in_interval\": 101, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.3\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.4\": { \"sw_high_water_in_interval\": 10, \"sw_low_water_in_interval\": 3, \"category\": \"logonly\" } } }, \"snmpv3_config\": { \"usm_users\": [ { \"user\": \"usr-sha-aes256\", \"engineId\": \"8000000001020304\", \"usmHMACSHAAuth\": \"authkey1\", \"usmAesCfb256\": \"privkey1\" }, { \"user\": \"user1\", \"engineId\": \"8000000000000001\", \"usmHMACMD5Auth\": \"authkey1\", \"usmDESPriv\": \"privkey1\" }, { \"user\": \"user2\", \"engineId\": \"8000000000000002\", \"usmHMACSHAAuth\": \"authkey2\", \"usmAesCfb128\": \"privkey2\" }, { \"user\": \"user3\", \"engineId\": \"8000000000000003\", \"usmHMACSHAAuth\": \"authkey3\", \"usmAesCfb256\": \"privkey3\" } ] } }"
+pytest_json_data = '{ "snmptrapd": { "version": "1.4.0", "title": "ONAP SNMP Trap Receiver" }, "protocols": { "transport": "udp", "ipv4_interface": "0.0.0.0", "ipv4_port": 6162, "ipv6_interface": "::1", "ipv6_port": 6162 }, "cache": { "dns_cache_ttl_seconds": 60 }, "publisher": { "http_timeout_milliseconds": 1500, "http_retries": 3, "http_milliseconds_between_retries": 750, "http_primary_publisher": "true", "http_peer_publisher": "unavailable", "max_traps_between_publishes": 10, "max_milliseconds_between_publishes": 10000 }, "streams_publishes": { "sec_fault_unsecure": { "type": "message_router", "aaf_password": null, "dmaap_info": { "location": "mtl5", "client_id": null, "client_role": null, "topic_url": "http://localhost:3904/events/ONAP-COLLECTOR-SNMPTRAP" }, "aaf_username": null } }, "files": { "runtime_base_dir": "/tmp/opt/app/snmptrap", "log_dir": "logs", "data_dir": "data", "pid_dir": "tmp", "arriving_traps_log": "snmptrapd_arriving_traps.log", "snmptrapd_diag": "snmptrapd_prog_diag.log", "traps_stats_log": "snmptrapd_stats.csv", "perm_status_file": "snmptrapd_status.log", "eelf_base_dir": "/tmp/opt/app/snmptrap/logs", "eelf_error": "error.log", "eelf_debug": "debug.log", "eelf_audit": "audit.log", "eelf_metrics": "metrics.log", "roll_frequency": "day", "minimum_severity_to_log": 2 }, "trap_config": { "sw_interval_in_seconds": 60, "notify_oids": { ".1.3.6.1.4.1.9.0.1": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.2": { "sw_high_water_in_interval": 101, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.3": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.4": { "sw_high_water_in_interval": 10, "sw_low_water_in_interval": 3, "category": "logonly" } } }, "snmpv3_config": { "usm_users": [ { "user": "usr-sha-aes256", "engineId": "8000000001020304", "usmHMACSHAAuth": "authkey1", "usmAesCfb256": "privkey1" }, { "user": "user1", "engineId": "8000000000000001", "usmHMACMD5Auth": "authkey1", "usmDESPriv": "privkey1" }, { "user": "user2", "engineId": "8000000000000002", "usmHMACSHAAuth": "authkey2", "usmAesCfb128": "privkey2" }, { "user": "user3", "engineId": "8000000000000003", "usmHMACSHAAuth": "authkey3", "usmAesCfb256": "privkey3" } ] } }'
 
 # create snmptrapd.json for pytest
-pytest_json_config = os.getenv('CBS_SIM_JSON')
-with open(pytest_json_config, 'w') as outfile:
+pytest_json_config = os.getenv("CBS_SIM_JSON")
+with open(pytest_json_config, "w") as outfile:
     outfile.write(pytest_json_data)
 outfile.close()
 
@@ -65,7 +65,7 @@ class test_get_cbs_config(unittest.TestCase):
         Test that CBS fallback env variable exists and we can get config
         from fallback env var
         """
-        os.environ.update(CBS_SIM_JSON='/tmp/opt/app/snmptrap/etc/snmptrapd.json')
+        os.environ.update(CBS_SIM_JSON="/tmp/opt/app/snmptrap/etc/snmptrapd.json")
         result = trapd_get_cbs_config.get_cbs_config()
         print("result: %s" % result)
         # compare = str(result).startswith("{'snmptrap': ")
@@ -73,9 +73,8 @@ class test_get_cbs_config(unittest.TestCase):
         self.assertEqual(result, True)
 
     def test_cbs_override_env_invalid(self):
-        """
-        """
-        os.environ.update(CBS_SIM_JSON='/tmp/opt/app/snmptrap/etc/nosuchfile.json')
+        """ """
+        os.environ.update(CBS_SIM_JSON="/tmp/opt/app/snmptrap/etc/nosuchfile.json")
         # result = trapd_get_cbs_config.get_cbs_config()
         # print("result: %s" % result)
         # compare = str(result).startswith("{'snmptrap': ")
@@ -85,14 +84,14 @@ class test_get_cbs_config(unittest.TestCase):
             result = trapd_get_cbs_config.get_cbs_config()
             assert pytest_wrapped_sys_exit.type == SystemExit
             # assert pytest_wrapped_sys_exit.value.code == 1
- 
+
     def test_cbs_env_present(self):
         """
         Test that CONSUL_HOST env variable exists but fails to
         respond
         """
-        os.environ.update(CONSUL_HOST='localhost')
-        del os.environ['CBS_SIM_JSON']
+        os.environ.update(CONSUL_HOST="localhost")
+        del os.environ["CBS_SIM_JSON"]
         # result = trapd_get_cbs_config.get_cbs_config()
         # print("result: %s" % result)
         # compare = str(result).startswith("{'snmptrap': ")
@@ -100,16 +99,16 @@ class test_get_cbs_config(unittest.TestCase):
 
         with pytest.raises(SystemExit) as sys_exit:
             trapd_get_cbs_config.get_cbs_config()
-            assert sys_exit.value.errno == errno.ECONNREFUSED 
- 
+            assert sys_exit.value.errno == errno.ECONNREFUSED
+
     def test_cbs_override_env_undefined(self):
-        """
-        """
+        """ """
         print("------>>>  RUNNING test_no_cbs_override_env_var:")
-        del os.environ['CBS_SIM_JSON']
-    
+        del os.environ["CBS_SIM_JSON"]
+
         with pytest.raises(SystemExit) as pytest_wrapped_sys_exit:
             assert trapd_get_cbs_config.get_cbs_config() == SystemExit
- 
-if __name__ == '__main__':
+
+
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_trapd_http_session.py b/tests/test_trapd_http_session.py
index 478b29d..7ec89a6 100644
--- a/tests/test_trapd_http_session.py
+++ b/tests/test_trapd_http_session.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 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.
@@ -17,20 +17,21 @@
 import pytest
 import unittest
 import trapd_http_session
- 
+
+
 class test_init_session_obj(unittest.TestCase):
     """
     Test the init_session_obj mod
     """
- 
+
     def close_nonexisting_session(self):
         """
         test close of existing http session
         """
-        sess="no session"
+        sess = "no session"
         result = trapd_http_session.close_session_obj(sess)
         self.assertEqual(result, True)
- 
+
     def init_session(self):
         """
         test creation of http session
@@ -38,7 +39,7 @@ class test_init_session_obj(unittest.TestCase):
         result = trapd_http_session.init_session_obj()
         compare = str(result).startswith("<requests.sessions.Session object at")
         self.assertEqual(compare, True)
- 
+
     def test_reset(self):
         """
         test reset of existing http session
@@ -47,7 +48,7 @@ class test_init_session_obj(unittest.TestCase):
         result = trapd_http_session.reset_session_obj(sess)
         compare = str(result).startswith("<requests.sessions.Session object at")
         self.assertEqual(compare, True)
- 
+
     def close_existing_session(self):
         """
         test close of existing http session
@@ -55,6 +56,7 @@ class test_init_session_obj(unittest.TestCase):
         sess = trapd_http_session.init_session_obj()
         result = trapd_http_session.close_session_obj(sess)
         self.assertEqual(result, True)
- 
-if __name__ == '__main__':
+
+
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_trapd_io.py b/tests/test_trapd_io.py
index 3e32493..c1702aa 100644
--- a/tests/test_trapd_io.py
+++ b/tests/test_trapd_io.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 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.
@@ -31,8 +31,10 @@ class test_trapd_io(unittest.TestCase):
     """
     Test the save_pid mod
     """
-    tds.c_config = json.loads("{ \"snmptrapd\": { \"version\": \"1.4.0\", \"title\": \"ONAP SNMP Trap Receiver\" }, \"protocols\": { \"transport\": \"udp\", \"ipv4_interface\": \"0.0.0.0\", \"ipv4_port\": 6162, \"ipv6_interface\": \"::1\", \"ipv6_port\": 6162 }, \"cache\": { \"dns_cache_ttl_seconds\": 60 }, \"publisher\": { \"http_timeout_milliseconds\": 1500, \"http_retries\": 3, \"http_milliseconds_between_retries\": 750, \"http_primary_publisher\": \"true\", \"http_peer_publisher\": \"unavailable\", \"max_traps_between_publishes\": 10, \"max_milliseconds_between_publishes\": 10000 }, \"streams_publishes\": { \"sec_fault_unsecure\": { \"type\": \"message_router\", \"aaf_password\": null, \"dmaap_info\": { \"location\": \"mtl5\", \"client_id\": null, \"client_role\": null, \"topic_url\": \"http://localhost:3904/events/ONAP-COLLECTOR-SNMPTRAP\" }, \"aaf_username\": null } }, \"files\": { \"runtime_base_dir\": \"/tmp/opt/app/snmptrap\", \"log_dir\": \"logs\", \"data_dir\": \"data\", \"pid_dir\": \"tmp\", \"arriving_traps_log\": \"snmptrapd_arriving_traps.log\", \"snmptrapd_diag\": \"snmptrapd_prog_diag.log\", \"traps_stats_log\": \"snmptrapd_stats.csv\", \"perm_status_file\": \"snmptrapd_status.log\", \"eelf_base_dir\": \"/tmp/opt/app/snmptrap/logs\", \"eelf_error\": \"error.log\", \"eelf_debug\": \"debug.log\", \"eelf_audit\": \"audit.log\", \"eelf_metrics\": \"metrics.log\", \"roll_frequency\": \"day\", \"minimum_severity_to_log\": 2 }, \"trap_config\": { \"sw_interval_in_seconds\": 60, \"notify_oids\": { \".1.3.6.1.4.1.9.0.1\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.2\": { \"sw_high_water_in_interval\": 101, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.3\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.4\": { \"sw_high_water_in_interval\": 10, \"sw_low_water_in_interval\": 3, \"category\": \"logonly\" } } }, \"snmpv3_config\": { \"usm_users\": [ { \"user\": \"usr-sha-aes256\", \"engineId\": \"8000000001020304\", \"usmHMACSHAAuth\": \"authkey1\", \"usmAesCfb256\": \"privkey1\" }, { \"user\": \"user1\", \"engineId\": \"8000000000000001\", \"usmHMACMD5Auth\": \"authkey1\", \"usmDESPriv\": \"privkey1\" }, { \"user\": \"user2\", \"engineId\": \"8000000000000002\", \"usmHMACSHAAuth\": \"authkey2\", \"usmAesCfb128\": \"privkey2\" }, { \"user\": \"user3\", \"engineId\": \"8000000000000003\", \"usmHMACSHAAuth\": \"authkey3\", \"usmAesCfb256\": \"privkey3\" } ] } }")
 
+    tds.c_config = json.loads(
+        '{ "snmptrapd": { "version": "1.4.0", "title": "ONAP SNMP Trap Receiver" }, "protocols": { "transport": "udp", "ipv4_interface": "0.0.0.0", "ipv4_port": 6162, "ipv6_interface": "::1", "ipv6_port": 6162 }, "cache": { "dns_cache_ttl_seconds": 60 }, "publisher": { "http_timeout_milliseconds": 1500, "http_retries": 3, "http_milliseconds_between_retries": 750, "http_primary_publisher": "true", "http_peer_publisher": "unavailable", "max_traps_between_publishes": 10, "max_milliseconds_between_publishes": 10000 }, "streams_publishes": { "sec_fault_unsecure": { "type": "message_router", "aaf_password": null, "dmaap_info": { "location": "mtl5", "client_id": null, "client_role": null, "topic_url": "http://localhost:3904/events/ONAP-COLLECTOR-SNMPTRAP" }, "aaf_username": null } }, "files": { "runtime_base_dir": "/tmp/opt/app/snmptrap", "log_dir": "logs", "data_dir": "data", "pid_dir": "tmp", "arriving_traps_log": "snmptrapd_arriving_traps.log", "snmptrapd_diag": "snmptrapd_prog_diag.log", "traps_stats_log": "snmptrapd_stats.csv", "perm_status_file": "snmptrapd_status.log", "eelf_base_dir": "/tmp/opt/app/snmptrap/logs", "eelf_error": "error.log", "eelf_debug": "debug.log", "eelf_audit": "audit.log", "eelf_metrics": "metrics.log", "roll_frequency": "day", "minimum_severity_to_log": 2 }, "trap_config": { "sw_interval_in_seconds": 60, "notify_oids": { ".1.3.6.1.4.1.9.0.1": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.2": { "sw_high_water_in_interval": 101, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.3": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.4": { "sw_high_water_in_interval": 10, "sw_low_water_in_interval": 3, "category": "logonly" } } }, "snmpv3_config": { "usm_users": [ { "user": "usr-sha-aes256", "engineId": "8000000001020304", "usmHMACSHAAuth": "authkey1", "usmAesCfb256": "privkey1" }, { "user": "user1", "engineId": "8000000000000001", "usmHMACMD5Auth": "authkey1", "usmDESPriv": "privkey1" }, { "user": "user2", "engineId": "8000000000000002", "usmHMACSHAAuth": "authkey2", "usmAesCfb128": "privkey2" }, { "user": "user3", "engineId": "8000000000000003", "usmHMACSHAAuth": "authkey3", "usmAesCfb256": "privkey3" } ] } }'
+    )
 
     def test_roll_all_files_notopen(self):
         """
@@ -48,9 +50,9 @@ class test_trapd_io(unittest.TestCase):
         """
         Test bad error file location
         """
-    
+
         # open eelf error logs
-        tds.c_config['files.eelf_error']="/bad_dir/error.log"
+        tds.c_config["files.eelf_error"] = "/bad_dir/error.log"
 
         # try to open file in non-existent dir
         with pytest.raises(SystemExit) as pytest_wrapped_exception:
@@ -61,9 +63,9 @@ class test_trapd_io(unittest.TestCase):
         """
         Test bad debug file location
         """
-    
+
         # open eelf debug logs
-        tds.c_config['files.eelf_debug']="/bad_dir/debug.log"
+        tds.c_config["files.eelf_debug"] = "/bad_dir/debug.log"
 
         # try to open file in non-existent dir
         with pytest.raises(SystemExit) as pytest_wrapped_exception:
@@ -74,9 +76,9 @@ class test_trapd_io(unittest.TestCase):
         """
         Test bad audit file location
         """
-    
+
         # open eelf debug logs
-        tds.c_config['files.eelf_audit']="/bad_dir/audit.log"
+        tds.c_config["files.eelf_audit"] = "/bad_dir/audit.log"
 
         # try to open file in non-existent dir
         with pytest.raises(SystemExit) as pytest_wrapped_exception:
@@ -87,9 +89,9 @@ class test_trapd_io(unittest.TestCase):
         """
         Test bad metrics file location
         """
-    
+
         # open eelf debug logs
-        tds.c_config['files.eelf_metrics']="/bad_dir/metrics.log"
+        tds.c_config["files.eelf_metrics"] = "/bad_dir/metrics.log"
 
         # try to open file in non-existent dir
         with pytest.raises(SystemExit) as pytest_wrapped_exception:
@@ -100,7 +102,7 @@ class test_trapd_io(unittest.TestCase):
         """
         Test roll of logs when not open
         """
-    
+
         # try to roll logs when not open
         with pytest.raises(SystemExit) as pytest_wrapped_exception:
             result = trapd_io.roll_all_logs()
@@ -110,7 +112,7 @@ class test_trapd_io(unittest.TestCase):
         """
         Test roll of individual file when not present
         """
-    
+
         # try to roll logs when not open
         result = trapd_io.roll_file("/file/not/present")
         self.assertEqual(result, False)
@@ -119,22 +121,22 @@ class test_trapd_io(unittest.TestCase):
         """
         try to roll logs when not enough perms
         """
-    
-        no_perms_dir="/tmp/opt/app/snmptrap/no_perms"
-        no_perms_file="test.dat"
-        no_perms_fp= no_perms_dir + "/" + no_perms_file
+
+        no_perms_dir = "/tmp/opt/app/snmptrap/no_perms"
+        no_perms_file = "test.dat"
+        no_perms_fp = no_perms_dir + "/" + no_perms_file
 
         # required directory tree
         try:
             Path(no_perms_dir).mkdir(parents=True, exist_ok=True)
-            os.chmod(no_perms_dir,0o777)
+            os.chmod(no_perms_dir, 0o777)
         except Exception as e:
             print("Error while running %s : %s" % (os.path.basename(__file__), str(e.strerror)))
             sys.exit(1)
 
         # create empty file
-        open(no_perms_fp,'a').close()
-        os.chmod(no_perms_dir,0o444)
+        open(no_perms_fp, "a").close()
+        os.chmod(no_perms_dir, 0o444)
 
         result = trapd_io.roll_file(no_perms_fp)
         self.assertEqual(result, False)
@@ -144,7 +146,6 @@ class test_trapd_io(unittest.TestCase):
             result = trapd_io.open_file(no_perms_fp)
             assert pytest_wrapped_exception.type == SystemExit
 
-
     def test_open_file_exists(self):
         """
         Test file open in directory present
@@ -152,7 +153,7 @@ class test_trapd_io(unittest.TestCase):
 
         # create copy of snmptrapd.json for pytest
         test_file = "/tmp/snmptrap_pytest"
-    
+
         # try to roll logs when not open
         result = trapd_io.open_file(test_file)
         compare = str(result).startswith("<_io.TextIOWrapper name=")
@@ -165,7 +166,7 @@ class test_trapd_io(unittest.TestCase):
 
         # create copy of snmptrapd.json for pytest
         test_file = "/tmp/no_such_dir/snmptrap_pytest"
-    
+
         # try to open file when dir not present
         with pytest.raises(SystemExit) as pytest_wrapped_exception:
             result = trapd_io.open_file(test_file)
@@ -179,14 +180,14 @@ class test_trapd_io(unittest.TestCase):
         # create copy of snmptrapd.json for pytest
         test_file_name = "/tmp/snmptrap_pytest"
         test_file = trapd_io.open_file(test_file_name)
-    
+
         # close active file
         result = trapd_io.close_file(test_file, test_file_name)
         self.assertEqual(result, True)
 
     def test_close_file_does_not_exists(self):
         """
-        Test closing non-existent file 
+        Test closing non-existent file
         """
 
         # try to roll logs when not open
@@ -194,5 +195,5 @@ class test_trapd_io(unittest.TestCase):
         self.assertEqual(result, False)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_trapd_runtime_pid.py b/tests/test_trapd_runtime_pid.py
index e22b6cb..c6b8601 100644
--- a/tests/test_trapd_runtime_pid.py
+++ b/tests/test_trapd_runtime_pid.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 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.
@@ -18,48 +18,50 @@ import pytest
 import unittest
 import trapd_runtime_pid
 import trapd_io
- 
+
+
 class test_save_pid(unittest.TestCase):
     """
     Test the save_pid mod
     """
- 
+
     def test_correct_usage(self):
         """
         Test that attempt to create pid file in standard location works
         """
-        result = trapd_runtime_pid.save_pid('/tmp/snmptrap_test_pid_file')
+        result = trapd_runtime_pid.save_pid("/tmp/snmptrap_test_pid_file")
         self.assertEqual(result, True)
- 
+
     def test_missing_directory(self):
         """
         Test that attempt to create pid file in missing dir fails
         """
-        result = trapd_runtime_pid.save_pid('/bogus/directory/for/snmptrap_test_pid_file')
+        result = trapd_runtime_pid.save_pid("/bogus/directory/for/snmptrap_test_pid_file")
         self.assertEqual(result, False)
- 
+
+
 class test_rm_pid(unittest.TestCase):
     """
     Test the rm_pid mod
     """
- 
+
     def test_correct_usage(self):
         """
         Test that attempt to remove pid file in standard location works
         """
         # must create it before removing it
-        result = trapd_runtime_pid.save_pid('/tmp/snmptrap_test_pid_file')
+        result = trapd_runtime_pid.save_pid("/tmp/snmptrap_test_pid_file")
         self.assertEqual(result, True)
-        result = trapd_runtime_pid.rm_pid('/tmp/snmptrap_test_pid_file')
+        result = trapd_runtime_pid.rm_pid("/tmp/snmptrap_test_pid_file")
         self.assertEqual(result, True)
- 
+
     def test_missing_file(self):
         """
         Test that attempt to rm non-existent pid file fails
         """
-        result = trapd_runtime_pid.rm_pid('/tmp/snmptrap_test_pid_file_9999')
+        result = trapd_runtime_pid.rm_pid("/tmp/snmptrap_test_pid_file_9999")
         self.assertEqual(result, False)
- 
- 
-if __name__ == '__main__':
+
+
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_trapd_settings.py b/tests/test_trapd_settings.py
index 9d5cee2..92a3144 100644
--- a/tests/test_trapd_settings.py
+++ b/tests/test_trapd_settings.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 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.
@@ -18,16 +18,16 @@ import pytest
 import unittest
 import trapd_exit
 
-pid_file="/tmp/test_pid_file"
-pid_file_dne="/tmp/test_pid_file_NOT"
+pid_file = "/tmp/test_pid_file"
+pid_file_dne = "/tmp/test_pid_file_NOT"
 
 import trapd_settings as tds
 
+
 class test_cleanup_and_exit(unittest.TestCase):
     """
     Test for presense of required vars
     """
- 
 
     def test_nonexistent_dict(self):
         """
@@ -41,7 +41,7 @@ class test_cleanup_and_exit(unittest.TestCase):
             result = False
 
         self.assertEqual(result, False)
- 
+
     def test_config_dict(self):
         """
         Test config dict
@@ -54,10 +54,10 @@ class test_cleanup_and_exit(unittest.TestCase):
             result = False
 
         self.assertEqual(result, True)
- 
+
     def test_dns_cache_ip_to_name(self):
         """
-        Test dns cache name dict 
+        Test dns cache name dict
         """
 
         tds.init()
@@ -71,7 +71,7 @@ class test_cleanup_and_exit(unittest.TestCase):
 
     def test_dns_cache_ip_expires(self):
         """
-        Test dns cache ip expires dict 
+        Test dns cache ip expires dict
         """
 
         tds.init()
@@ -83,6 +83,7 @@ class test_cleanup_and_exit(unittest.TestCase):
 
         self.assertEqual(result, True)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     # tds.init()
     unittest.main()
diff --git a/tests/test_trapd_snmpv3.py b/tests/test_trapd_snmpv3.py
index 478f479..eac6082 100644
--- a/tests/test_trapd_snmpv3.py
+++ b/tests/test_trapd_snmpv3.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 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.
@@ -26,7 +26,8 @@ import trapd_settings as tds
 import trapd_snmpv3
 
 from pysnmp.entity import engine, config
- 
+
+
 class test_snmpv3_config(unittest.TestCase):
     """
     Test snmpv3 module
@@ -36,7 +37,9 @@ class test_snmpv3_config(unittest.TestCase):
         """
         Test that snmpv3 config is present
         """
-        tds.c_config = json.loads("{ \"snmptrapd\": { \"version\": \"1.4.0\", \"title\": \"ONAP SNMP Trap Receiver\" }, \"protocols\": { \"transport\": \"udp\", \"ipv4_interface\": \"0.0.0.0\", \"ipv4_port\": 6162, \"ipv6_interface\": \"::1\", \"ipv6_port\": 6162 }, \"cache\": { \"dns_cache_ttl_seconds\": 60 }, \"publisher\": { \"http_timeout_milliseconds\": 1500, \"http_retries\": 3, \"http_milliseconds_between_retries\": 750, \"http_primary_publisher\": \"true\", \"http_peer_publisher\": \"unavailable\", \"max_traps_between_publishes\": 10, \"max_milliseconds_between_publishes\": 10000 }, \"streams_publishes\": { \"sec_fault_unsecure\": { \"type\": \"message_router\", \"aaf_password\": null, \"dmaap_info\": { \"location\": \"mtl5\", \"client_id\": null, \"client_role\": null, \"topic_url\": \"http://localhost:3904/events/ONAP-COLLECTOR-SNMPTRAP\" }, \"aaf_username\": null } }, \"files\": { \"runtime_base_dir\": \"/tmp/opt/app/snmptrap\", \"log_dir\": \"logs\", \"data_dir\": \"data\", \"pid_dir\": \"tmp\", \"arriving_traps_log\": \"snmptrapd_arriving_traps.log\", \"snmptrapd_diag\": \"snmptrapd_prog_diag.log\", \"traps_stats_log\": \"snmptrapd_stats.csv\", \"perm_status_file\": \"snmptrapd_status.log\", \"eelf_base_dir\": \"/tmp/opt/app/snmptrap/logs\", \"eelf_error\": \"error.log\", \"eelf_debug\": \"debug.log\", \"eelf_audit\": \"audit.log\", \"eelf_metrics\": \"metrics.log\", \"roll_frequency\": \"day\", \"minimum_severity_to_log\": 2 }, \"trap_config\": { \"sw_interval_in_seconds\": 60, \"notify_oids\": { \".1.3.6.1.4.1.9.0.1\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.2\": { \"sw_high_water_in_interval\": 101, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.3\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.4\": { \"sw_high_water_in_interval\": 10, \"sw_low_water_in_interval\": 3, \"category\": \"logonly\" } } }, \"snmpv3_config\": { \"usm_users\": [ { \"user\": \"usr-sha-aes256\", \"engineId\": \"8000000001020304\", \"usmHMACSHAAuth\": \"authkey1\", \"usmAesCfb256\": \"privkey1\" }, { \"user\": \"user1\", \"engineId\": \"8000000000000001\", \"usmHMACMD5Auth\": \"authkey1\", \"usmDESPriv\": \"privkey1\" }, { \"user\": \"user2\", \"engineId\": \"8000000000000002\", \"usmHMACSHAAuth\": \"authkey2\", \"usmAesCfb128\": \"privkey2\" }, { \"user\": \"user3\", \"engineId\": \"8000000000000003\", \"usmHMACSHAAuth\": \"authkey3\", \"usmAesCfb256\": \"privkey3\" }, { \"user\": \"user4\"} , { \"engineId\": \"1\"}, { \"user\": \"user6\", \"engineId\": \"8000000000000006\", \"usmNoAuth\": \"authkey3\", \"usmAesCfb192\": \"privkey6\" }, { \"user\": \"user7\", \"engineId\": \"8000000000000007\", \"usmNoAuth\": \"\", \"usmNoPriv\": \"\" }] } }")
+        tds.c_config = json.loads(
+            '{ "snmptrapd": { "version": "1.4.0", "title": "ONAP SNMP Trap Receiver" }, "protocols": { "transport": "udp", "ipv4_interface": "0.0.0.0", "ipv4_port": 6162, "ipv6_interface": "::1", "ipv6_port": 6162 }, "cache": { "dns_cache_ttl_seconds": 60 }, "publisher": { "http_timeout_milliseconds": 1500, "http_retries": 3, "http_milliseconds_between_retries": 750, "http_primary_publisher": "true", "http_peer_publisher": "unavailable", "max_traps_between_publishes": 10, "max_milliseconds_between_publishes": 10000 }, "streams_publishes": { "sec_fault_unsecure": { "type": "message_router", "aaf_password": null, "dmaap_info": { "location": "mtl5", "client_id": null, "client_role": null, "topic_url": "http://localhost:3904/events/ONAP-COLLECTOR-SNMPTRAP" }, "aaf_username": null } }, "files": { "runtime_base_dir": "/tmp/opt/app/snmptrap", "log_dir": "logs", "data_dir": "data", "pid_dir": "tmp", "arriving_traps_log": "snmptrapd_arriving_traps.log", "snmptrapd_diag": "snmptrapd_prog_diag.log", "traps_stats_log": "snmptrapd_stats.csv", "perm_status_file": "snmptrapd_status.log", "eelf_base_dir": "/tmp/opt/app/snmptrap/logs", "eelf_error": "error.log", "eelf_debug": "debug.log", "eelf_audit": "audit.log", "eelf_metrics": "metrics.log", "roll_frequency": "day", "minimum_severity_to_log": 2 }, "trap_config": { "sw_interval_in_seconds": 60, "notify_oids": { ".1.3.6.1.4.1.9.0.1": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.2": { "sw_high_water_in_interval": 101, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.3": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.4": { "sw_high_water_in_interval": 10, "sw_low_water_in_interval": 3, "category": "logonly" } } }, "snmpv3_config": { "usm_users": [ { "user": "usr-sha-aes256", "engineId": "8000000001020304", "usmHMACSHAAuth": "authkey1", "usmAesCfb256": "privkey1" }, { "user": "user1", "engineId": "8000000000000001", "usmHMACMD5Auth": "authkey1", "usmDESPriv": "privkey1" }, { "user": "user2", "engineId": "8000000000000002", "usmHMACSHAAuth": "authkey2", "usmAesCfb128": "privkey2" }, { "user": "user3", "engineId": "8000000000000003", "usmHMACSHAAuth": "authkey3", "usmAesCfb256": "privkey3" }, { "user": "user4"} , { "engineId": "1"}, { "user": "user6", "engineId": "8000000000000006", "usmNoAuth": "authkey3", "usmAesCfb192": "privkey6" }, { "user": "user7", "engineId": "8000000000000007", "usmNoAuth": "", "usmNoPriv": "" }] } }'
+        )
 
         # del os.environ['CBS_SIM_JSON']
         # result = trapd_get_cbs_config.get_cbs_config()
@@ -51,12 +54,13 @@ class test_snmpv3_config(unittest.TestCase):
             assert pytest_wrapped_sys_exit.type == SystemExit
             # assert pytest_wrapped_sys_exit.value.code == 1
 
- 
     def test_v3_config_not_present(self):
         """
         Test that app is ok if v3 config not present
         """
-        tds.c_config = json.loads("{ \"snmptrapd\": { \"version\": \"1.4.0\", \"title\": \"ONAP SNMP Trap Receiver\" }, \"protocols\": { \"transport\": \"udp\", \"ipv4_interface\": \"0.0.0.0\", \"ipv4_port\": 6162, \"ipv6_interface\": \"::1\", \"ipv6_port\": 6162 }, \"cache\": { \"dns_cache_ttl_seconds\": 60 }, \"publisher\": { \"http_timeout_milliseconds\": 1500, \"http_retries\": 3, \"http_milliseconds_between_retries\": 750, \"http_primary_publisher\": \"true\", \"http_peer_publisher\": \"unavailable\", \"max_traps_between_publishes\": 10, \"max_milliseconds_between_publishes\": 10000 }, \"streams_publishes\": { \"sec_fault_unsecure\": { \"type\": \"message_router\", \"aaf_password\": null, \"dmaap_info\": { \"location\": \"mtl5\", \"client_id\": null, \"client_role\": null, \"topic_url\": \"http://localhost:3904/events/ONAP-COLLECTOR-SNMPTRAP\" }, \"aaf_username\": null } }, \"files\": { \"runtime_base_dir\": \"/tmp/opt/app/snmptrap\", \"log_dir\": \"logs\", \"data_dir\": \"data\", \"pid_dir\": \"tmp\", \"arriving_traps_log\": \"snmptrapd_arriving_traps.log\", \"snmptrapd_diag\": \"snmptrapd_prog_diag.log\", \"traps_stats_log\": \"snmptrapd_stats.csv\", \"perm_status_file\": \"snmptrapd_status.log\", \"eelf_base_dir\": \"/tmp/opt/app/snmptrap/logs\", \"eelf_error\": \"error.log\", \"eelf_debug\": \"debug.log\", \"eelf_audit\": \"audit.log\", \"eelf_metrics\": \"metrics.log\", \"roll_frequency\": \"day\", \"minimum_severity_to_log\": 2 }, \"trap_config\": { \"sw_interval_in_seconds\": 60, \"notify_oids\": { \".1.3.6.1.4.1.9.0.1\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.2\": { \"sw_high_water_in_interval\": 101, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.3\": { \"sw_high_water_in_interval\": 102, \"sw_low_water_in_interval\": 7, \"category\": \"logonly\" }, \".1.3.6.1.4.1.9.0.4\": { \"sw_high_water_in_interval\": 10, \"sw_low_water_in_interval\": 3, \"category\": \"logonly\" } } } }")
+        tds.c_config = json.loads(
+            '{ "snmptrapd": { "version": "1.4.0", "title": "ONAP SNMP Trap Receiver" }, "protocols": { "transport": "udp", "ipv4_interface": "0.0.0.0", "ipv4_port": 6162, "ipv6_interface": "::1", "ipv6_port": 6162 }, "cache": { "dns_cache_ttl_seconds": 60 }, "publisher": { "http_timeout_milliseconds": 1500, "http_retries": 3, "http_milliseconds_between_retries": 750, "http_primary_publisher": "true", "http_peer_publisher": "unavailable", "max_traps_between_publishes": 10, "max_milliseconds_between_publishes": 10000 }, "streams_publishes": { "sec_fault_unsecure": { "type": "message_router", "aaf_password": null, "dmaap_info": { "location": "mtl5", "client_id": null, "client_role": null, "topic_url": "http://localhost:3904/events/ONAP-COLLECTOR-SNMPTRAP" }, "aaf_username": null } }, "files": { "runtime_base_dir": "/tmp/opt/app/snmptrap", "log_dir": "logs", "data_dir": "data", "pid_dir": "tmp", "arriving_traps_log": "snmptrapd_arriving_traps.log", "snmptrapd_diag": "snmptrapd_prog_diag.log", "traps_stats_log": "snmptrapd_stats.csv", "perm_status_file": "snmptrapd_status.log", "eelf_base_dir": "/tmp/opt/app/snmptrap/logs", "eelf_error": "error.log", "eelf_debug": "debug.log", "eelf_audit": "audit.log", "eelf_metrics": "metrics.log", "roll_frequency": "day", "minimum_severity_to_log": 2 }, "trap_config": { "sw_interval_in_seconds": 60, "notify_oids": { ".1.3.6.1.4.1.9.0.1": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.2": { "sw_high_water_in_interval": 101, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.3": { "sw_high_water_in_interval": 102, "sw_low_water_in_interval": 7, "category": "logonly" }, ".1.3.6.1.4.1.9.0.4": { "sw_high_water_in_interval": 10, "sw_low_water_in_interval": 3, "category": "logonly" } } } }'
+        )
 
         # del os.environ['CBS_SIM_JSON']
         # result = trapd_get_cbs_config.get_cbs_config()
@@ -71,6 +75,6 @@ class test_snmpv3_config(unittest.TestCase):
             assert pytest_wrapped_sys_exit.type == SystemExit
             # assert pytest_wrapped_sys_exit.value.code == 1
 
- 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_trapd_stormwatch.py b/tests/test_trapd_stormwatch.py
index 6463a0c..16b0a17 100644
--- a/tests/test_trapd_stormwatch.py
+++ b/tests/test_trapd_stormwatch.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2020-2021 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.
@@ -19,15 +19,15 @@ import unittest
 import trapd_exit
 import time
 
-import trapd_stormwatch as sw 
-import trapd_stormwatch_settings as sws 
+import trapd_stormwatch as sw
+import trapd_stormwatch_settings as sws
 import trapd_stats_settings as stats
 
+
 class test_cleanup_and_exit(unittest.TestCase):
     """
     Test for presense of required vars
     """
- 
 
     def test_increment_existing_counter(self):
         """
@@ -36,7 +36,7 @@ class test_cleanup_and_exit(unittest.TestCase):
         sw.sw_init()
         stats.init()
 
-        oid=".1.2.3.4.5.6"
+        oid = ".1.2.3.4.5.6"
         sws.sw_config_oid_dict[oid] = True
         sws.sw_config_low_water_in_interval_dict[oid] = 1
         sws.sw_config_high_water_in_interval_dict[oid] = 10
@@ -79,7 +79,7 @@ class test_cleanup_and_exit(unittest.TestCase):
         # now make sure we get an exception
         sws.sw_config_category = 3
         self.assertFalse(sw.sw_clear_dicts())
-        
+
         # clean up the attributes we added above
         delattr(sws, "sw_storm_counter_dict")
         delattr(stats, "agent_counter_dict")
@@ -95,12 +95,12 @@ class test_cleanup_and_exit(unittest.TestCase):
         stats.total_notifications = 3
         stats.total_notifications = 50
         sws.sw_interval_in_seconds = 30
-        stats.agent_counter_dict = { "a": 3, "b": 40 }
+        stats.agent_counter_dict = {"a": 3, "b": 40}
         stats.metric_log_notification_threshold_pct = 30
         sw.sw_log_metrics()
 
         # make sure we got this far
-        assert(True)
+        assert True
 
     def test_sw_storm_active(self):
         """
@@ -160,9 +160,10 @@ class test_cleanup_and_exit(unittest.TestCase):
             stats.oid_counter_dict = {}
         stats.oid_counter_dict["abc"] = 5
         self.assertTrue(sw.sw_storm_active(loc_agent, loc_oid))
-        self.assertTrue(not hasattr(sws,"oid_counter_dict"))
+        self.assertTrue(not hasattr(sws, "oid_counter_dict"))
         # .get("abc") != None)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     # sws.init()
     unittest.main()
diff --git a/tests/test_trapd_stormwatch_settings.py b/tests/test_trapd_stormwatch_settings.py
index ba8ddb0..bcb04a7 100644
--- a/tests/test_trapd_stormwatch_settings.py
+++ b/tests/test_trapd_stormwatch_settings.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2020-2021 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.
@@ -18,16 +18,16 @@ import pytest
 import unittest
 import trapd_exit
 
-pid_file="/tmp/test_pid_file"
-pid_file_dne="/tmp/test_pid_file_NOT"
+pid_file = "/tmp/test_pid_file"
+pid_file_dne = "/tmp/test_pid_file_NOT"
+
+import trapd_stormwatch_settings as sws
 
-import trapd_stormwatch_settings as sws 
 
 class test_cleanup_and_exit(unittest.TestCase):
     """
     Test for presense of required vars
     """
- 
 
     def test_nonexistent_dict(self):
         """
@@ -41,7 +41,7 @@ class test_cleanup_and_exit(unittest.TestCase):
             result = False
 
         self.assertEqual(result, False)
- 
+
     def test_storm_counter_dict(self):
         """
         Test storm_counter_dict
@@ -54,7 +54,7 @@ class test_cleanup_and_exit(unittest.TestCase):
             result = False
 
         self.assertEqual(result, True)
- 
+
     def test_storm_active_dict(self):
         """
         Test storm_active_dict
@@ -153,6 +153,7 @@ class test_cleanup_and_exit(unittest.TestCase):
 
         self.assertEqual(result, True)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     # sws.init()
     unittest.main()
diff --git a/tests/test_trapd_vb_types.py b/tests/test_trapd_vb_types.py
index 1cf75ab..5792b8c 100644
--- a/tests/test_trapd_vb_types.py
+++ b/tests/test_trapd_vb_types.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 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.
@@ -26,13 +26,22 @@ import trapd_settings as tds
 import trapd_vb_types
 
 from pysnmp.entity import engine, config
- 
+
+
 class test_trapd_vb_types(unittest.TestCase):
     """
     Test snmpv3 module
     """
 
-    good_varbind_types = ["Integer", "Unsigned32", "Counter32", "OctetString", "ObjectIdentifier", "TimeTicks", "IpAddress"]
+    good_varbind_types = [
+        "Integer",
+        "Unsigned32",
+        "Counter32",
+        "OctetString",
+        "ObjectIdentifier",
+        "TimeTicks",
+        "IpAddress",
+    ]
 
     def trapd_vb_type_conversion_integer(self):
         """
@@ -139,6 +148,6 @@ class test_trapd_vb_types(unittest.TestCase):
         # should return default of octet if not defined
         self.assertEqual(result, "octet")
 
- 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()