Addition of PROX NSB tests to yardstick

JIRA: YARDSTICK-802

Addition of PROX L2FWD_Multiflow, ACL, Load Balancing  plus
grafana dashboards

Supports 2 and 4 port Baremetal & Heat

Change-Id: I1f3990d5451de265ee3901302569c355ece3b146
Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com>

1 files changed, 65 insertions, 28 deletions

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 4d7fd1c24..49cf29ca5 100644
--- a/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg
+++ b/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg
@@ -1,40 +1,57 @@
-; Copyright (c) 2016-2017 Intel Corporation
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
+# Copyright (c) 2016-2017 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#;
 
 [eal options]
--n=4 ; force number of memory channels
+-n=4
 no-output=no ; disable DPDK debug output
 
 [port 0]
 name=p0
-mac=00:00:00:00:00:01
+mac=hardware
+promiscuous=yes
+
 [port 1]
 name=p1
-mac=00:00:00:00:00:02
+mac=hardware
+promiscuous=yes
+
 [port 2]
 name=p2
-mac=00:00:00:00:00:03
+mac=hardware
+promiscuous=yes
+
 [port 3]
 name=p3
-mac=00:00:00:00:00:04
+mac=hardware
+promiscuous=yes
 
 [defaults]
 mempool size=4K
 
+[variables]
+$sut_mac0=@@dst_mac0
+$sut_mac1=@@dst_mac1
+$sut_mac2=@@dst_mac2
+$sut_mac3=@@dst_mac3
+$qinq_tag_inline="88 a8"
+
 [global]
 start time=5
-name=ACL gen
+name=Basic ACL Gen x4
+
 [core 0]
 mode=master
 
@@ -45,7 +62,7 @@ mode=gen
 tx port=p0
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline= 00 00 00 00 00 01 70 00 00 00 00 01 88 a8 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 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
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -65,7 +82,6 @@ rand_offset=23
 ; dport: [0..511]
 random=000000000000XXX00000000XXXXXXXXX
 rand_offset=42
-lat pos=50
 
 [core 2]
 name=p1
@@ -74,7 +90,7 @@ mode=gen
 tx port=p1
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline=00 00 00 00 00 02 70 00 00 00 00 02 88 a8 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 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
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -94,16 +110,15 @@ rand_offset=23
 ; dport: [0..511]
 random=000000000000XXX00000000XXXXXXXXX
 rand_offset=42
-lat pos=50
 
 [core 3]
 name=p2
 task=0
 mode=gen
-tx port=p2
+tx port=p1
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline=00 00 00 00 00 03 70 00 00 00 00 03 88 a8 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 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
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -123,7 +138,6 @@ rand_offset=23
 ; dport: [0..511]
 random=000000000000XXX00000000XXXXXXXXX
 rand_offset=42
-lat pos=50
 
 [core 4]
 name=p3
@@ -132,7 +146,7 @@ mode=gen
 tx port=p3
 bps=625000000
 ; Ethernet + QinQ + IP + UDP
-pkt inline=00 00 00 00 00 04 70 00 00 00 00 04 88 a8 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 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
 ; svlan: [0,1]
 random=000000000000000X
 rand_offset=14
@@ -152,4 +166,27 @@ 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
+
+[core 6]
+name=rec 1
+task=0
+mode=lat
+rx port=p1
+
+[core 7]
+name=rec 2
+task=0
+mode=lat
+rx port=p2
+
+[core 8]
+name=rec 3
+task=0
+mode=lat
+rx port=p3