TSG-17801 PolicyVerify适配新增的Server FQDN和Category虚拟表

2 files changed, 73 insertions, 61 deletions

diff --git a/resource/table_info.conf b/resource/table_info.conf
index 8993208..93fa867 100644
--- a/resource/table_info.conf
+++ b/resource/table_info.conf
@@ -55,7 +55,7 @@
         "table_id":4,
         "table_name":"PXY_CTRL_COMPILE",
         "table_type":"compile",
-		"user_region_encoded":"escape",
+	"user_region_encoded":"escape",
         "valid_column":8,
         "custom": {
             "compile_id":1,
@@ -63,7 +63,7 @@
             "clause_num":9
         }
     },
-	{
+    {
         "table_id":5,
         "table_name":"PXY_CTRL_COMPILE_CONJUNCTION",
 	"db_tables":["PXY_CTRL_COMPILE"],
@@ -103,11 +103,11 @@
             "clause_index":6
         }
     },
-	{
+    {
         "table_id":8,
         "table_name":"TRAFFIC_SHAPING_COMPILE",
         "table_type":"compile",
-		"user_region_encoded":"escape",
+	"user_region_encoded":"escape",
         "valid_column":8,
         "custom": {
             "compile_id":1,
@@ -438,18 +438,20 @@
             "is_hexbin":7
         }
     },
-	{
-        "table_id":34,
-        "table_name":"ATTR_HTTP_HOST",
-        "table_type":"virtual",
+    {
+        "table_id": 34,
+        "table_name": "ATTR_HTTP_HOST_VIRTUAL",
+        "db_tables": ["ATTR_HTTP_HOST", "ATTR_DESTINATION_SERVER_FQDN"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
-	{
-        "table_id":35,
-        "table_name":"ATTR_HTTP_HOST_CAT",
-        "table_type":"virtual",
+    {
+        "table_id": 35,
+        "table_name": "ATTR_HTTP_HOST_CAT_VIRTUAL",
+        "db_tables": ["ATTR_HTTP_HOST_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
-    },		
+    },
 	{
         "table_id":36,
         "table_name":"ATTR_HTTP_URL",
@@ -480,16 +482,18 @@
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
-	{
-        "table_id":41,
-        "table_name":"ATTR_SSL_SNI",
-        "table_type":"virtual",
+    {
+        "table_id": 41,
+        "table_name": "ATTR_SSL_SNI_VIRTUAL",
+        "db_tables": ["ATTR_SSL_SNI", "ATTR_DESTINATION_SERVER_FQDN"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
-	{
-        "table_id":42,
-        "table_name":"ATTR_SSL_SNI_CAT",
-        "table_type":"virtual",
+    {
+        "table_id": 42,
+        "table_name": "ATTR_SSL_SNI_CAT_VIRTUAL",
+        "db_tables": ["ATTR_SSL_SNI_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{
@@ -522,16 +526,18 @@
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
-	{
-        "table_id":48,
-        "table_name":"ATTR_QUIC_SNI",
-        "table_type":"virtual",
+    {
+        "table_id": 48,
+        "table_name": "ATTR_QUIC_SNI_VIRTUAL",
+        "db_tables": ["ATTR_QUIC_SNI", "ATTR_DESTINATION_SERVER_FQDN"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
-	{
-        "table_id":49,
-        "table_name":"ATTR_QUIC_SNI_CAT",
-        "table_type":"virtual",
+    {
+        "table_id": 49,
+        "table_name": "ATTR_QUIC_SNI_CAT_VIRTUAL",
+        "db_tables": ["ATTR_QUIC_SNI_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{
diff --git a/resource/table_info_simple.conf b/resource/table_info_simple.conf
index 1d750b9..3535699 100644
--- a/resource/table_info_simple.conf
+++ b/resource/table_info_simple.conf
@@ -159,7 +159,7 @@
         "table_id":12,
         "table_name":"SERVICE_CHAINING_COMPILE",
         "table_type":"compile",
-		"user_region_encoded":"escape",
+	"user_region_encoded":"escape",
         "valid_column":8,
         "custom": {
             "compile_id":1,
@@ -167,13 +167,13 @@
             "clause_num":9
         }
     },
-	{
+    {
         "table_id":13,
         "table_name":"SERVICE_CHAINING_COMPILE_CONJUNCTION",
-		"db_tables":["SERVICE_CHAINING_COMPILE"],
-		"default_compile_table":1,
+	"db_tables":["SERVICE_CHAINING_COMPILE"],
+	"default_compile_table":1,
         "table_type":"compile",
-		"user_region_encoded":"escape",
+	"user_region_encoded":"escape",
         "valid_column":8,
         "custom": {
             "compile_id":1,
@@ -189,8 +189,8 @@
         "valid_column":8,
         "custom": {
             "key":1,
-			"key_type":"integer",
-			"key_len": 8
+	    "key_type":"integer",
+	    "key_len": 8
         }
     },
     {
@@ -438,18 +438,20 @@
             "is_hexbin":7
         }
     },
-	{
-        "table_id":34,
-        "table_name":"ATTR_HTTP_HOST",
-        "table_type":"virtual",
+    {
+        "table_id": 34,
+        "table_name": "ATTR_HTTP_HOST_VIRTUAL",
+        "db_tables": ["ATTR_HTTP_HOST", "ATTR_DESTINATION_SERVER_FQDN"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
-	{
-        "table_id":35,
-        "table_name":"ATTR_HTTP_HOST_CAT",
-        "table_type":"virtual",
+    {
+        "table_id": 35,
+        "table_name": "ATTR_HTTP_HOST_CAT_VIRTUAL",
+        "db_tables": ["ATTR_HTTP_HOST_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
-    },		
+    },
 	{
         "table_id":36,
         "table_name":"ATTR_HTTP_URL",
@@ -480,16 +482,18 @@
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
-	{
-        "table_id":41,
-        "table_name":"ATTR_SSL_SNI",
-        "table_type":"virtual",
+    {
+        "table_id": 41,
+        "table_name": "ATTR_SSL_SNI_VIRTUAL",
+        "db_tables": ["ATTR_SSL_SNI", "ATTR_DESTINATION_SERVER_FQDN"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
-	{
-        "table_id":42,
-        "table_name":"ATTR_SSL_SNI_CAT",
-        "table_type":"virtual",
+    {
+        "table_id": 42,
+        "table_name": "ATTR_SSL_SNI_CAT_VIRTUAL",
+        "db_tables": ["ATTR_SSL_SNI_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{
@@ -522,16 +526,18 @@
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
-	{
-        "table_id":48,
-        "table_name":"ATTR_QUIC_SNI",
-        "table_type":"virtual",
+    {
+        "table_id": 48,
+        "table_name": "ATTR_QUIC_SNI_VIRTUAL",
+        "db_tables": ["ATTR_QUIC_SNI", "ATTR_DESTINATION_SERVER_FQDN"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
-	{
-        "table_id":49,
-        "table_name":"ATTR_QUIC_SNI_CAT",
-        "table_type":"virtual",
+    {
+        "table_id": 49,
+        "table_name": "ATTR_QUIC_SNI_CAT_VIRTUAL",
+        "db_tables": ["ATTR_QUIC_SNI_CAT", "ATTR_DESTINATION_SERVER_FQDN_CAT"],
+        "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{