diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/pkt_gen/ixia/ixia.py | 9 | ||||
| -rwxr-xr-x | tools/pkt_gen/ixnet/ixnet.py | 18 | ||||
| -rw-r--r-- | tools/report/report.jinja | 1 | ||||
| -rw-r--r-- | tools/systeminfo.py | 5 |
4 files changed, 21 insertions, 12 deletions
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 diff --git a/tools/pkt_gen/ixnet/ixnet.py b/tools/pkt_gen/ixnet/ixnet.py index 52ba1712..6262a10a 100755 --- a/tools/pkt_gen/ixnet/ixnet.py +++ b/tools/pkt_gen/ixnet/ixnet.py @@ -151,13 +151,17 @@ class IxNet(trafficgen.ITrafficGenerator): Currently only the RFC2544 tests are implemented. """ - _script = os.path.join(settings.getValue('TRAFFICGEN_IXIA_3RD_PARTY'), - settings.getValue('TRAFFICGEN_IXNET_TCL_SCRIPT')) - _tclsh = tkinter.Tcl() - _cfg = None - _logger = logging.getLogger(__name__) - _params = None - _bidir = None + + def __init__(self): + """Initialize IXNET members + """ + self._script = os.path.join(settings.getValue('TRAFFICGEN_IXIA_3RD_PARTY'), + settings.getValue('TRAFFICGEN_IXNET_TCL_SCRIPT')) + self._tclsh = tkinter.Tcl() + self._cfg = None + self._logger = logging.getLogger(__name__) + self._params = None + self._bidir = None def run_tcl(self, cmd): """Run a TCL script using the TCL interpreter found in ``tkinter``. diff --git a/tools/report/report.jinja b/tools/report/report.jinja index 8354835c..c9588565 100644 --- a/tools/report/report.jinja +++ b/tools/report/report.jinja @@ -138,7 +138,6 @@ The following are the metrics obtained during this test: The following system statistics were collected during testcase execution: {% for process in test.stats %} -| --------------------------------------------------------------- | | Process: {{ "%-54s |"|format('_'.join(process.split('_')[:-1])) }} | ------------------------------ | ------------------------------ | | Statistic | Value | diff --git a/tools/systeminfo.py b/tools/systeminfo.py index fb1616d4..1d193159 100644 --- a/tools/systeminfo.py +++ b/tools/systeminfo.py @@ -228,6 +228,7 @@ def get_version(app_name): 'loopback_testpmd' : os.path.join(S.getValue('TOOLS')['dpdk_src'], 'lib/librte_eal/common/include/rte_version.h'), 'ixnet' : os.path.join(S.getValue('TRAFFICGEN_IXNET_LIB_PATH'), 'pkgIndex.tcl'), + 'ixia' : os.path.join(S.getValue('TRAFFICGEN_IXIA_ROOT_DIR'), 'lib/ixTcl1.0/ixTclHal.tcl'), } @@ -301,6 +302,10 @@ def get_version(app_name): app_version = match_line(app_version_file['ixnet'], 'package provide IxTclNetwork') if app_version: app_version = app_version.split(' ')[3] + elif app_name.lower() == 'ixia': + app_version = match_line(app_version_file['ixia'], 'package provide IxTclHal') + if app_version: + app_version = app_version.split(' ')[3] elif app_name.lower() == 'xena': try: app_version = S.getValue('XENA_VERSION') |