From 10cd8508717ec5d498b656b69d7dd636885207fa Mon Sep 17 00:00:00 2001 From: Zain Budhwani Date: Mon, 30 Sep 2024 22:08:48 +0000 Subject: [PATCH 1/5] Change ZMQ endpoints from localhost to docker network --- common/events_common.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/events_common.cpp b/common/events_common.cpp index 27d4a2276..ee3d1aed8 100644 --- a/common/events_common.cpp +++ b/common/events_common.cpp @@ -7,10 +7,10 @@ int running_ut = 0; */ #define CFG_VAL map_str_str_t::value_type const map_str_str_t cfg_default = { - CFG_VAL(XSUB_END_KEY, "tcp://127.0.0.1:5570"), - CFG_VAL(XPUB_END_KEY, "tcp://127.0.0.1:5571"), - CFG_VAL(REQ_REP_END_KEY, "tcp://127.0.0.1:5572"), - CFG_VAL(CAPTURE_END_KEY, "tcp://127.0.0.1:5573"), + CFG_VAL(XSUB_END_KEY, "tcp://240.127.1.1:5570"), + CFG_VAL(XPUB_END_KEY, "tcp://240.127.1.1:5571"), + CFG_VAL(REQ_REP_END_KEY, "tcp://240.127.1.1:5572"), + CFG_VAL(CAPTURE_END_KEY, "tcp://240.127.1.1:5573"), CFG_VAL(STATS_UPD_SECS, "5"), CFG_VAL(CACHE_MAX_CNT, "") }; From bbf4481af250b032ef8f9608de2292d3318b48ea Mon Sep 17 00:00:00 2001 From: Zain Budhwani Date: Mon, 30 Sep 2024 23:44:23 +0000 Subject: [PATCH 2/5] Update UT --- tests/events_common_ut.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/events_common_ut.cpp b/tests/events_common_ut.cpp index 524265793..749e14626 100644 --- a/tests/events_common_ut.cpp +++ b/tests/events_common_ut.cpp @@ -19,8 +19,8 @@ const char *test_cfg_data = "{\ TEST(events_common, get_config) { - EXPECT_EQ(string("tcp://127.0.0.1:5570"), get_config(string(XSUB_END_KEY))); - EXPECT_EQ(string("tcp://127.0.0.1:5572"), get_config(string(REQ_REP_END_KEY))); + EXPECT_EQ(string("tcp://240.127.1.1:5570"), get_config(string(XSUB_END_KEY))); + EXPECT_EQ(string("tcp://240.127.1.1:5572"), get_config(string(REQ_REP_END_KEY))); EXPECT_EQ(string("5"), get_config(string(STATS_UPD_SECS))); ofstream tfile; @@ -38,7 +38,7 @@ TEST(events_common, get_config) EXPECT_EQ(100, get_config_data(CACHE_MAX_CNT, 100)); read_init_config(NULL); - EXPECT_EQ(string("tcp://127.0.0.1:5570"), get_config(string(XSUB_END_KEY))); + EXPECT_EQ(string("tcp://240.127.1.1:5570"), get_config(string(XSUB_END_KEY))); } void @@ -73,7 +73,7 @@ TEST(events_common, send_recv) } #endif - char *path = "tcp://127.0.0.1:5570"; + char *path = "tcp://240.127.1.1:5570"; void *zmq_ctx = zmq_ctx_new(); void *sock_p0 = zmq_socket (zmq_ctx, ZMQ_PAIR); EXPECT_EQ(0, zmq_connect (sock_p0, path)); @@ -108,7 +108,7 @@ TEST(events_common, send_recv_control_character) } #endif - char *path = "tcp://127.0.0.1:5570"; + char *path = "tcp://240.127.1.1:5570"; void *zmq_ctx = zmq_ctx_new(); void *sock_p0 = zmq_socket (zmq_ctx, ZMQ_PAIR); EXPECT_EQ(0, zmq_connect (sock_p0, path)); From a3122d8fe70f0b0aaf9fcd57dd50c60a42bd6f8f Mon Sep 17 00:00:00 2001 From: Zain Budhwani Date: Wed, 2 Oct 2024 00:15:05 +0000 Subject: [PATCH 3/5] Fix UT --- tests/events_common_ut.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/events_common_ut.cpp b/tests/events_common_ut.cpp index 749e14626..f4976db18 100644 --- a/tests/events_common_ut.cpp +++ b/tests/events_common_ut.cpp @@ -73,7 +73,7 @@ TEST(events_common, send_recv) } #endif - char *path = "tcp://240.127.1.1:5570"; + char *path = "tcp://127.0.0.1:5570"; void *zmq_ctx = zmq_ctx_new(); void *sock_p0 = zmq_socket (zmq_ctx, ZMQ_PAIR); EXPECT_EQ(0, zmq_connect (sock_p0, path)); @@ -108,7 +108,7 @@ TEST(events_common, send_recv_control_character) } #endif - char *path = "tcp://240.127.1.1:5570"; + char *path = "tcp://127.0.0.1:5570"; void *zmq_ctx = zmq_ctx_new(); void *sock_p0 = zmq_socket (zmq_ctx, ZMQ_PAIR); EXPECT_EQ(0, zmq_connect (sock_p0, path)); From e9c6ce857434721071e5c34329669612053ebbf7 Mon Sep 17 00:00:00 2001 From: Zain Budhwani Date: Wed, 2 Oct 2024 17:58:22 +0000 Subject: [PATCH 4/5] Use localhost since docker network not available --- tests/events_service_ut.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/events_service_ut.cpp b/tests/events_service_ut.cpp index b847adab8..5a72c750a 100644 --- a/tests/events_service_ut.cpp +++ b/tests/events_service_ut.cpp @@ -16,11 +16,28 @@ static event_service service_cl, service_svr; static int server_rd_code, server_ret; static event_serialized_lst_t server_rd_lst, server_wr_lst; +const char *test_cfg_data = "{\ +\"events\" : { \ + \"xsub_path\": \"127.0.0.1:5570\", \ + \"req_rep_path\": \"127.0.0.1:5572\" \ + }\ +}"; + + /* Mimic the eventd service that handles service requests via dedicated thread */ void serve_commands() { int code; event_serialized_lst_t lst, opt_lst; + + ofstream tfile; + const char *tfile_name = "/tmp/init_cfg.json"; + tfile.open (tfile_name); + tfile << test_cfg_data << "\n"; + tfile.close(); + + read_init_config(tfile_name); + EXPECT_EQ(0, service_svr.init_server(zmq_ctx, 1000)); while(!do_terminate) { if (0 != service_svr.channel_read(code, lst)) { @@ -69,6 +86,7 @@ void serve_commands() EXPECT_EQ(0, service_svr.channel_write(server_ret, server_wr_lst)); } service_svr.close_service(); + read_init_config(NULL); EXPECT_FALSE(service_svr.is_active()); } From 9ccac37d6f101662546a5c320bd17b12e4531f97 Mon Sep 17 00:00:00 2001 From: Zain Budhwani Date: Wed, 2 Oct 2024 18:10:05 +0000 Subject: [PATCH 5/5] Fix UT --- tests/events_service_ut.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/events_service_ut.cpp b/tests/events_service_ut.cpp index 5a72c750a..0ca3396d4 100644 --- a/tests/events_service_ut.cpp +++ b/tests/events_service_ut.cpp @@ -16,7 +16,7 @@ static event_service service_cl, service_svr; static int server_rd_code, server_ret; static event_serialized_lst_t server_rd_lst, server_wr_lst; -const char *test_cfg_data = "{\ +const char *test_cfg_data_localhost = "{\ \"events\" : { \ \"xsub_path\": \"127.0.0.1:5570\", \ \"req_rep_path\": \"127.0.0.1:5572\" \ @@ -33,7 +33,7 @@ void serve_commands() ofstream tfile; const char *tfile_name = "/tmp/init_cfg.json"; tfile.open (tfile_name); - tfile << test_cfg_data << "\n"; + tfile << test_cfg_data_localhost << "\n"; tfile.close(); read_init_config(tfile_name);