Fix relative imports and invalid exception handling

Make proper relative or absolute imports within miss_htbt_service.
Use proper except Class as variable syntax.
Avoid multiple parameters to print() for potential python2 usage.
Add missing original AT&T license text to test modules.
Add attribution to commiter's employer to modified files.
Trailing whitespace fixes.

Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech>
Issue-ID: DCAEGEN2-1939
Change-Id: Ibfc4bea3e33a512d06a41050ba5e591121eb9454

7 files changed, 156 insertions, 55 deletions

diff --git a/tests/test_binding.py b/tests/test_binding.py
index 56a5ece..0ef6c5d 100644
--- a/tests/test_binding.py
+++ b/tests/test_binding.py
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. 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,11 +22,6 @@ import io
 import requests
 import httpretty
 import sys
-from miss_htbt_service import htbtworker
-from miss_htbt_service import misshtbtd
-from miss_htbt_service import db_monitoring
-#from miss_htbt_service import config_notif
-from trapd_vnf_table import hb_properties
 import subprocess
 import pytest
 import json
@@ -35,6 +31,10 @@ import imp
 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
 
 
diff --git a/tests/test_trapd_exit.py b/tests/test_trapd_exit.py
index d73fd62..4fa8586 100644
--- a/tests/test_trapd_exit.py
+++ b/tests/test_trapd_exit.py
@@ -1,22 +1,41 @@
+# ============LICENSE_START=======================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. 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.
+# You may obtain a copy of the License at
+#
+#     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=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
 import pytest
 import unittest
 import sys
-import trapd_exit
+from miss_htbt_service.mod import trapd_exit
 
 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')
-    
+
         with pytest.raises(SystemExit) as pytest_wrapped_sys_exit:
             result = trapd_exit.cleanup_and_exit(0,pid_file)
             assert pytest_wrapped_sys_exit.type == SystemExit
@@ -24,7 +43,7 @@ class test_cleanup_and_exit(unittest.TestCase):
 
         # compare = str(result).startswith("SystemExit: 0")
         # self.assertEqual(compare, True)
- 
+
     def test_abnormal_exit(self):
         """
         Test exit with missing PID file exits non-zero
diff --git a/tests/test_trapd_get_cbs_config.py b/tests/test_trapd_get_cbs_config.py
index 1719319..92d0dde 100644
--- a/tests/test_trapd_get_cbs_config.py
+++ b/tests/test_trapd_get_cbs_config.py
@@ -1,14 +1,33 @@
+# ============LICENSE_START=======================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. 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.
+# You may obtain a copy of the License at
+#
+#     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=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
 import pytest
 import unittest
 import os
 import sys
 
 from onap_dcae_cbs_docker_client.client import get_config
-from trapd_exit import cleanup_and_exit
-from trapd_io import stdout_logger
-import trapd_settings as tds
-import trapd_get_cbs_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):
     """
     Test the trapd_get_cbs_config mod
@@ -22,7 +41,7 @@ class test_get_cbs_config(unittest.TestCase):
     with open(pytest_json_config, 'w') as outfile:
         outfile.write(pytest_json_data)
 
- 
+
     def test_cbs_env_present(self):
         """
         Test that CONSUL_HOST env variable exists but fails to
@@ -40,7 +59,7 @@ class test_get_cbs_config(unittest.TestCase):
             assert pytest_wrapped_sys_exit.type == SystemExit
             # assert pytest_wrapped_sys_exit.value.code == 1
 
- 
+
 #    def test_cbs_override_env_invalid(self):
 #        """
 #        """
@@ -55,7 +74,7 @@ class test_get_cbs_config(unittest.TestCase):
 #            assert pytest_wrapped_sys_exit.type == SystemExit
 #            assert pytest_wrapped_sys_exit.value.code == 1
 
- 
+
     def test_cbs_fallback_env_present(self):
         """
         Test that CBS fallback env variable exists and we can get config
@@ -68,6 +87,6 @@ class test_get_cbs_config(unittest.TestCase):
         # compare = str(result).startswith("{'snmptrap': ")
         # self.assertEqual(compare, True)
         self.assertEqual(result, True)
- 
+
 #if __name__ == '__main__':
 #    unittest.main()
diff --git a/tests/test_trapd_http_session.py b/tests/test_trapd_http_session.py
index c2a5f6b..00ee867 100644
--- a/tests/test_trapd_http_session.py
+++ b/tests/test_trapd_http_session.py
@@ -1,13 +1,32 @@
+# ============LICENSE_START=======================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. 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.
+# You may obtain a copy of the License at
+#
+#     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=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
 import pytest
 import unittest
 import sys
-import trapd_http_session
- 
+from miss_htbt_service.mod import trapd_http_session
+
 class test_init_session_obj(unittest.TestCase):
     """
     Test the init_session_obj mod
     """
- 
+
     def test_correct_usage(self):
         """
         Test that attempt to create http session object works
@@ -15,7 +34,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)
- 
- 
+
+
 #if __name__ == '__main__':
 #    unittest.main()
diff --git a/tests/test_trapd_runtime_pid.py b/tests/test_trapd_runtime_pid.py
index 61900ba..222ce58 100644
--- a/tests/test_trapd_runtime_pid.py
+++ b/tests/test_trapd_runtime_pid.py
@@ -1,35 +1,52 @@
+# ============LICENSE_START=======================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. 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.
+# You may obtain a copy of the License at
+#
+#     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=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
 import pytest
 import unittest
