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>

diff --git a/tools/pkt_gen/ixnet/GeneveIxNetTemplate.xml_ClearText.xml b/3rd_party/ixia/GeneveIxNetTemplate.xml_ClearText.xml
similarity index 100%
rename from tools/pkt_gen/ixnet/GeneveIxNetTemplate.xml_ClearText.xml
rename to 3rd_party/ixia/GeneveIxNetTemplate.xml_ClearText.xml

diff --git a/tools/pkt_gen/ixnet/ixnetrfc2544.tcl b/3rd_party/ixia/ixnetrfc2544.tcl
similarity index 100%
rename from tools/pkt_gen/ixnet/ixnetrfc2544.tcl
rename to 3rd_party/ixia/ixnetrfc2544.tcl

diff --git a/tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl b/3rd_party/ixia/ixnetrfc2544v2.tcl
similarity index 100%
rename from tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl
rename to 3rd_party/ixia/ixnetrfc2544v2.tcl

diff --git a/tools/pkt_gen/ixia/pass_fail.tcl b/3rd_party/ixia/pass_fail.tcl
similarity index 100%
rename from tools/pkt_gen/ixia/pass_fail.tcl
rename to 3rd_party/ixia/pass_fail.tcl

diff --git a/3rd_party/readme.txt b/3rd_party/readme.txt
new file mode 100644 (file)
index 0000000..fc308dc
--- /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 98bce2c..8efd5aa 100644 (file)
--- 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 ceb1163..20d6b70 100755 (executable)
--- 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 cd14a2a..e36517d 100755 (executable)
--- 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 5e4ae56..52ba171 100755 (executable)
--- 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__)