diff options
| -rwxr-xr-x | 3rd_party/ixia/GeneveIxNetTemplate.xml_ClearText.xml (renamed from tools/pkt_gen/ixnet/GeneveIxNetTemplate.xml_ClearText.xml) | 0 | ||||
| -rw-r--r-- | 3rd_party/ixia/ixnetrfc2544.tcl (renamed from tools/pkt_gen/ixnet/ixnetrfc2544.tcl) | 0 | ||||
| -rwxr-xr-x | 3rd_party/ixia/ixnetrfc2544v2.tcl (renamed from tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl) | 0 | ||||
| -rwxr-xr-x | 3rd_party/ixia/pass_fail.tcl (renamed from tools/pkt_gen/ixia/pass_fail.tcl) | 0 | ||||
| -rw-r--r-- | 3rd_party/readme.txt | 1 | ||||
| -rw-r--r-- | conf/03_traffic.conf | 4 | ||||
| -rwxr-xr-x | docs/userguide/integration.rst | 2 | ||||
| -rwxr-xr-x | tools/pkt_gen/ixia/ixia.py | 3 | ||||
| -rwxr-xr-x | tools/pkt_gen/ixnet/ixnet.py | 7 |
9 files changed, 10 insertions, 7 deletions
diff --git a/tools/pkt_gen/ixnet/GeneveIxNetTemplate.xml_ClearText.xml b/3rd_party/ixia/GeneveIxNetTemplate.xml_ClearText.xml index 56539d31..56539d31 100755 --- a/tools/pkt_gen/ixnet/GeneveIxNetTemplate.xml_ClearText.xml +++ b/3rd_party/ixia/GeneveIxNetTemplate.xml_ClearText.xml diff --git a/tools/pkt_gen/ixnet/ixnetrfc2544.tcl b/3rd_party/ixia/ixnetrfc2544.tcl index e70ca874..e70ca874 100644 --- a/tools/pkt_gen/ixnet/ixnetrfc2544.tcl +++ b/3rd_party/ixia/ixnetrfc2544.tcl diff --git a/tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl b/3rd_party/ixia/ixnetrfc2544v2.tcl index 539c5a5b..539c5a5b 100755 --- a/tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl +++ b/3rd_party/ixia/ixnetrfc2544v2.tcl diff --git a/tools/pkt_gen/ixia/pass_fail.tcl b/3rd_party/ixia/pass_fail.tcl index 79b7f10d..79b7f10d 100755 --- a/tools/pkt_gen/ixia/pass_fail.tcl +++ b/3rd_party/ixia/pass_fail.tcl diff --git a/3rd_party/readme.txt b/3rd_party/readme.txt new file mode 100644 index 00000000..fc308dc8 --- /dev/null +++ b/3rd_party/readme.txt @@ -0,0 +1 @@ +Here are located files and scripts, which are not released under Apache 2.0 license. diff --git a/conf/03_traffic.conf b/conf/03_traffic.conf index 98bce2c5..8efd5aab 100644 --- a/conf/03_traffic.conf +++ b/conf/03_traffic.conf @@ -61,6 +61,10 @@ TRAFFICGEN_IXNET_TESTER_RESULT_DIR = '' # as the previous one TRAFFICGEN_IXNET_DUT_RESULT_DIR = '' +# directory with 3rd party scripts generated by IXIA tools +TRAFFICGEN_IXIA_3RD_PARTY = os.path.join(ROOT_DIR, '3rd_party/ixia') + +# default TCL script, which will be used for IXNETWORK configuration TRAFFICGEN_IXNET_TCL_SCRIPT = 'ixnetrfc2544.tcl' ########################################### diff --git a/docs/userguide/integration.rst b/docs/userguide/integration.rst index ceb11635..20d6b70c 100755 --- a/docs/userguide/integration.rst +++ b/docs/userguide/integration.rst @@ -801,7 +801,7 @@ To import the template do: 2. Click on the Traffic menu 3. Click on the Traffic actions and click Edit Packet Templates 4. On the Template editor window, click Import. Select the template - tools/pkt_gen/ixnet/GeneveIxNetTemplate.xml_ClearText.xml + located at ``3rd_party/ixia/GeneveIxNetTemplate.xml_ClearText.xml`` and click import. 5. Restart the TCL Server. diff --git a/tools/pkt_gen/ixia/ixia.py b/tools/pkt_gen/ixia/ixia.py index cd14a2a7..e36517d6 100755 --- a/tools/pkt_gen/ixia/ixia.py +++ b/tools/pkt_gen/ixia/ixia.py @@ -131,7 +131,8 @@ class Ixia(trafficgen.ITrafficGenerator): Runs different traffic generator tests through an Ixia traffic generator chassis by generating TCL scripts from templates. """ - _script = os.path.join(os.path.dirname(__file__), 'pass_fail.tcl') + _script = os.path.join(settings.getValue('TRAFFICGEN_IXIA_3RD_PARTY'), + 'pass_fail.tcl') _tclsh = tkinter.Tcl() _logger = logging.getLogger(__name__) 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__) |