diff options
| -rwxr-xr-x | linux_dpdk/ws_main.py | 6 | ||||
| -rwxr-xr-x | scripts/automation/trex_control_plane/client/outer_packages.py | 59 | ||||
| -rw-r--r-- | scripts/automation/trex_control_plane/client/trex_stateless_sim.py | 2 | ||||
| -rwxr-xr-x | src/pal/linux/mbuf.cpp | 3 |
4 files changed, 37 insertions, 33 deletions
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 37e99cce..20a7ee1f 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -825,18 +825,20 @@ def copy_single_system1 (bld, exec_p, build_obj): files_list=[ - 'libzmq.so.3.1.0', 'libzmq.so.3', 'trex-cfg', 'bp-sim-64', 'bp-sim-64-debug', 't-rex-debug-gdb', + 'stl-sim', + 'find_python.sh' 'release_notes.pdf', 'dpdk_nic_bind.py', 'dpdk_setup_ports.py', 'doc_process.py', 'trex_daemon_server', - 'trex-console' + 'trex-console', + 'daemon_server' ]; files_dir=['cap2','avl','cfg','ko','automation', 'external_libs', 'python-lib','stl','api'] diff --git a/scripts/automation/trex_control_plane/client/outer_packages.py b/scripts/automation/trex_control_plane/client/outer_packages.py index 206d4b4c..f7e2bac9 100755 --- a/scripts/automation/trex_control_plane/client/outer_packages.py +++ b/scripts/automation/trex_control_plane/client/outer_packages.py @@ -1,29 +1,30 @@ -#!/router/bin/python
-
-import sys
-import os
-
-CURRENT_PATH = os.path.dirname(os.path.realpath(__file__))
-ROOT_PATH = os.path.abspath(os.path.join(CURRENT_PATH, os.pardir)) # path to trex_control_plane directory
-PATH_TO_PYTHON_LIB = os.path.abspath(os.path.join(ROOT_PATH, os.pardir, os.pardir, 'external_libs'))
-
-CLIENT_MODULES = ['enum34-1.0.4',
- 'jsonrpclib-pelix-0.2.5',
- 'termstyle',
- 'rpc_exceptions-0.1'
- ]
-
-
-def import_client_modules():
- sys.path.append(ROOT_PATH)
- import_module_list(CLIENT_MODULES)
-
-
-def import_module_list(modules_list):
- assert(isinstance(modules_list, list))
- for p in modules_list:
- full_path = os.path.join(PATH_TO_PYTHON_LIB, p)
- fix_path = os.path.normcase(full_path) # (CURRENT_PATH+p)
- sys.path.insert(1, full_path)
-
-import_client_modules()
+#!/router/bin/python + +import sys +import os + +CURRENT_PATH = os.path.dirname(os.path.realpath(__file__)) +ROOT_PATH = os.path.abspath(os.path.join(CURRENT_PATH, os.pardir)) # path to trex_control_plane directory +PATH_TO_PYTHON_LIB = os.path.abspath(os.path.join(ROOT_PATH, os.pardir, os.pardir, 'external_libs')) + +CLIENT_MODULES = ['enum34-1.0.4', + 'jsonrpclib-pelix-0.2.5', + 'termstyle', + 'rpc_exceptions-0.1', + 'yaml-3.11' + ] + + +def import_client_modules(): + sys.path.append(ROOT_PATH) + import_module_list(CLIENT_MODULES) + + +def import_module_list(modules_list): + assert(isinstance(modules_list, list)) + for p in modules_list: + full_path = os.path.join(PATH_TO_PYTHON_LIB, p) + fix_path = os.path.normcase(full_path) # (CURRENT_PATH+p) + sys.path.insert(1, full_path) + +import_client_modules() diff --git a/scripts/automation/trex_control_plane/client/trex_stateless_sim.py b/scripts/automation/trex_control_plane/client/trex_stateless_sim.py index 6dc2eb46..d980932a 100644 --- a/scripts/automation/trex_control_plane/client/trex_stateless_sim.py +++ b/scripts/automation/trex_control_plane/client/trex_stateless_sim.py @@ -260,7 +260,7 @@ class STLSim(object): cmd = ['valgrind', '--leak-check=full', '--error-exitcode=1'] + cmd elif self.mode == 'gdb': - cmd = ['gdb', '--args'] + cmd + cmd = ['/bin/gdb', '--args'] + cmd print "executing command: '{0}'".format(" ".join(cmd)) rc = subprocess.call(cmd) diff --git a/src/pal/linux/mbuf.cpp b/src/pal/linux/mbuf.cpp index 7e9f4775..d6fdf461 100755 --- a/src/pal/linux/mbuf.cpp +++ b/src/pal/linux/mbuf.cpp @@ -343,7 +343,8 @@ void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *md) mi->data_off = md->data_off; mi->next = NULL; - mi->pkt_len = mi->data_len; + mi->data_len = md->data_len; + mi->pkt_len = mi->data_len; mi->nb_segs = 1; } |