TSG-14909 tsg-service-chaining-engine的service_function_status metrics适配vsys_id的变更

1 files changed, 17 insertions, 17 deletions

diff --git a/common/test/gtest_health_check_table.cpp b/common/test/gtest_health_check_table.cpp
index eb7224d..fa51dfa 100644
--- a/common/test/gtest_health_check_table.cpp
+++ b/common/test/gtest_health_check_table.cpp
@@ -22,7 +22,7 @@ TEST(HEALTH_CHECK_TABLE, INSERT)
 	snprintf(policy1.address, sizeof(policy1.address), "1.1.1.1");
 	policy1.retires = 11;
 	policy1.interval_ms = 111;
-	EXPECT_TRUE((session_id1 = health_check_session_add(1, &policy1)) > 0);
+	EXPECT_TRUE((session_id1 = health_check_session_add(1, 0, &policy1)) > 0);
 
 	struct health_check policy2;
 	memset(&policy2, 0, sizeof(policy2));
@@ -30,8 +30,8 @@ TEST(HEALTH_CHECK_TABLE, INSERT)
 	snprintf(policy2.address, sizeof(policy2.address), "2.2.2.2");
 	policy2.retires = 22;
 	policy2.interval_ms = 222;
-	EXPECT_TRUE((session_id2 = health_check_session_add(2, &policy2)) > 0);
-	EXPECT_TRUE((session_id3 = health_check_session_add(3, &policy2)) > 0);
+	EXPECT_TRUE((session_id2 = health_check_session_add(2, 0, &policy2)) > 0);
+	EXPECT_TRUE((session_id3 = health_check_session_add(3, 0, &policy2)) > 0);
 
 	struct health_check policy3;
 	memset(&policy3, 0, sizeof(policy3));
@@ -39,8 +39,8 @@ TEST(HEALTH_CHECK_TABLE, INSERT)
 	snprintf(policy3.address, sizeof(policy3.address), "2001:0db8:0000:0000:0000:8a2e:0370:7334");
 	policy3.retires = 33;
 	policy3.interval_ms = 333;
-	EXPECT_TRUE((session_id4 = health_check_session_add(4, &policy3)) > 0);
-	EXPECT_TRUE((session_id5 = health_check_session_add(5, &policy3)) > 0);
+	EXPECT_TRUE((session_id4 = health_check_session_add(4, 0, &policy3)) > 0);
+	EXPECT_TRUE((session_id5 = health_check_session_add(5, 0, &policy3)) > 0);
 
 	// TEST Delete By Session ID
 	EXPECT_TRUE(health_check_session_del(session_id1, 1) == 0);
@@ -63,7 +63,7 @@ TEST(HEALTH_CHECK_TABLE, GET_STATUS)
 	snprintf(policy1.address, sizeof(policy1.address), "4.4.4.4");
 	policy1.retires = 5;
 	policy1.interval_ms = 300;
-	EXPECT_TRUE((session_id1 = health_check_session_add(1, &policy1)) > 0);
+	EXPECT_TRUE((session_id1 = health_check_session_add(1, 0, &policy1)) > 0);
 
 	struct health_check policy2;
 	memset(&policy2, 0, sizeof(policy2));
@@ -71,7 +71,7 @@ TEST(HEALTH_CHECK_TABLE, GET_STATUS)
 	snprintf(policy2.address, sizeof(policy2.address), "5.5.5.5");
 	policy2.retires = 5;
 	policy2.interval_ms = 300;
-	EXPECT_TRUE((session_id2 = health_check_session_add(2, &policy2)) > 0);
+	EXPECT_TRUE((session_id2 = health_check_session_add(2, 0, &policy2)) > 0);
 
 	struct health_check policy3;
 	memset(&policy3, 0, sizeof(policy3));
@@ -79,7 +79,7 @@ TEST(HEALTH_CHECK_TABLE, GET_STATUS)
 	snprintf(policy3.address, sizeof(policy3.address), "6.6.6.6");
 	policy3.retires = 5;
 	policy3.interval_ms = 300;
-	EXPECT_TRUE((session_id3 = health_check_session_add(3, &policy3)) > 0);
+	EXPECT_TRUE((session_id3 = health_check_session_add(3, 0, &policy3)) > 0);
 
 	// TEST get status
 	EXPECT_TRUE(health_check_session_get_status(session_id1) == 0);
