Skip to content

Commit d784ff4

Browse files
author
Damir Zainullin
committed
Biflow aggregator - Add UNIQUE_COUNT tests
1 parent f314ce1 commit d784ff4

File tree

10 files changed

+31
-1
lines changed

10 files changed

+31
-1
lines changed

biflow_aggregator/tests/config.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
<type>SUM</type>
66
<name>PACKETS</name>
77
</field>
8+
</id>
9+
<id name="unique_count">
10+
<field>
11+
<type>UNIQUE_COUNT</type>
12+
<name>TEST</name>
13+
<size>1000</size>
14+
</field>
815
</id>
916
<id name="generic_flow_key_min_ports">
1017
<field>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ipaddr DST_IP,ipaddr SRC_IP,uint32 TEST,time TIME_FIRST,time TIME_LAST
2+
192.168.1.1,192.168.1.2,7,2016-10-28T17:00:1.0,2016-10-28T17:00:7.0
3+
192.168.1.5,192.168.1.6,666,2016-10-28T17:00:3.0,2016-10-28T17:00:11.0
4+
192.168.1.5,192.168.1.6,666,2016-10-28T17:00:3.0,2016-10-28T17:00:18.0
5+
192.168.1.5,192.168.1.6,6,2016-10-28T17:00:3.0,2016-10-28T17:00:19.0
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ipaddr DST_IP,ipaddr SRC_IP,string TEST,time TIME_FIRST,time TIME_LAST
2+
192.168.1.1,192.168.1.2,"x",2016-10-28T17:00:1.0,2016-10-28T17:00:7.0
3+
192.168.1.5,192.168.1.6,,2016-10-28T17:00:3.0,2016-10-28T17:00:11.0
4+
192.168.1.5,192.168.1.6,"y",2016-10-28T17:00:3.0,2016-10-28T17:00:18.0
5+
192.168.1.5,192.168.1.6,"y",2016-10-28T17:00:3.0,2016-10-28T17:00:22.0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2016-10-28T17:00:01.000000,2016-10-28T17:00:19.000000,4,3
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2016-10-28T17:00:01.000000,2016-10-28T17:00:07.000000,1,1
2+
2016-10-28T17:00:03.000000,2016-10-28T17:00:11.000000,1,1
3+
2016-10-28T17:00:03.000000,2016-10-28T17:00:19.000000,2,2
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2016-10-28T17:00:01.000000,2016-10-28T17:00:11.000000,2,2
2+
2016-10-28T17:00:03.000000,2016-10-28T17:00:19.000000,2,2
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2016-10-28T17:00:01.000000,2016-10-28T17:00:22.000000,4,2
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2016-10-28T17:00:01.000000,2016-10-28T17:00:07.000000,1,1
2+
2016-10-28T17:00:03.000000,2016-10-28T17:00:11.000000,1,0
3+
2016-10-28T17:00:03.000000,2016-10-28T17:00:18.000000,1,1
4+
2016-10-28T17:00:03.000000,2016-10-28T17:00:22.000000,1,1
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2016-10-28T17:00:01.000000,2016-10-28T17:00:11.000000,2,1
2+
2016-10-28T17:00:03.000000,2016-10-28T17:00:22.000000,2,1

biflow_aggregator/tests/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ run_test_with_global_timeout() {
3232
sleep 0.5
3333
die_if_not_running $LOGREPLAY_PID "Failed to start logreplay"
3434

35-
sleep 2
35+
sleep 3
3636
wait $LOGREPLAY_PID
3737
kill $AGGREGATOR_PID 2>/dev/null
3838
sleep 0.2

0 commit comments

Comments
 (0)