diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2017-11-07 09:10:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-07 09:10:43 +0000 |
| commit | 1653f5d6a12febed50f138076dcf8c191d9f24e6 (patch) | |
| tree | 522d94038ac6eaa262a8b3ca2c6fa4704db12d79 /conf | |
| parent | 1cfdb4bfbdd1ee02e6ab8bce691084d5319d5410 (diff) | |
| parent | 485ac777fd9cded7c145917bfcbe701276f3c855 (diff) | |
Merge "load_gen: Supporting loading of load_gen via loader."
Diffstat (limited to 'conf')
| -rwxr-xr-x | conf/01_testcases.conf | 9 | ||||
| -rw-r--r-- | conf/07_loadgen.conf | 21 |
2 files changed, 27 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/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" +###################################################### |