TSG-22949 Distinguish between source and destination when acquiring tag for ip address TSG-23127 Adapt VerifyPolicy to interface structure changes.

1 files changed, 75 insertions, 24 deletions

diff --git a/test/verify_policy_test.cpp b/test/verify_policy_test.cpp
index d46c396..adc0d90 100644
--- a/test/verify_policy_test.cpp
+++ b/test/verify_policy_test.cpp
@@ -89,7 +89,7 @@ static char *select_hit_policy_request_item(int gtest_id)
 
 TEST(LibrarySearch, HitFqdnEntry)
 {
-	const char *hit_policy_request = "{\"ip\":null,\"fqdn\":\"www.126.com\",\"vsys_id\":1}";
+	const char *hit_policy_request = "{\"ip\":null,\"fqdn\":\"www.126.com\",\"vsys\":1}";
 	const char *hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"tag_uuids\":\"00000001-0000-0000-0000-000000000000\"}]},\"success\":true}";
 
 	cJSON *result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
@@ -104,7 +104,7 @@ TEST(LibrarySearch, HitFqdnEntry)
 	cJSON_Delete(result_json);
 	FREE(&hit_policy_list);
 
-	hit_policy_request = "{\"ip\":null,\"fqdn\":\"www.baidu.com\",\"vsys_id\":1}";
+	hit_policy_request = "{\"ip\":null,\"fqdn\":\"www.baidu.com\",\"vsys\":1}";
 	hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"tag_uuids\":\"00000002-0000-0000-0000-000000000000,00000003-0000-0000-0000-000000000000\"}]},\"success\":true}";
 
 	result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
@@ -119,7 +119,7 @@ TEST(LibrarySearch, HitFqdnEntry)
 	cJSON_Delete(result_json);
 	FREE(&hit_policy_list);
 
-	hit_policy_request = "{\"ip\":null,\"fqdn\":\"www.qq.com\",\"vsys_id\":1}";
+	hit_policy_request = "{\"ip\":null,\"fqdn\":\"www.qq.com\",\"vsys\":1}";
 	hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"tag_uuids\":\"00000004-0000-0000-0000-000000000000,00000005-0000-0000-0000-000000000000,00000006-0000-0000-0000-000000000000\"}]},\"success\":true}";
 
 	result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
@@ -137,7 +137,7 @@ TEST(LibrarySearch, HitFqdnEntry)
 
 TEST(LibrarySearch, HitIpEntry)
 {
-	const char *hit_policy_request = "{\"ip\":\"192.168.1.1\",\"fqdn\":null,\"vsys_id\":1}";
+	const char *hit_policy_request = "{\"ip\":\"192.168.1.1\",\"fqdn\":null,\"vsys\":1}";
 	const char *hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"tag_uuids\":\"00000011-0000-0000-0000-000000000000\"}]},\"success\":true}";
 	
 	cJSON *result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
@@ -153,7 +153,7 @@ TEST(LibrarySearch, HitIpEntry)
 	cJSON_Delete(result_json);
 	FREE(&hit_policy_list);
 
-	hit_policy_request ="{\"ip\":\"192.168.1.2\",\"fqdn\":null,\"vsys_id\":1}";
+	hit_policy_request ="{\"ip\":\"192.168.1.2\",\"fqdn\":null,\"vsys\":1}";
 	hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"tag_uuids\":\"00000012-0000-0000-0000-000000000000,00000013-0000-0000-0000-000000000000\"}]},\"success\":true}";
 
 	result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
@@ -169,7 +169,7 @@ TEST(LibrarySearch, HitIpEntry)
 	cJSON_Delete(result_json);
 	FREE(&hit_policy_list);
 
-	hit_policy_request = "{\"ip\":\"192.168.1.3\",\"fqdn\":null,\"vsys_id\":1}";
+	hit_policy_request = "{\"ip\":\"192.168.1.3\",\"fqdn\":null,\"vsys\":1}";
 	hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"tag_uuids\":\"00000014-0000-0000-0000-000000000000,00000015-0000-0000-0000-000000000000,00000016-0000-0000-0000-000000000000\"}]},\"success\":true}";
 
 	result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
@@ -236,6 +236,57 @@ TEST(VerifyPolicy, CheckRegexExpression)
 	FREE(&hit_policy_query);
 }
 
+TEST(VerifyPolicy, HitIpAddrPolicy)
+{
+	char *hit_policy_request = select_hit_policy_request_item(9);
+	ASSERT_TRUE(hit_policy_request != NULL);
+	char *hit_policy_result = select_hit_policy_result_item(9);
+	ASSERT_TRUE(hit_policy_result != NULL);
+
+	cJSON *result_json = get_verify_policy_query(hit_policy_request, strlen(hit_policy_request), 1);
+	ASSERT_TRUE(result_json != NULL);
+
+	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
+	ASSERT_TRUE(hit_policy_query != NULL);
+
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
+	EXPECT_EQ(equal, 0);
+
+	cJSON_Delete(result_json);
+	FREE(&hit_policy_query);
+	FREE(&hit_policy_request);
+	FREE(&hit_policy_result);
+}
+
+TEST(VerifyPolicy, HitNegateIpAddrPolicy)
+{
+	
+}
+
+TEST(VerifyPolicy, HitIntegerPolicy)
+{
+
+
+}
+
+TEST(VerifyPolicy, HitStringPolicy)
+{
+
+
+}
+
+TEST(VerifyPolicy, HitObjectPolicy)
+{
+
+
+}
+
+TEST(VerifyPolicy, HitGroupPolicy)
+{
+
+
+}
+
 TEST(VerifyPolicy, HitIpPolicy)
 {
 	char *hit_policy_request = select_hit_policy_request_item(0);
@@ -249,10 +300,10 @@ TEST(VerifyPolicy, HitIpPolicy)
 	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
 	ASSERT_TRUE(hit_policy_query != NULL);
 
-	printf("hit_policy_query = %s\n", hit_policy_query);
-	printf("hit_policy_result = %s\n", hit_policy_result);
+	printf("hit_policy_query = %s\n", hit_policy_query+2);
+	printf("hit_policy_result = %s\n", hit_policy_result+16);
 
-	int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
 	EXPECT_EQ(equal, 0);
 
 	cJSON_Delete(result_json);
@@ -274,10 +325,10 @@ TEST(VerifyPolicy, HitLibraryPolicy)
 	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
 	ASSERT_TRUE(hit_policy_query != NULL);
 
-	printf("hit_policy_query = %s\n", hit_policy_query);
-	printf("hit_policy_result = %s\n", hit_policy_result);
+	//printf("hit_policy_query = %s\n", hit_policy_query);
+	//printf("hit_policy_result = %s\n", hit_policy_result);
 
-	int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
 	EXPECT_EQ(equal, 0);
 
 	cJSON_Delete(result_json);
@@ -299,10 +350,10 @@ TEST(VerifyPolicy, HitMultiplePolicy)
 	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
 	ASSERT_TRUE(hit_policy_query != NULL);
 
-	printf("hit_policy_query = %s\n", hit_policy_query);
-	printf("hit_policy_result = %s\n", hit_policy_result);
+	//printf("hit_policy_query = %s\n", hit_policy_query);
+	//printf("hit_policy_result = %s\n", hit_policy_result);
 
-	int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
 	EXPECT_EQ(equal, 0);
 
 	cJSON_Delete(result_json);
@@ -324,7 +375,7 @@ TEST(VerifyPolicy, HitTunnelEndpointaPolicy_1025)
 	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
 	ASSERT_TRUE(hit_policy_query != NULL);
 
-	int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
 	EXPECT_EQ(equal, 0);
 
 	cJSON_Delete(result_json);
@@ -346,7 +397,7 @@ TEST(VerifyPolicy, HitTunnelEndpointaPolicy_1027)
 	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
 	ASSERT_TRUE(hit_policy_query != NULL);
 
-	int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
 	EXPECT_EQ(equal, 0);
 
 	cJSON_Delete(result_json);
@@ -369,7 +420,7 @@ TEST(VerifyPolicy, HitTunnelEndpointaPolicy)
 	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
 	ASSERT_TRUE(hit_policy_query != NULL);
 
-	int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
 	EXPECT_EQ(equal, 0);
 
 	cJSON_Delete(result_json);
@@ -391,7 +442,7 @@ TEST(VerifyPolicy, HitTunnelEndpointbPolicy)
 	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
 	ASSERT_TRUE(hit_policy_query != NULL);
 
-	int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
 	EXPECT_EQ(equal, 0);
 
 	cJSON_Delete(result_json);
@@ -413,7 +464,7 @@ TEST(VerifyPolicy, HitTunnelEndpointPolicy)
 	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
 	ASSERT_TRUE(hit_policy_query != NULL);
 
-	int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
 	EXPECT_EQ(equal, 0);
 
 	cJSON_Delete(result_json);
@@ -435,11 +486,11 @@ TEST(VerifyPolicy, HitAllObjectPolicy)
 	char *hit_policy_query = cJSON_PrintUnformatted(result_json);
 	ASSERT_TRUE(hit_policy_query != NULL);
 
-	printf("hit_policy_request = %s\n", hit_policy_request);
-	printf("hit_policy_query = %s\n", hit_policy_query);
-	printf("hit_policy_result = %s\n", hit_policy_result);
+	//printf("hit_policy_request = %s\n", hit_policy_request);
+	//printf("hit_policy_query = %s\n", hit_policy_query);
+	//printf("hit_policy_result = %s\n", hit_policy_result);
 
-	int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
+	int equal = strncasecmp(hit_policy_query+2, hit_policy_result+16, strlen(hit_policy_result));
 	EXPECT_EQ(equal, 0);
 
 	cJSON_Delete(result_json);