-#import trapd_runtime_pid
 import sys
-#from /home/ubuntu/HB_Nov5/miss_htbt_service/mod/ import trapd_io
-import trapd_runtime_pid
-import trapd_io 
+from miss_htbt_service.mod import trapd_runtime_pid
+from miss_htbt_service.mod 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')
         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')
         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
@@ -39,14 +56,14 @@ class test_rm_pid(unittest.TestCase):
         self.assertEqual(result, True)
         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')
         self.assertEqual(result, False)
- 
- 
+
+
 #if __name__ == '__main__':
 #    unittest.main()
diff --git a/tests/test_trapd_settings.py b/tests/test_trapd_settings.py
index 05b4449..53b24c8 100644
--- a/tests/test_trapd_settings.py
+++ b/tests/test_trapd_settings.py
@@ -1,17 +1,37 @@
+# ============LICENSE_START=======================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. 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.
+# You may obtain a copy of the License at
+#
+#     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=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
 import pytest
 import unittest
-import test_trapd_exit
+
+from miss_htbt_service.mod import trapd_settings as tds
+
 
 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):
         """
@@ -25,7 +45,7 @@ class test_cleanup_and_exit(unittest.TestCase):
             result = False
 
         self.assertEqual(result, False)
- 
+
     def test_config_dict(self):
         """
         Test config dict
@@ -37,10 +57,10 @@ class test_cleanup_and_exit(unittest.TestCase):
         except:
             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()
@@ -53,7 +73,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()
diff --git a/tests/test_trapd_vnf_table.py b/tests/test_trapd_vnf_table.py
index 9e11ce9..f38d4af 100644
--- a/tests/test_trapd_vnf_table.py
+++ b/tests/test_trapd_vnf_table.py
@@ -2,6 +2,7 @@
 # org.onap.dcae
 # ================================================================================
 # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. 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,11 +28,17 @@ 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 trapd_vnf_table import verify_DB_creation_1,verify_DB_creation_2,verify_DB_creation_hb_common,verify_cbsPolling_required,hb_properties,verify_cbspolling,verify_sendControlLoop_VNF_ONSET, verify_sendControlLoop_VM_ONSET, verify_sendControlLoop_VNF_ABATED, verify_sendControlLoop_VM_ABATED, verify_fetch_json_file, verify_misshtbtdmain, verify_dbmonitoring, verify_dbmon_startup
+from miss_htbt_service import misshtbtd as db
+from miss_htbt_service import htbtworker as pm
+from miss_htbt_service import db_monitoring as dbmon
+from miss_htbt_service import get_logger
+from miss_htbt_service.mod.trapd_vnf_table import (
+    verify_DB_creation_1, verify_DB_creation_2, verify_DB_creation_hb_common,
+    verify_cbsPolling_required, hb_properties, verify_cbspolling,
+    verify_sendControlLoop_VNF_ONSET, verify_sendControlLoop_VM_ONSET,
+    verify_sendControlLoop_VNF_ABATED, verify_sendControlLoop_VM_ABATED,
+    verify_fetch_json_file, verify_misshtbtdmain, verify_dbmonitoring,
+    verify_dbmon_startup)
 
 _logger = get_logger.get_logger(__name__)
 
@@ -45,20 +52,20 @@ class test_vnf_tables(unittest.TestCase):
     def test_validate_vnf_table_1(self):
         result =verify_DB_creation_1(user_name,password,ip_address,port_num,db_name)
         self.assertEqual(result, True)
-        
+
     def test_validate_vnf_table_2(self):
         result =verify_DB_creation_2(user_name,password,ip_address,port_num,db_name)
         self.assertEqual(result, True)
-        
+
     def test_validate_hb_common(self):
         result =verify_DB_creation_hb_common(user_name,password,ip_address,port_num,db_name)
         self.assertEqual(result, True)
 
-            
+
     def test_validate_cbspolling_required(self):
         result = verify_cbsPolling_required()
         self.assertEqual(result, True)
-    
+
     def test_cbspolling(self):
         result= verify_cbspolling()
         _logger.info(result)
@@ -87,22 +94,22 @@ class test_vnf_tables(unittest.TestCase):
     def test_sendControlLoop_VNF_ONSET(self):
         result= verify_sendControlLoop_VNF_ONSET()
         _logger.info(result)
-        self.assertEqual(result, True)        
+        self.assertEqual(result, True)
 
     def test_sendControlLoop_VM_ONSET(self):
         result= verify_sendControlLoop_VM_ONSET()
         _logger.info(result)
-        self.assertEqual(result, True)        
+        self.assertEqual(result, True)
 
     def test_sendControlLoop_VNF_ABATED(self):
         result= verify_sendControlLoop_VNF_ABATED()
         _logger.info(result)
-        self.assertEqual(result, True)        
+        self.assertEqual(result, True)
 
     def test_sendControlLoop_VM_ABATED(self):
         result= verify_sendControlLoop_VM_ABATED()
         _logger.info(result)
-        self.assertEqual(result, True)        
+        self.assertEqual(result, True)
 
 #if __name__ == '__main__':
 #    unittest.main()