From 131fd1cccc824371fa3b1e7a8477818a03fa1d35 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Thu, 3 Nov 2016 15:57:10 +0000 Subject: bugfix: Trafficgen Ixia does not work IXIA traffic generator can be controlled by two different VSPERF's wrappers IxNet (preferred) and Ixia (legacy and outdated). It has been found, that Ixia wrapper can't be used because of missing "packetsize" traffic item. Also only IXIA OS 6.60 was supported and never IXIA OS versions were not working. Both limitations were fixed. Also reported results were fixed to show correct values for MBPS items. JIRA: VSPERF-417 Change-Id: I191aa9fee2683877ce373b6aa7cd1c72e9847568 Signed-off-by: Martin Klozik Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Bill Michalowski Reviewed-by: Christo Kleu --- tools/pkt_gen/ixia/ixia.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools/pkt_gen') diff --git a/tools/pkt_gen/ixia/ixia.py b/tools/pkt_gen/ixia/ixia.py index e36517d6..5c5fb3df 100755 --- a/tools/pkt_gen/ixia/ixia.py +++ b/tools/pkt_gen/ixia/ixia.py @@ -19,7 +19,7 @@ lifting". This requires the following settings in your config file: -* TRAFFICGEN_IXIA_LIB_PATH +* TRAFFICGEN_IXIA_ROOT_DIR IXIA libraries path * TRAFFICGEN_IXIA_HOST IXIA chassis IP address @@ -39,6 +39,7 @@ import logging import os from collections import OrderedDict +from tools import systeminfo from tools.pkt_gen import trafficgen from conf import settings from core.results.results_constants import ResultsConstants @@ -76,7 +77,7 @@ def configure_env(): os.environ['IXIA_LOGS_DIR'] = '/tmp/Ixia/Logs' os.environ['IXIA_TCL_DIR'] = os.path.expandvars('$IxiaLibPath') os.environ['IXIA_SAMPLES'] = os.path.expandvars('$IxiaLibPath/ixTcl1.0') - os.environ['IXIA_VERSION'] = '6.60.1000.11' + os.environ['IXIA_VERSION'] = systeminfo.get_version('Ixia')['version'] def _build_set_cmds(values, prefix='dict set'): @@ -299,8 +300,8 @@ class Ixia(trafficgen.ITrafficGenerator): # metrics so we have to return dummy values for these metrics result_dict[ResultsConstants.THROUGHPUT_RX_FPS] = result[4] result_dict[ResultsConstants.TX_RATE_FPS] = result[5] - result_dict[ResultsConstants.THROUGHPUT_RX_MBPS] = result[6] - result_dict[ResultsConstants.TX_RATE_MBPS] = result[7] + result_dict[ResultsConstants.THROUGHPUT_RX_MBPS] = str(round(int(result[6]) / 1000000, 3)) + result_dict[ResultsConstants.TX_RATE_MBPS] = str(round(int(result[7]) / 1000000, 3)) result_dict[ResultsConstants.FRAME_LOSS_PERCENT] = loss_rate result_dict[ResultsConstants.TX_RATE_PERCENT] = \ ResultsConstants.UNKNOWN_VALUE -- cgit 1.2.3-korg