diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2017-06-02 14:56:43 +0100 |
|---|---|---|
| committer | Martin Klozik <martinx.klozik@intel.com> | 2017-06-02 15:08:19 +0100 |
| commit | 0975aa2ec9baf2e852be7991f62ba40865997456 (patch) | |
| tree | f643428da35793e15010367a1e9e51c70cdc64ef /tools/systeminfo.py | |
| parent | 862ef28b808aca4dd75cc44a83023362dcce1969 (diff) | |
ixia: Fix IXIA in trafficgen mode
There are two IXIA wrappers in VSPERF - IxNET and Ixia. It has
been found that legacy Ixia implementation is no longer working
in trafficgen mode. This issues has been fixed.
JIRA: VSPERF-513
Change-Id: Ief1db71f688a19c5b41508617ccbc73024a02c48
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
Reviewed-by: Trevor Cooper <trevor.cooper@intel.com>
Diffstat (limited to 'tools/systeminfo.py')
| -rw-r--r-- | tools/systeminfo.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/systeminfo.py b/tools/systeminfo.py index 575dd87e..20ba7ba7 100644 --- a/tools/systeminfo.py +++ b/tools/systeminfo.py @@ -227,8 +227,6 @@ def get_version(app_name): 'testpmd' : r'RTE Version: \'\S+ ([0-9.]+)', 'qemu' : r'QEMU emulator version ([0-9.]+)', 'loopback_l2fwd' : os.path.join(S.getValue('ROOT_DIR'), 'src/l2fwd/l2fwd.c'), - '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'), } @@ -255,7 +253,12 @@ def get_version(app_name): # stored at TOOS['dpdk_src'] directory tmp_ver = ['', '', ''] dpdk_16 = False - with open(app_version_file['loopback_testpmd']) as file_: + # TOOLS dictionary is created during runtime and it is not + # available in some vsperf modes (e.g. -m trafficgen), thus + # following definition can't be part of app_version_file dict above + app_file = os.path.join(S.getValue('TOOLS')['dpdk_src'], + 'lib/librte_eal/common/include/rte_version.h') + with open(app_file) as file_: for line in file_: if not line.strip(): continue |