Merge "Prox L2FWD multiflow test fix"

2 files changed, 70 insertions, 23 deletions

diff --git a/samples/vnf_samples/nsut/prox/configs/gen_l2fwd_multiflow-2.cfg b/samples/vnf_samples/nsut/prox/configs/gen_l2fwd_multiflow-2.cfg
index c1939c06c..fb2584e91 100644
--- a/samples/vnf_samples/nsut/prox/configs/gen_l2fwd_multiflow-2.cfg
+++ b/samples/vnf_samples/nsut/prox/configs/gen_l2fwd_multiflow-2.cfg
@@ -53,15 +53,19 @@ mode=gen
 tx port=p0
 bps=1250000000
 ; Ethernet + IP + UDP
-pkt inline=${sut_mac0} 70 00 00 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 08 55 7b
-; src_ip: 152.16.100.0/8
+pkt inline=${sut_mac0} 70 00 00 00 00 01 08 00 45 00 00 24 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 10 55 7b 00 01 02 03 04 05 06 07
+; src_ip: 152.16.100.0/28
 random=0000XXX1
 rand_offset=29
-; dst_ip: 152.16.100.0/8
+; dst_ip: 152.16.100.0/28
 random=0000XXX0
 rand_offset=33
+; src_port: 5000-5007, dst_port: 5000-5007
 random=0001001110001XXX0001001110001XXX
 rand_offset=34
+lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 2]
 name=p1
@@ -70,16 +74,19 @@ mode=gen
 tx port=p1
 bps=1250000000
 ; Ethernet + IP + UDP
-pkt inline=${sut_mac1} 70 00 00 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d 98 10 28 01 98 10 28 02 13 88 13 88 00 08 55 7b
-; src_ip: 152.16.40.0/8
-random=1001100000010000001010000000XXXX
-rand_offset=26
-; dst_ip: 152.16.40.0/8
-random=1001100000010000001010000000XXXX
-rand_offset=30
+pkt inline=${sut_mac1} 70 00 00 00 00 02 08 00 45 00 00 24 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 10 55 7b 00 01 02 03 04 05 06 07
+; src_ip: 152.16.100.0/28
+random=0000XXX1
+rand_offset=29
+; dst_ip: 152.16.100.0/28
+random=0000XXX0
+rand_offset=33
+; src_port: 5000-5007, dst_port: 5000-5007
 random=0001001110001XXX0001001110001XXX
 rand_offset=34
-
+lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 3]
 name=rec 0
@@ -87,6 +94,8 @@ task=0
 mode=lat
 rx port=p0
 lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 4]
 name=rec 1
@@ -94,3 +103,5 @@ task=0
 mode=lat
 rx port=p1
 lat pos=42
+signature pos=46
+signature=0xcafedeca
\ No newline at end of file
diff --git a/samples/vnf_samples/nsut/prox/configs/gen_l2fwd_multiflow-4.cfg b/samples/vnf_samples/nsut/prox/configs/gen_l2fwd_multiflow-4.cfg
index f1e158414..c3c7c25d7 100644
--- a/samples/vnf_samples/nsut/prox/configs/gen_l2fwd_multiflow-4.cfg
+++ b/samples/vnf_samples/nsut/prox/configs/gen_l2fwd_multiflow-4.cfg
@@ -27,21 +27,29 @@ $sut_mac3=@@dst_mac3
 [port 0]
 name=p0
 mac=hardware
+rx desc=2048
+tx desc=2048
 promiscuous=yes
 
 [port 1]
 name=p1
 mac=hardware
+rx desc=2048
+tx desc=2048
 promiscuous=yes
 
 [port 2]
 name=p2
 mac=hardware
+rx desc=2048
+tx desc=2048
 promiscuous=yes
 
 [port 3]
 name=p3
 mac=hardware
+rx desc=2048
+tx desc=2048
 promiscuous=yes
 
 [defaults]
