From 7bc7bfb1b43e6329bbfc0ed7a7c5554ebcf10c2b Mon Sep 17 00:00:00 2001
From: Patrice Buriez <patrice.buriez@intel.com>
Date: Fri, 12 Oct 2018 19:03:33 +0200
Subject: Fix latency for ACL test cases

JIRA: YARDSTICK-1460

Cores running "mode=lat" must be properly configured with a correct
"lat pos" parameter. When this parameter is missing, PROX exits with
an error message.
When the "lat pos" parameter is missing for cores running "mode=gen",
latency values are not written into the packets.
Also fixed some typos, packet inline format, IP len and UDP len.

Change-Id: Ice06c5d74686c80f09bc60f568993dbf3165b338
Signed-off-by: Patrice Buriez <patrice.buriez@intel.com>
---
 samples/vnf_samples/nsut/prox/configs/gen_acl-2.cfg |  9 +++++----
 samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/samples/vnf_samples/nsut/prox/configs/gen_acl-2.cfg b/samples/vnf_samples/nsut/prox/configs/gen_acl-2.cfg
index 816bb3297..bf49cd484 100644
--- a/samples/vnf_samples/nsut/prox/configs/gen_acl-2.cfg
+++ b/samples/vnf_samples/nsut/prox/configs/gen_acl-2.cfg
@@ -38,7 +38,7 @@ $qinq_tag_inline="88 a8"
 
 [global]
 start time=5
-name=Basic Gen
+name=Basic ACL Gen x2
 
 [core 0]
 mode=master
@@ -50,7 +50,7 @@ mode=gen
 tx port=p0
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline=${sut_mac0} 70 00 00 00 00 01 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 08 7c 21  FFFFFFFF
+pkt inline=${sut_mac0} 70 00 00 00 00 01 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 20 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 0c 7c 21 50 51 52 53
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -72,7 +72,6 @@ random=000000000000XXX00000000XXXXXXXXX
 rand_offset=42
 lat pos=50
 
-
 [core 2]
 name=p1
 task=0
@@ -80,7 +79,7 @@ mode=gen
 tx port=p1
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline=${sut_mac1} 70 00 00 00 00 02 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 08 7c 21  FFFFFFFF
+pkt inline=${sut_mac1} 70 00 00 00 00 02 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 20 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 0c 7c 21 50 51 52 53
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -107,10 +106,12 @@ name=rec 0
 task=0
 mode=lat
 rx port=p0
+lat pos=50
 
 [core 4]
 name=rec 1
 task=0
 mode=lat
 rx port=p1
+lat pos=50
 
diff --git a/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg b/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg
index bcfdb5028..6c5939356 100644
--- a/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg
+++ b/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg
@@ -62,7 +62,7 @@ mode=gen
 tx port=p0
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline=${sut_mac0} 70 00 00 00 00 01 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 08 7c 21  FFFFFFFF
+pkt inline=${sut_mac0} 70 00 00 00 00 01 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 20 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 0c 7c 21 50 51 52 53
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -82,6 +82,7 @@ rand_offset=23
 ; dport: [0..511]
 random=000000000000XXX00000000XXXXXXXXX
 rand_offset=42
+lat pos=50
 
 [core 2]
 name=p1
@@ -90,7 +91,7 @@ mode=gen
 tx port=p1
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline=${sut_mac1} 70 00 00 00 00 02 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 08 7c 21  FFFFFFFF
+pkt inline=${sut_mac1} 70 00 00 00 00 02 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 20 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 0c 7c 21 50 51 52 53
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -110,6 +111,7 @@ rand_offset=23
 ; dport: [0..511]
 random=000000000000XXX00000000XXXXXXXXX
 rand_offset=42
+lat pos=50
 
 [core 3]
 name=p2
@@ -118,7 +120,7 @@ mode=gen
 tx port=p2
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline=${sut_mac2} 70 00 00 00 00 02 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 08 7c 21  FFFFFFFF
+pkt inline=${sut_mac2} 70 00 00 00 00 03 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 20 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 0c 7c 21 50 51 52 53
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -138,6 +140,7 @@ rand_offset=23
 ; dport: [0..511]
 random=000000000000XXX00000000XXXXXXXXX
 rand_offset=42
+lat pos=50
 
 [core 4]
 name=p3
@@ -146,7 +149,7 @@ mode=gen
 tx port=p3
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline=${sut_mac3} 70 00 00 00 00 04 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 08 7c 21  FFFFFFFF
+pkt inline=${sut_mac3} 70 00 00 00 00 04 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 20 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 0c 7c 21 50 51 52 53
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -166,27 +169,33 @@ rand_offset=23
 ; dport: [0..511]
 random=000000000000XXX00000000XXXXXXXXX
 rand_offset=42
+lat pos=50
 
 [core 5]
 name=rec 0
 task=0
 mode=lat
 rx port=p0
+lat pos=50
 
 [core 6]
 name=rec 1
 task=0
 mode=lat
 rx port=p1
+lat pos=50
 
 [core 7]
 name=rec 2
 task=0
 mode=lat
 rx port=p2
+lat pos=50
 
 [core 8]
 name=rec 3
 task=0
 mode=lat
 rx port=p3
+lat pos=50
+
-- 
cgit 1.2.3-korg