summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author刘畅 <[email protected]>2023-12-04 10:38:08 +0000
committer刘畅 <[email protected]>2023-12-04 10:38:08 +0000
commit7c7979f8bf120f6c0e92b683edd5fbc10fd0764c (patch)
tree6a70e0503df59aa4643ad1a7f51fac1dbcba29e3
parent99145fdb2f22bb82516ede7f90e3b4652ec162f6 (diff)
parent183eae4bf95f6d60167c56d2bedf4d60e097f1d3 (diff)
Merge branch 'update_compile_table_info' into 'rel'v1.3.10
change table info to adapt new struct of compile table See merge request tango/shaping-engine!56
-rw-r--r--conf/shaping_maat.json1
-rw-r--r--conf/table_info.json2
-rw-r--r--shaping/test/gtest_shaper_maat.cpp1
3 files changed, 3 insertions, 1 deletions
diff --git a/conf/shaping_maat.json b/conf/shaping_maat.json
index 9d518f9..ad01d58 100644
--- a/conf/shaping_maat.json
+++ b/conf/shaping_maat.json
@@ -11,6 +11,7 @@
"do_log": 1,
"effective_rage": 0,
"user_region": "{\"priority\":1,\"fair_factor\":10,\"profile_chain\":[1]}",
+ "group_num" : 0,
"is_valid": "yes",
"groups": [
{
diff --git a/conf/table_info.json b/conf/table_info.json
index 692f4f6..a792caa 100644
--- a/conf/table_info.json
+++ b/conf/table_info.json
@@ -7,7 +7,7 @@
"custom": {
"key": 1,
"key_type": "integer",
- "key_len": 8
+ "key_len": 9
}
},
{
diff --git a/shaping/test/gtest_shaper_maat.cpp b/shaping/test/gtest_shaper_maat.cpp
index 80b91de..17a31ed 100644
--- a/shaping/test/gtest_shaper_maat.cpp
+++ b/shaping/test/gtest_shaper_maat.cpp
@@ -14,6 +14,7 @@ TEST(shaping_rule, parse)
1\t\
{}\t\
{\"vsys_id\":2333,\"priority\":1,\"fair_factor\":10,\"profile_chain\":[1,2,3]}\t\
+ 0\t\
1\t\
}";