@@ -61,15 +69,19 @@ mode=gen
 tx port=p0
 bps=1250000000
 ; Ethernet + IP + UDP
-pkt inline=${sut_mac0} 70 00 00 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 08 55 7b
-; src_ip: 152.16.100.0/8
+pkt inline=${sut_mac0} 70 00 00 00 00 01 08 00 45 00 00 24 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 10 55 7b 00 01 02 03 04 05 06 07
+; src_ip: 152.16.100.0/28
 random=0000XXX1
 rand_offset=29
-; dst_ip: 152.16.100.0/8
+; dst_ip: 152.16.100.0/28
 random=0000XXX0
 rand_offset=33
+; src_port: 5000-5007, dst_port: 5000-5007
 random=0001001110001XXX0001001110001XXX
 rand_offset=34
+lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 2]
 name=p1
@@ -78,15 +90,19 @@ mode=gen
 tx port=p1
 bps=1250000000
 ; Ethernet + IP + UDP
-pkt inline=${sut_mac1} 70 00 00 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 08 55 7b
-; src_ip: 152.16.100.0/8
+pkt inline=${sut_mac1} 70 00 00 00 00 02 08 00 45 00 00 24 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 10 55 7b 00 01 02 03 04 05 06 07
+; src_ip: 152.16.100.0/28
 random=0000XXX1
 rand_offset=29
-; dst_ip: 152.16.100.0/8
+; dst_ip: 152.16.100.0/28
 random=0000XXX0
 rand_offset=33
+; src_port: 5000-5007, dst_port: 5000-5007
 random=0001001110001XXX0001001110001XXX
 rand_offset=34
+lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 3]
 name=p2
@@ -95,15 +111,19 @@ mode=gen
 tx port=p2
 bps=1250000000
 ; Ethernet + IP + UDP
-pkt inline=${sut_mac2} 70 00 00 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 08 55 7b
-; src_ip: 152.16.100.0/8
+pkt inline=${sut_mac2} 70 00 00 00 00 03 08 00 45 00 00 24 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 10 55 7b 00 01 02 03 04 05 06 07
+; src_ip: 152.16.100.0/28
 random=0000XXX1
 rand_offset=29
-; dst_ip: 152.16.100.0/8
+; dst_ip: 152.16.100.0/28
 random=0000XXX0
 rand_offset=33
+; src_port: 5000-5007, dst_port: 5000-5007
 random=0001001110001XXX0001001110001XXX
 rand_offset=34
+lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 4]
 name=p3
@@ -112,36 +132,52 @@ mode=gen
 tx port=p3
 bps=1250000000
 ; Ethernet + IP + UDP
-pkt inline=${sut_mac3} 70 00 00 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 08 55 7b
-; src_ip: 152.16.100.0/8
+pkt inline=${sut_mac3} 70 00 00 00 00 04 08 00 45 00 00 24 00 01 00 00 40 11 f7 7d 98 10 64 01 98 10 64 02 13 88 13 88 00 10 55 7b 00 01 02 03 04 05 06 07
+; src_ip: 152.16.100.0/28
 random=0000XXX1
 rand_offset=29
-; dst_ip: 152.16.100.0/8
+; dst_ip: 152.16.100.0/28
 random=0000XXX0
 rand_offset=33
+; src_port: 5000-5007, dst_port: 5000-5007
 random=0001001110001XXX0001001110001XXX
 rand_offset=34
+lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 5]
 name=rec 0
 task=0
 mode=lat
 rx port=p0
+lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 6]
 name=rec 1
 task=0
 mode=lat
 rx port=p1
+lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 7]
 name=rec 2
 task=0
 mode=lat
 rx port=p2
+lat pos=42
+signature pos=46
+signature=0xcafedeca
 
 [core 8]
 name=rec 3
 task=0
 mode=lat
 rx port=p3
+lat pos=42
+signature pos=46
+signature=0xcafedeca