From: Dan Klein Date: Wed, 26 Aug 2015 15:16:09 +0000 (+0300) Subject: Merge branch 'master' into dan_stateless X-Git-Tag: v1.77~1^2^2~5 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=f8ac9d14a989c8cf1535e16165551dfa370b0b74;p=trex.git Merge branch 'master' into dan_stateless --- f8ac9d14a989c8cf1535e16165551dfa370b0b74 diff --cc scripts/automation/trex_control_plane/client_utils/outer_packages.py index 81672c91,c489fd3d..3ba73ec1 --- a/scripts/automation/trex_control_plane/client_utils/outer_packages.py +++ b/scripts/automation/trex_control_plane/client_utils/outer_packages.py @@@ -6,12 -6,9 +6,11 @@@ import o 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, - os.pardir, 'external_libs', 'python')) + PATH_TO_PYTHON_LIB = os.path.abspath(os.path.join(ROOT_PATH, os.pardir, os.pardir, 'external_libs')) -CLIENT_UTILS_MODULES = ['zmq'] +CLIENT_UTILS_MODULES = ['zmq', + 'dpkt-1.8.6.2' + ] def import_client_utils_modules():