increase pytest coverage4.0.0-ONAPdublin

Change-Id: I871f5fc3182e0a21b3b4c6d6e033abf8730c8d10
Issue-ID: DCAEGEN2-1264
Signed-off-by: Ladue, David (dl3158) <dl3158@att.com>

4 files changed, 177 insertions, 121 deletions

diff --git a/tests/.coveragerc b/tests/.coveragerc
new file mode 100644
index 0000000..52aa0ac
--- /dev/null
+++ b/tests/.coveragerc
@@ -0,0 +1,23 @@
+[run]
+# omit = snmptrap/setup.py,snmptrap/tests/*.py
+omit = snmptrap/setup.py
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about missing debug-only code:
+    def __repr__
+    if self\.debug
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError
+
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:
+
+ignore_errors = True
diff --git a/tests/test_snmptrapd.py b/tests/test_snmptrapd.py
index 85681ea..9dc92c0 100644
--- a/tests/test_snmptrapd.py
+++ b/tests/test_snmptrapd.py
@@ -150,5 +150,29 @@ class test_snmptrapd(unittest.TestCase):
         result = errorIndication
         self.assertEqual(result, None)
 
+    def test_add_varbind_to_json(self):
+
+        # init vars
+        tds.init()
+        tds.trap_dict["notify OID"] = ".1.2.3.4.5.6.7.8"
+        tds.trap_dict["protocol version"] = "v2c"
+
+        # varbinds=[(ObjectName('1.3.6.1.2.1.1.3.0'), TimeTicks(0)), (ObjectName('1.3.6.1.6.3.1.1.4.1.0'), ObjectIdentifier('1.3.6.1.4.1.74.2.46.12.1.1')), (ObjectName('1.3.6.1.4.1.74.2.46.12.1.1.1'), OctetString(b'ucsnmp heartbeat - ignore')), (ObjectName('1.3.6.1.4.1.74.2.46.12.1.1.2'), OctetString(b'Thu Mar 21 15:46:58 2019'))]
+
+        # vb=(ObjectName('1.3.6.1.4.1.74.2.46.12.1.1.1'), OctetString(b'ucsnmp heartbeat - ignore'))
+
+        self.assertEqual(snmptrapd.add_varbind_to_json(0,ObjectIdentifier('.1.2.3.4'), 'OctetString', OctetString(b'Thu Mar 21 15:46:58 2019')), 0)
+        self.assertEqual(snmptrapd.add_varbind_to_json(1,ObjectIdentifier('.1.2.3.4'), 'OctetString', OctetString(b'Thu Mar 21 15:46:58 2019')), 0)
+        self.assertEqual(snmptrapd.add_varbind_to_json(2,ObjectIdentifier('.1.2.3.4'), 'OctetString', OctetString(b'Thu Mar 21 15:46:58 2019')), 1)
+        self.assertEqual(snmptrapd.add_varbind_to_json(3,ObjectIdentifier('.1.2.3.4'), 'OctetString', OctetString(b'Thu Mar 21 15:46:58 2019')), 1)
+
+        # init vars
+        tds.init()
+        tds.trap_dict["notify OID"] = ".1.2.3.4.5.6.7.8"
+        tds.trap_dict["protocol version"] = "v1"
+
+        self.assertEqual(snmptrapd.add_varbind_to_json(0,ObjectIdentifier('.1.2.3.4'), 'OctetString', OctetString(b'Thu Mar 21 15:46:58 2019')), 0)
+        self.assertEqual(snmptrapd.add_varbind_to_json(5,ObjectIdentifier('.1.2.3.4'), 'OctetString', OctetString(b'Thu Mar 21 15:46:58 2019')), 1)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/test_trapd_get_cbs_config.py b/tests/test_trapd_get_cbs_config.py
index accb986..44bf021 100644
--- a/tests/test_trapd_get_cbs_config.py
+++ b/tests/test_trapd_get_cbs_config.py
@@ -54,6 +54,21 @@ class test_get_cbs_config(unittest.TestCase):
             assert pytest_wrapped_sys_exit.value.code == 1
 
  
