bugfix: Harmonize test/trial RFC2544 terminology

VSPERF framework was updated to follow RFC2544 definition
of 'test' and 'trial' terms. Test parameter 'rfc2544_trials'
was replaced by new parameter 'rfc2544_tests'.
Both code and documentation were updated to reflect
these changes.

JIRA: VSPERF-300

Change-Id: I144a28359fd06394f1f87ef324458bafd5aad45f
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: <bmichalo@redhat.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/tools/pkt_gen/ixia/ixia.py b/tools/pkt_gen/ixia/ixia.py
index ae5da6d2..cd14a2a7 100755
--- a/tools/pkt_gen/ixia/ixia.py
+++ b/tools/pkt_gen/ixia/ixia.py
@@ -38,9 +38,9 @@ import tkinter
 import logging
 import os
 
+from collections import OrderedDict
 from tools.pkt_gen import trafficgen
 from conf import settings
-from collections import OrderedDict
 from core.results.results_constants import ResultsConstants
 
 _ROOT_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -252,13 +252,13 @@ class Ixia(trafficgen.ITrafficGenerator):
         """
         return self.run_tcl('stopTraffic')
 
-    def send_rfc2544_throughput(self, traffic=None, trials=3, duration=20, lossrate=0.0):
+    def send_rfc2544_throughput(self, traffic=None, tests=1, duration=20, lossrate=0.0):
         """See ITrafficGenerator for description
         """
         params = {}
 
         params['config'] = {
-            'trials': trials,
+            'tests': tests,
             'duration': duration,
             'lossrate': lossrate,
             'multipleStreams': traffic['multistream'],
diff --git a/tools/pkt_gen/ixia/pass_fail.tcl b/tools/pkt_gen/ixia/pass_fail.tcl
index acb4443f..79b7f10d 100755
--- a/tools/pkt_gen/ixia/pass_fail.tcl
+++ b/tools/pkt_gen/ixia/pass_fail.tcl
@@ -675,7 +675,10 @@ proc rfcThroughputTest { testSpec trafficSpec } {
 
     # testSpec
 
-    set numTrials               [dict get $testSpec trials]  ;# we don't use this yet
+    # RFC2544 to IXIA terminology mapping (it affects Ixia configuration below):
+    # Test    => Trial
+    # Trial   => Iteration
+    set numTrials               [dict get $testSpec tests]  ;# we don't use this yet
     set duration                [dict get $testSpec duration]
     set lossRate                [dict get $testSpec lossrate]
     set multipleStream          [dict get $testSpec multipleStreams]  ;# we don't use this yet