From 94ef07c3f3a80087c64ffe21b28ea6a3af092320 Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Mon, 4 Dec 2023 17:57:45 +0800 Subject: [PATCH] =?UTF-8?q?TSG-17823=20tsg-service-chaining-engines?= =?UTF-8?q?=E9=80=82=E9=85=8DSERVICE=5FCHAINING=5FCOMPILE=E8=A1=A8?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/test/test_resource/sce.json | 8 ++++---- resource/sce.json | 8 ++++---- resource/table_info.conf | 2 +- test/test_data/resource/data_pkt_mirr_block.json | 2 +- test/test_data/resource/data_pkt_mirr_bypass.json | 2 +- test/test_data/resource/data_pkt_mirr_forward.json | 2 +- test/test_data/resource/data_pkt_stee_block.json | 2 +- test/test_data/resource/data_pkt_stee_bypass.json | 2 +- test/test_data/resource/data_pkt_stee_forward.json | 2 +- test/test_data/resource/mix_pkt_stee_forward.json | 4 ++-- test/test_data/resource/sce0.json | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/platform/test/test_resource/sce.json b/platform/test/test_resource/sce.json index 08e048b..80ab78b 100644 --- a/platform/test/test_resource/sce.json +++ b/platform/test/test_resource/sce.json @@ -31,10 +31,10 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "1\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2", - "2\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1,2,3,4,5,6,7,8,9,10]}\t1\t2", - "11\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[1]}\t1\t2", - "12\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[1,2,3,4,5,6,7,8,9,10]}\t1\t2" + "1\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1", + "2\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1,2,3,4,5,6,7,8,9,10]}\t0\t1", + "11\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[1]}\t0\t1", + "12\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[1,2,3,4,5,6,7,8,9,10]}\t0\t1" ] } ] diff --git a/resource/sce.json b/resource/sce.json index 60915a8..dc2db94 100644 --- a/resource/sce.json +++ b/resource/sce.json @@ -31,10 +31,10 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "1\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2", - "2\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1,2,3,4,5,6,7,8,9,10]}\t1\t2", - "11\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[1]}\t1\t2", - "12\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[1,2,3,4,5,6,7,8,9,10]}\t1\t2" + "1\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1", + "2\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1,2,3,4,5,6,7,8,9,10]}\t0\t1", + "11\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[1]}\t0\t1", + "12\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[1,2,3,4,5,6,7,8,9,10]}\t0\t1" ] } ] diff --git a/resource/table_info.conf b/resource/table_info.conf index 2b06cac..326a7ee 100644 --- a/resource/table_info.conf +++ b/resource/table_info.conf @@ -3,7 +3,7 @@ "table_id":0, "table_name":"SERVICE_CHAINING_COMPILE", "table_type":"plugin", - "valid_column":8, + "valid_column":9, "custom":{ "key":1, "key_type":"integer", diff --git a/test/test_data/resource/data_pkt_mirr_block.json b/test/test_data/resource/data_pkt_mirr_block.json index 3583686..b816a2c 100644 --- a/test/test_data/resource/data_pkt_mirr_block.json +++ b/test/test_data/resource/data_pkt_mirr_block.json @@ -15,7 +15,7 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2" + "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1" ] } ] diff --git a/test/test_data/resource/data_pkt_mirr_bypass.json b/test/test_data/resource/data_pkt_mirr_bypass.json index de6b942..fbaa0c0 100644 --- a/test/test_data/resource/data_pkt_mirr_bypass.json +++ b/test/test_data/resource/data_pkt_mirr_bypass.json @@ -15,7 +15,7 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2" + "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1" ] } ] diff --git a/test/test_data/resource/data_pkt_mirr_forward.json b/test/test_data/resource/data_pkt_mirr_forward.json index 8426504..a7b23a0 100644 --- a/test/test_data/resource/data_pkt_mirr_forward.json +++ b/test/test_data/resource/data_pkt_mirr_forward.json @@ -15,7 +15,7 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2" + "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1" ] } ] diff --git a/test/test_data/resource/data_pkt_stee_block.json b/test/test_data/resource/data_pkt_stee_block.json index 6bde958..ae1d247 100644 --- a/test/test_data/resource/data_pkt_stee_block.json +++ b/test/test_data/resource/data_pkt_stee_block.json @@ -15,7 +15,7 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2" + "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1" ] } ] diff --git a/test/test_data/resource/data_pkt_stee_bypass.json b/test/test_data/resource/data_pkt_stee_bypass.json index 6df97e1..686d4be 100644 --- a/test/test_data/resource/data_pkt_stee_bypass.json +++ b/test/test_data/resource/data_pkt_stee_bypass.json @@ -15,7 +15,7 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2" + "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1" ] } ] diff --git a/test/test_data/resource/data_pkt_stee_forward.json b/test/test_data/resource/data_pkt_stee_forward.json index 242c2c3..9fe0da3 100644 --- a/test/test_data/resource/data_pkt_stee_forward.json +++ b/test/test_data/resource/data_pkt_stee_forward.json @@ -15,7 +15,7 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2" + "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1" ] } ] diff --git a/test/test_data/resource/mix_pkt_stee_forward.json b/test/test_data/resource/mix_pkt_stee_forward.json index b56ae73..8722598 100644 --- a/test/test_data/resource/mix_pkt_stee_forward.json +++ b/test/test_data/resource/mix_pkt_stee_forward.json @@ -17,8 +17,8 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2", - "995200\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[2]}\t1\t2" + "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1", + "995200\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"decrypted\",\"sff_profiles\":[2]}\t0\t1" ] } ] diff --git a/test/test_data/resource/sce0.json b/test/test_data/resource/sce0.json index 242c2c3..9fe0da3 100644 --- a/test/test_data/resource/sce0.json +++ b/test/test_data/resource/sce0.json @@ -15,7 +15,7 @@ { "table_name": "SERVICE_CHAINING_COMPILE", "table_content": [ - "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t1\t2" + "995199\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"targeted_traffic\":\"raw\",\"sff_profiles\":[1]}\t0\t1" ] } ]