summaryrefslogtreecommitdiffstats
path: root/tools/pkt_gen
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2016-08-10 12:20:50 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-10 12:20:50 +0000
commitec78c5c7f8a9357e404b7207e626df97dd20efa9 (patch)
tree7a3f7141637a2197d314647db57a76d8b79616f4 /tools/pkt_gen
parent1dc40afad832bca427058380a629634aa3cb104c (diff)
parente4aca4273b3fa9ee022ceff138f2f694942db4e5 (diff)
Merge "Xena_2544_tput_options: Add options for rfc 2544 testing"
Diffstat (limited to 'tools/pkt_gen')
-rwxr-xr-xtools/pkt_gen/xena/xena.py11
-rw-r--r--tools/pkt_gen/xena/xena_json.py16
2 files changed, 27 insertions, 0 deletions
diff --git a/tools/pkt_gen/xena/xena.py b/tools/pkt_gen/xena/xena.py
index 449ef5b4..8d45053e 100755
--- a/tools/pkt_gen/xena/xena.py
+++ b/tools/pkt_gen/xena/xena.py
@@ -309,6 +309,17 @@ class Xena(ITrafficGenerator):
duration=self._duration, micro_tpld=True if self._params[
'traffic']['l2']['framesize'] == 64 else False)
j_file.enable_throughput_test()
+ j_file.modify_2544_tput_options(
+ settings.getValue('TRAFFICGEN_XENA_2544_TPUT_INIT_VALUE'),
+ settings.getValue('TRAFFICGEN_XENA_2544_TPUT_MIN_VALUE'),
+ settings.getValue('TRAFFICGEN_XENA_2544_TPUT_MAX_VALUE'),
+ settings.getValue(
+ 'TRAFFICGEN_XENA_2544_TPUT_VALUE_RESOLUTION'),
+ settings.getValue(
+ 'TRAFFICGEN_XENA_2544_TPUT_USEPASS_THRESHHOLD'),
+ settings.getValue(
+ 'TRAFFICGEN_XENA_2544_TPUT_PASS_THRESHHOLD')
+ )
elif testtype == '2544_b2b':
j_file.set_test_options_back2back(
diff --git a/tools/pkt_gen/xena/xena_json.py b/tools/pkt_gen/xena/xena_json.py
index 2a15a932..1ce7b46f 100644
--- a/tools/pkt_gen/xena/xena_json.py
+++ b/tools/pkt_gen/xena/xena_json.py
@@ -233,6 +233,22 @@ class XenaJSON(object):
self.json_data['TestOptions']['TestTypeOptionMap']['Throughput'][
'Enabled'] = 'true'
+ def modify_2544_tput_options(self, initial_value, minimum_value,
+ maximum_value, value_resolution,
+ use_pass_threshhold, pass_threshhold):
+ self.json_data['TestOptions']['TestTypeOptionMap']['Throughput'][
+ 'RateIterationOptions']['InitialValue'] = initial_value
+ self.json_data['TestOptions']['TestTypeOptionMap']['Throughput'][
+ 'RateIterationOptions']['MinimumValue'] = minimum_value
+ self.json_data['TestOptions']['TestTypeOptionMap']['Throughput'][
+ 'RateIterationOptions']['MaximumValue'] = maximum_value
+ self.json_data['TestOptions']['TestTypeOptionMap']['Throughput'][
+ 'RateIterationOptions']['ValueResolution'] = value_resolution
+ self.json_data['TestOptions']['TestTypeOptionMap']['Throughput'][
+ 'RateIterationOptions']['UsePassThreshold'] = use_pass_threshhold
+ self.json_data['TestOptions']['TestTypeOptionMap']['Throughput'][
+ 'RateIterationOptions']['PassThreshold'] = pass_threshhold
+
def set_chassis_info(self, hostname, pwd):
"""
Set the chassis info