@@ -106,7 +106,7 @@ TEST(HEALTH_CHECK_TABLE, SET_STATUS)
 	snprintf(policy1.address, sizeof(policy1.address), "7.7.7.7");
 	policy1.retires = 5;
 	policy1.interval_ms = 300;
-	EXPECT_TRUE((session_id1 = health_check_session_add(1, &policy1)) > 0);
+	EXPECT_TRUE((session_id1 = health_check_session_add(1, 0, &policy1)) > 0);
 
 	struct health_check policy2;
 	memset(&policy2, 0, sizeof(policy2));
@@ -114,7 +114,7 @@ TEST(HEALTH_CHECK_TABLE, SET_STATUS)
 	snprintf(policy2.address, sizeof(policy2.address), "8.8.8.8");
 	policy2.retires = 5;
 	policy2.interval_ms = 300;
-	EXPECT_TRUE((session_id2 = health_check_session_add(2, &policy2)) > 0);
+	EXPECT_TRUE((session_id2 = health_check_session_add(2, 0, &policy2)) > 0);
 
 	struct health_check policy3;
 	memset(&policy3, 0, sizeof(policy3));
@@ -122,7 +122,7 @@ TEST(HEALTH_CHECK_TABLE, SET_STATUS)
 	snprintf(policy3.address, sizeof(policy3.address), "9.9.9.9");
 	policy3.retires = 5;
 	policy3.interval_ms = 300;
-	EXPECT_TRUE((session_id3 = health_check_session_add(3, &policy3)) > 0);
+	EXPECT_TRUE((session_id3 = health_check_session_add(3, 0, &policy3)) > 0);
 
 	// TEST get status
 	EXPECT_TRUE(health_check_session_get_status(session_id1) == 0);
@@ -162,7 +162,7 @@ TEST(HEALTH_CHECK_TABLE, DELETE)
 	snprintf(policy1.address, sizeof(policy1.address), "10.10.10.10");
 	policy1.retires = 5;
 	policy1.interval_ms = 300;
-	EXPECT_TRUE((session_id1 = health_check_session_add(1, &policy1)) > 0);
+	EXPECT_TRUE((session_id1 = health_check_session_add(1, 0, &policy1)) > 0);
 
 	struct health_check policy2;
 	memset(&policy2, 0, sizeof(policy2));
@@ -170,8 +170,8 @@ TEST(HEALTH_CHECK_TABLE, DELETE)
 	snprintf(policy2.address, sizeof(policy2.address), "11.11.11.11");
 	policy2.retires = 5;
 	policy2.interval_ms = 300;
-	EXPECT_TRUE((session_id2 = health_check_session_add(2, &policy2)) > 0);
-	EXPECT_TRUE((session_id3 = health_check_session_add(3, &policy2)) > 0);
+	EXPECT_TRUE((session_id2 = health_check_session_add(2, 0, &policy2)) > 0);
+	EXPECT_TRUE((session_id3 = health_check_session_add(3, 0, &policy2)) > 0);
 
 	struct health_check policy3;
 	memset(&policy3, 0, sizeof(policy3));
@@ -179,9 +179,9 @@ TEST(HEALTH_CHECK_TABLE, DELETE)
 	snprintf(policy3.address, sizeof(policy3.address), "12.12.12.12");
 	policy3.retires = 5;
 	policy3.interval_ms = 300;
-	EXPECT_TRUE((session_id4 = health_check_session_add(4, &policy3)) > 0);
-	EXPECT_TRUE((session_id5 = health_check_session_add(5, &policy3)) > 0);
-	EXPECT_TRUE((session_id6 = health_check_session_add(6, &policy3)) > 0);
+	EXPECT_TRUE((session_id4 = health_check_session_add(4, 0, &policy3)) > 0);
+	EXPECT_TRUE((session_id5 = health_check_session_add(5, 0, &policy3)) > 0);
+	EXPECT_TRUE((session_id6 = health_check_session_add(6, 0, &policy3)) > 0);
 
 	// TEST Delete By Session ID
 	EXPECT_TRUE(health_check_session_del(session_id1, 1) == 0);