OMPUB-999: 功能端输出common_start_timestamp_ms，common_end_timestamp_ms日志字段

1 files changed, 10 insertions, 10 deletions

diff --git a/test/src/gtest_sendlog.cpp b/test/src/gtest_sendlog.cpp
index 9f3da60..3e7b293 100644
--- a/test/src/gtest_sendlog.cpp
+++ b/test/src/gtest_sendlog.cpp
@@ -176,7 +176,7 @@ TEST(Master, SendInterimRecord)
 	struct TLD_handle_t * handle=TLD_create(0);
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_INTERIM_SESSION_RECORD, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_vsys_id\":1}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_vsys_id\":1}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 
@@ -198,7 +198,7 @@ TEST(Master, SendTranscationRecord)
 	struct TLD_handle_t * handle=TLD_create(0);
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_TRANSACTION_RECORD, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_vsys_id\":1}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_vsys_id\":1}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 
@@ -220,7 +220,7 @@ TEST(Master, SendSessionRecord)
 	struct TLD_handle_t * handle=TLD_create(0);
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_SESSION_RECORD, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_vsys_id\":1}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_vsys_id\":1}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 
@@ -253,7 +253,7 @@ TEST(Master, SendSessionRecordWithHittedShunt)
 	struct TLD_handle_t * handle=TLD_create(0);
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_SESSION_RECORD, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_vsys_id\":1}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_vsys_id\":1}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 
@@ -277,7 +277,7 @@ TEST(Master, SendInternalRtpRecord)
 	g_tsg_log_instance->vsystem_id=23;
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_INTERNAL_RTP_RECORD, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":23,\"common_vsys_id\":23}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":23,\"common_vsys_id\":23}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 	g_tsg_log_instance->vsystem_id=1;
@@ -295,7 +295,7 @@ TEST(Master, SendSecurityEvent)
 	struct TLD_handle_t * handle=TLD_create(0);
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_SECURITY_EVENT, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_policy_id\":25,\"common_service\":2,\"common_vsys_id\":25,\"common_action\":1}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_policy_id\":25,\"common_service\":2,\"common_vsys_id\":25,\"common_action\":1}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 }
@@ -312,7 +312,7 @@ TEST(Master, SendInterceptEvent)
 	struct TLD_handle_t * handle=TLD_create(0);
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_INTERCEPT_EVENT, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_policy_id\":26,\"common_service\":3,\"common_vsys_id\":26,\"common_action\":2}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":1,\"common_policy_id\":26,\"common_service\":3,\"common_vsys_id\":26,\"common_action\":2}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 }
@@ -330,7 +330,7 @@ TEST(Master, SendVoipRecord)
 	g_tsg_log_instance->vsystem_id=27;
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_VOIP_RECORD, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":27,\"common_vsys_id\":27}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":27,\"common_vsys_id\":27}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 	g_tsg_log_instance->vsystem_id=1;
@@ -349,7 +349,7 @@ TEST(Master, SendGtpCRecord)
 	g_tsg_log_instance->vsystem_id=28;
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_GTPC_RECORD, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":28,\"common_vsys_id\":28}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":28,\"common_vsys_id\":28}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 	g_tsg_log_instance->vsystem_id=1;
@@ -368,7 +368,7 @@ TEST(Master, SendBgpRecord)
 	g_tsg_log_instance->vsystem_id=29;
 	tsg_send_log(g_tsg_log_instance, handle, &a_stream, LOG_TYPE_BGP_RECORD, &rules, 1, 0);
 	EXPECT_EQ(1, rd_kafka_get_sendlog_cnt());
-	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":29,\"common_vsys_id\":29}",rd_kafka_get_sendlog_payload(0));
+	EXPECT_STREQ("{\"common_server_port\":0,\"common_client_port\":0,\"common_stream_dir\":0,\"common_address_type\":0,\"common_start_timestamp_ms\":5,\"common_end_timestamp_ms\":5,\"common_con_duration_ms\":0,\"common_stream_trace_id\":\"5\",\"common_sled_ip\":\"0.0.0.0\",\"common_t_vsys_id\":29,\"common_vsys_id\":29}",rd_kafka_get_sendlog_payload(0));
 	rd_kafka_clean_sendlog_cnt();
 	EXPECT_EQ(0, rd_kafka_get_sendlog_cnt());
 	g_tsg_log_instance->vsystem_id=1;