summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane/server
diff options
context:
space:
mode:
authorDan Klein <danklein10@gmail.com>2016-01-04 23:31:31 +0200
committerDan Klein <danklein10@gmail.com>2016-01-04 23:31:31 +0200
commit629b54c4c9df9c718d818a004ecf15c2cf6c770a (patch)
tree7dfc3c64c7561032d690ce6188130e80d344054e /scripts/automation/trex_control_plane/server
parent3757099103ed1bf56f85ccf5bb861a331287cbbb (diff)
parent857bdcf05a920b99e1cf180c700176b04801da00 (diff)
Merge branch 'master' into dan_stateless
Diffstat (limited to 'scripts/automation/trex_control_plane/server')
-rwxr-xr-xscripts/automation/trex_control_plane/server/outer_packages.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/automation/trex_control_plane/server/outer_packages.py b/scripts/automation/trex_control_plane/server/outer_packages.py
index 2234c734..3d4f039a 100755
--- a/scripts/automation/trex_control_plane/server/outer_packages.py
+++ b/scripts/automation/trex_control_plane/server/outer_packages.py
@@ -3,13 +3,14 @@
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'))
+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'))
+PATH_TO_PLATFORM_LIB = os.path.abspath(os.path.join(PATH_TO_PYTHON_LIB, 'platform/fedora18'))
SERVER_MODULES = ['enum34-1.0.4',
- 'jsonrpclib-pelix-0.2.5',
'zmq',
+ 'jsonrpclib-pelix-0.2.5',
'python-daemon-2.0.5',
'lockfile-0.10.2',
'termstyle'
@@ -19,6 +20,7 @@ SERVER_MODULES = ['enum34-1.0.4',
def import_server_modules():
# must be in a higher priority
sys.path.insert(0, PATH_TO_PYTHON_LIB)
+ sys.path.insert(0, PATH_TO_PLATFORM_LIB)
sys.path.append(ROOT_PATH)
import_module_list(SERVER_MODULES)
@@ -30,4 +32,6 @@ def import_module_list(modules_list):
fix_path = os.path.normcase(full_path)
sys.path.insert(1, full_path)
+
import_server_modules()
+