+    def test_cbs_override_env_unset(self):
+        """
+        """
+        os.environ.update(CBS_SIM_JSON='')
+        #result = trapd_get_cbs_config.get_cbs_config()
+        #print("result: %s" % result)
+        # compare = str(result).startswith("{'snmptrap': ")
+        # self.assertEqual(compare, False)
+
+        with pytest.raises(SystemExit) as pytest_wrapped_sys_exit:
+            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_fallback_env_present(self):
         """
         Test that CBS fallback env variable exists and we can get config
diff --git a/tests/test_trapd_io.py b/tests/test_trapd_io.py
index c791c7d..0ec93d5 100644
--- a/tests/test_trapd_io.py
+++ b/tests/test_trapd_io.py
@@ -13,127 +13,121 @@ 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\" } ] } }")
+    post_data_enclosed=json.loads("[{\"epoch_serno\": 15488041460000, \"uuid\": \"bd3a87a0-241c-11e9-ac41-0242ac11000f\", \"agent address\": \"127.0.0.1\", \"agent name\": \"localhost\", \"cambria.partition\": \"localhost\", \"community\": \"\", \"community len\": 0, \"protocol version\": \"v2c\", \"time received\": 1548804146, \"trap category\": \"com.att.dcae.dmaap.FTL.24256-DCAE-COLLECTOR-UCSNMP-v1\", \"notify OID\": \".1.3.6.1.4.1.74.2.46.12.1.1\", \"notify OID len\": 12, \"varbinds\": [{\"varbind_oid\": \".1.3.6.1.4.1.74.2.46.12.1.1.1\", \"varbind_type\": \"octet\", \"varbind_value\": \"ucsnmp heartbeat - ignore\"} ,{\"varbind_oid\": \".1.3.6.1.4.1.74.2.46.12.1.1.2\", \"varbind_type\": \"octet\", \"varbind_value\": \"Tue Jan 29 23:22:26 2019\"}]}, {\"epoch_serno\": 15488041560000, \"uuid\": \"c338a4b6-241c-11e9-ac41-0242ac11000f\", \"agent address\": \"127.0.0.1\", \"agent name\": \"localhost\", \"cambria.partition\": \"localhost\", \"community\": \"\", \"community len\": 0, \"protocol version\": \"v2c\", \"time received\": 1548804156, \"trap category\": \"com.att.dcae.dmaap.FTL.24256-DCAE-COLLECTOR-UCSNMP-v1\", \"notify OID\": \".1.3.6.1.4.1.74.2.46.12.1.1\", \"notify OID len\": 12, \"varbinds\": [{\"varbind_oid\": \".1.3.6.1.4.1.74.2.46.12.1.1.1\", \"varbind_type\": \"octet\", \"varbind_value\": \"ucsnmp heartbeat - ignore\"} ,{\"varbind_oid\": \".1.3.6.1.4.1.74.2.46.12.1.1.2\", \"varbind_type\": \"octet\", \"varbind_value\": \"Tue Jan 29 23:22:36 2019\"}]}]")
 
 
-    def test_open_eelf_error_file(self):
-        """
-        Test bad error file location
-        """
-    
-        # open eelf error logs
-        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:
-            result = trapd_io.open_eelf_logs()
-            assert pytest_wrapped_exception.type == SystemExit
-
-    def test_open_eelf_debug_file(self):
-        """
-        Test bad debug file location
-        """
-    
-        # open eelf debug logs
-        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:
-            result = trapd_io.open_eelf_logs()
-            assert pytest_wrapped_exception.type == SystemExit
-
-    def test_open_eelf_audit_file(self):
-        """
-        Test bad audit file location
-        """
-    
-        # open eelf debug logs
-        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:
-            result = trapd_io.open_eelf_logs()
-            assert pytest_wrapped_exception.type == SystemExit
-
-    def test_open_eelf_metrics_file(self):
-        """
-        Test bad metrics file location
-        """
-    
-        # open eelf debug logs
-        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:
-            result = trapd_io.open_eelf_logs()
-            assert pytest_wrapped_exception.type == SystemExit
-
-    def test_roll_all_logs(self):
-        """
-        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()
-            assert pytest_wrapped_exception.type == SystemExit
-
-    def test_roll_file(self):
-        """
-        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)
-
-    def test_open_file_exists(self):
-        """
-        Test file open in directory present
-        """
-
-        # create copy of snmptrapd.json for pytest
-        test_file = "/tmp/snmptrap_pytest"
-    
-        # try to roll logs when not open
+def test_open_eelf_error_file():
+    """
+    Test bad error file location
+    """
+
+    # open eelf error logs
+    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:
+        result = trapd_io.open_eelf_logs()
+        assert pytest_wrapped_exception.type == SystemExit
+
+def test_open_eelf_debug_file():
+    """
+    Test bad debug file location
+    """
+
+    # open eelf debug logs
+    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:
+        result = trapd_io.open_eelf_logs()
+        assert pytest_wrapped_exception.type == SystemExit
+
+def test_open_eelf_audit_file():
+    """
+    Test bad audit file location
+    """
+
+    # open eelf debug logs
+    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:
+        result = trapd_io.open_eelf_logs()
+        assert pytest_wrapped_exception.type == SystemExit
+
+def test_open_eelf_metrics_file():
+    """
+    Test bad metrics file location
+    """
+
+    # open eelf debug logs
+    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:
+        result = trapd_io.open_eelf_logs()
+        assert pytest_wrapped_exception.type == SystemExit
+
+def test_roll_all_logs():
+    """
+    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()
+        assert pytest_wrapped_exception.type == SystemExit
+
+def test_roll_file():
+    """
+    Test roll of individual file when not present
+    """
+
+    # try to roll logs when not open
+    assert trapd_io.roll_file("/file/not/present") == False
+
+def test_open_file_exists():
+    """
+    Test file open in directory present
+    """
+
+    # 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)
+    assert str(result).startswith("<_io.TextIOWrapper name=") == True
+
+
+def test_open_file_exists_does_not_exist():
+    """
+    Test file open in directory present
+    """
+
+    # 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)
-        compare = str(result).startswith("<_io.TextIOWrapper name=")
-        self.assertEqual(compare, True)
-
-    def test_open_file_exists_does_not_exist(self):
-        """
-        Test file open in directory present
-        """
-
-        # 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)
-            assert pytest_wrapped_exception.type == SystemExit
-
-    def test_close_file_exists(self):
-        """
-        Test closing a file that's present
-        """
-
-        # 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 
-        """
-
-        # try to roll logs when not open
-        result = trapd_io.close_file(None, None)
-        self.assertEqual(result, False)
-
-
-if __name__ == '__main__':
-    unittest.main()
+        assert pytest_wrapped_exception.type == SystemExit
+
+def test_close_file_exists():
+    """
+    Test closing a file that's present
+    """
+
+    # 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
+    assert trapd_io.close_file(test_file, test_file_name) == True
+
+def test_close_file_does_not_exists():
+    """
+    Test closing non-existent file 
+    """
+
+    # try to roll logs when not open
+    assert trapd_io.close_file(None, None) == False