Merge branch 'adapt_rule_with_uuid' into 'rel'v3.2.1v3.2.0

Adapt rule with uuid

See merge request tango/shaping-engine!104

1 files changed, 21 insertions, 9 deletions

diff --git a/shaping/test/gtest_shaper_aqm.cpp b/shaping/test/gtest_shaper_aqm.cpp
index 6acb1f3..fd12dfe 100644
--- a/shaping/test/gtest_shaper_aqm.cpp
+++ b/shaping/test/gtest_shaper_aqm.cpp
@@ -8,12 +8,15 @@ TEST(aqm_bule, need_drop)
 {
     struct shaper_aqm_blue_para para;
     int drop_cnt = 0;
+    uuid_t uuid;
+
+    uuid_parse("00000000-0000-0000-0000-000000000001", uuid);
 
     para.update_time = 0;
     para.probability = 0;
 
     for (int i = 0; i < 10000; i++) {
-        if (shaper_aqm_blue_need_drop(0, &para, BLUE_QUEUE_LEN_MAX + 1)) {
+        if (shaper_aqm_blue_need_drop(uuid, &para, BLUE_QUEUE_LEN_MAX + 1)) {
             drop_cnt++;
         }
     }
@@ -24,7 +27,7 @@ TEST(aqm_bule, need_drop)
     EXPECT_LT(drop_cnt, 1100);
 
     sleep(3);
-    shaper_aqm_blue_need_drop(0, &para, 0);
+    shaper_aqm_blue_need_drop(uuid, &para, 0);
     EXPECT_EQ(para.probability, BLUE_INCREMENT - BLUE_DECREMENT);
 }
 
@@ -32,12 +35,15 @@ TEST(aqm_blue, no_drop)
 {
     struct shaper_aqm_blue_para para;
     int drop_cnt = 0;
+    uuid_t uuid;
+
+    uuid_parse("00000000-0000-0000-0000-000000000001", uuid);
 
     para.update_time = 0;
     para.probability = 0;
 
     for (int i = 0; i < 10000; i++) {
-        if (shaper_aqm_blue_need_drop(0, &para, BLUE_QUEUE_LEN_MAX - 1)) {
+        if (shaper_aqm_blue_need_drop(uuid, &para, BLUE_QUEUE_LEN_MAX - 1)) {
             drop_cnt++;
         }
     }
@@ -46,7 +52,7 @@ TEST(aqm_blue, no_drop)
     EXPECT_EQ(drop_cnt, 0);
 
     sleep(3);
-    shaper_aqm_blue_need_drop(0, &para, BLUE_QUEUE_LEN_MAX - 1);
+    shaper_aqm_blue_need_drop(uuid, &para, BLUE_QUEUE_LEN_MAX - 1);
     EXPECT_EQ(para.probability, 0);
 }
 
@@ -54,26 +60,29 @@ TEST(aqm_codel, need_drop)
 {
     struct shaper_aqm_codel_para para;
     int curr_time_ms = 0;
+    uuid_t uuid;
+
+    uuid_parse("00000000-0000-0000-0000-000000000001", uuid);
 
     memset(&para, 0, sizeof(para));
 
-    shaper_aqm_codel_need_drop(0, &para, curr_time_ms, CODEL_MAX_LATENCY + 1);
+    shaper_aqm_codel_need_drop(uuid, &para, curr_time_ms, CODEL_MAX_LATENCY + 1);
     EXPECT_EQ(para.state, CODEL_STATE_DROPPING_TIMER);
     EXPECT_EQ(para.start_drop_time_ms, curr_time_ms + CODEL_DROP_INTERVAL);
 
     curr_time_ms = para.start_drop_time_ms + 1;
-    shaper_aqm_codel_need_drop(0, &para, curr_time_ms, CODEL_MAX_LATENCY + 1);
+    shaper_aqm_codel_need_drop(uuid, &para, curr_time_ms, CODEL_MAX_LATENCY + 1);
     EXPECT_EQ(para.state, CODEL_STATE_DROPPING_PHASE);
     EXPECT_EQ(para.drop_count, 1);
     EXPECT_EQ(para.next_drop_time_ms, int(curr_time_ms + CODEL_DROP_INTERVAL / sqrt(para.drop_count)));
 
     curr_time_ms = para.next_drop_time_ms + 1;
-    shaper_aqm_codel_need_drop(0, &para, curr_time_ms, CODEL_MAX_LATENCY + 1);
+    shaper_aqm_codel_need_drop(uuid, &para, curr_time_ms, CODEL_MAX_LATENCY + 1);
     EXPECT_EQ(para.state, CODEL_STATE_DROPPING_PHASE);
     EXPECT_EQ(para.drop_count, 2);
     EXPECT_EQ(para.next_drop_time_ms, int(curr_time_ms + CODEL_DROP_INTERVAL / sqrt(para.drop_count)));
 
-    shaper_aqm_codel_need_drop(0, &para, curr_time_ms, CODEL_MAX_LATENCY - 1);
+    shaper_aqm_codel_need_drop(uuid, &para, curr_time_ms, CODEL_MAX_LATENCY - 1);
     EXPECT_EQ(para.state, CODEL_STATE_NORMAL);
 }
 
@@ -81,10 +90,13 @@ TEST(aqm_codel, no_drop)
 {
     struct shaper_aqm_codel_para para;
     int curr_time_ms = 0;
+    uuid_t uuid;
+
+    uuid_parse("00000000-0000-0000-0000-000000000001", uuid);
 
     memset(&para, 0, sizeof(para));
 
-    shaper_aqm_codel_need_drop(0, &para, curr_time_ms, CODEL_MAX_LATENCY - 1);
+    shaper_aqm_codel_need_drop(uuid, &para, curr_time_ms, CODEL_MAX_LATENCY - 1);
     EXPECT_EQ(para.state, CODEL_STATE_NORMAL);
     EXPECT_EQ(para.drop_count, 0);
 }