summaryrefslogtreecommitdiffstats
path: root/tools/pkt_gen/ixnet/ixnet.py
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2016-10-14 08:18:58 +0100
committerMartin Klozik <martinx.klozik@intel.com>2016-10-14 14:00:46 +0000
commit8b0cb90e2c27d25729f8ad527a18a38db11e3073 (patch)
treedf7cb93342f9811355714951804ec933b2254028 /tools/pkt_gen/ixnet/ixnet.py
parent1eb32618a45005bf6c6669e352e95269fce6d769 (diff)
licenses: Dedicated directory for non Apache files
All files, which do not comply to Apache 2.0 license, are moved into dedicated 3rd_party directory. This will simplify license checks performed on vsperf code. It is not required to move l2fwd module from its current location. JIRA: VSPERF-413 Change-Id: I6b4bd6bb5542e6db9a7ef91ee3f5f2907f93e9b8 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: Bill Michalowski <bmichalo@redhat.com>
Diffstat (limited to 'tools/pkt_gen/ixnet/ixnet.py')
-rwxr-xr-xtools/pkt_gen/ixnet/ixnet.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/pkt_gen/ixnet/ixnet.py b/tools/pkt_gen/ixnet/ixnet.py
index 5e4ae569..52ba1712 100755
--- a/tools/pkt_gen/ixnet/ixnet.py
+++ b/tools/pkt_gen/ixnet/ixnet.py
@@ -151,11 +151,8 @@ class IxNet(trafficgen.ITrafficGenerator):
Currently only the RFC2544 tests are implemented.
"""
- if settings.getValue('TRAFFICGEN_IXNET_TCL_SCRIPT') == '':
- _script = os.path.join(os.path.dirname(__file__), 'ixnetrfc2544.tcl')
- else:
- _script = os.path.join(os.path.dirname(__file__),
- settings.getValue('TRAFFICGEN_IXNET_TCL_SCRIPT'))
+ _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__)