aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rwxr-xr-xconf/01_testcases.conf9
-rw-r--r--conf/02_vswitch.conf1
-rw-r--r--conf/07_loadgen.conf21
3 files changed, 28 insertions, 3 deletions
diff --git a/conf/01_testcases.conf b/conf/01_testcases.conf
index df582df9..bd5ba9eb 100755
--- a/conf/01_testcases.conf
+++ b/conf/01_testcases.conf
@@ -27,9 +27,12 @@
# # ip_port.
# "Load": dictionary # Optional. Configures background load
# # during testcase execution.
+# # The tool used to generate load is
+# # defined by LOADGEN configuration.
+# # Default setting of Dummy can be found in
+# # 07_loadgen.conf.
# Description of "Load" dictionary keys, their meanings and available values:
#
-# "tool": "stress" # One of the supported load generators.
# "load": 0-100 # percentage of cores which should be
# # utilized by load generator
# # e.g. load = 70%, detected cpu cores = 14 =>
@@ -331,12 +334,12 @@ PERFORMANCE_TESTS = [
"Deployment": "p2p",
"Description": "LTD.CPU.RFC2544.0PacketLoss",
"Load" : {
- "tool" : "stress-ng",
"load" : 100,
"reserved" : 4,
"pattern" : "c",
},
"Parameters" : {
+ "LOADGEN" : "StressNg",
"TRAFFIC" : {
"traffic_type" : "rfc2544_throughput",
},
@@ -347,12 +350,12 @@ PERFORMANCE_TESTS = [
"Deployment": "p2p",
"Description": "LTD.Memory.RFC2544.0PacketLoss",
"Load" : {
- "tool" : "stress-ng",
"load" : 50,
"pattern" : "m",
"load_memory" : 80,
},
"Parameters" : {
+ "LOADGEN" : "StressNg",
"TRAFFIC" : {
"traffic_type" : "rfc2544_throughput",
},
diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf
index 92521f9a..6a830a05 100644
--- a/conf/02_vswitch.conf
+++ b/conf/02_vswitch.conf
@@ -206,6 +206,7 @@ VSWITCH_JUMBO_FRAMES_SIZE = 9000
#########################
# Set of arguments used for startup of VPP
# NOTE: DPDK socket mem allocation is driven by parameter DPDK_SOCKET_MEM
+VSWITCH_VPP_CLI_SOCK = ''
VSWITCH_VPP_ARGS = {
'unix' : [
'interactive', # required by VSPERF to detect successful VPP startup
diff --git a/conf/07_loadgen.conf b/conf/07_loadgen.conf
new file mode 100644
index 00000000..e7349a5d
--- /dev/null
+++ b/conf/07_loadgen.conf
@@ -0,0 +1,21 @@
+# Copyright 2015 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.
+
+LOADGEN_DIR = os.path.join(ROOT_DIR, 'tools/load_gen')
+
+######################################################
+# LOADGEN tool: one of DummyLoadGen, Stress, StressNg
+######################################################
+LOADGEN = "DummyLoadGen"
+######################################################