From 313750bef0318c2204ce869fb2bdc4d4043a20e6 Mon Sep 17 00:00:00 2001 From: Satoshi Fujii Date: Tue, 15 Jun 2021 13:33:50 +0000 Subject: Remove unused code Just remove unused code Signed-off-by: Satoshi Fujii Issue-ID: DCAEGEN2-2833 Change-Id: If81a5fcb918a2683e261807d6a3da5a8648e505d --- tests/test_trapd_get_cbs_config.py | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'tests/test_trapd_get_cbs_config.py') diff --git a/tests/test_trapd_get_cbs_config.py b/tests/test_trapd_get_cbs_config.py index ea859af..6cebef2 100644 --- a/tests/test_trapd_get_cbs_config.py +++ b/tests/test_trapd_get_cbs_config.py @@ -29,7 +29,6 @@ class test_get_cbs_config(unittest.TestCase): pytest_json_data ="{ \"heartbeat_config\": { \"vnfs\": [{ \"eventName\": \"Heartbeat_vDNS\", \"heartbeatcountmissed\": 3, \"heartbeatinterval\": 60, \"closedLoopControlName\": \"ControlLoopEvent1\", \"policyVersion\": \"1.0.0.5\", \"policyName\": \"vFireWall\", \"policyScope\": \"resource=sampleResource,type=sampletype,CLName=sampleCLName\", \"target_type\": \"VNF\", \"target\": \"genVnfName\", \"version\": \"1.0\" }, { \"eventName\": \"Heartbeat_vFW\", \"heartbeatcountmissed\": 3, \"heartbeatinterval\": 60, \"closedLoopControlName\": \"ControlLoopEvent1\", \"policyVersion\": \"1.0.0.5\", \"policyName\": \"vFireWall\", \"policyScope\": \"resource=sampleResource,type=sampletype,CLName=sampleCLName\", \"target_type\": \"VNF\", \"target\": \"genVnfName\", \"version\": \"1.0\" }, { \"eventName\": \"Heartbeat_xx\", \"heartbeatcountmissed\": 3, \"heartbeatinterval\": 60, \"closedLoopControlName\": \"ControlLoopEvent1\", \"policyVersion\": \"1.0.0.5\", \"policyName\": \"vFireWall\", \"policyScope\": \"resource=sampleResource,type=sampletype,CLName=sampleCLName\", \"target_type\": \"VNF\", \"target\": \"genVnfName\", \"version\": \"1.0\" } ] }, \"streams_publishes\": { \"ves_heartbeat\": { \"dmaap_info\": { \"topic_url\": \"http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT/\" }, \"type\": \"message_router\" } }, \"streams_subscribes\": { \"ves_heartbeat\": { \"dmaap_info\": { \"topic_url\": \"http://message-router:3904/events/unauthenticated.SEC_HEARTBEAT_INPUT/\" }, \"type\": \"message_router\" } } }" - # create copy of snmptrapd.json for pytest pytest_json_config = "/tmp/opt/app/miss_htbt_service/etc/config.json" with open(pytest_json_config, 'w') as outfile: @@ -41,32 +40,10 @@ class test_get_cbs_config(unittest.TestCase): Test that CONSUL_HOST env variable exists but fails to respond """ - #os.environ.update(CONSUL_HOST='nosuchhost') - #del os.environ['CBS_HTBT_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(Exception) 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_override_env_invalid(self): -# """ -# """ -# #os.environ.update(CBS_HTBT_JSON='/tmp/opt/app/miss_htbt_service/etc/nosuchfile.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): @@ -75,12 +52,6 @@ class test_get_cbs_config(unittest.TestCase): from fallback env var """ os.environ.update(CBS_HTBT_JSON='/tmp/opt/app/miss_htbt_service/etc/config.json') - #result = trapd_get_cbs_config.get_cbs_config() result = True print("result: %s" % result) - # compare = str(result).startswith("{'snmptrap': ") - # self.assertEqual(compare, True) self.assertEqual(result, True) - -#if __name__ == '__main__': -# unittest.main() -- cgit 1.2.3-korg