Merge remote-tracking branch

Conflicts:
	linux/b
	linux/ws_main.py
	linux_dpdk/ws_main.py
	src/bp_sim.h

1 files changed, 15 insertions, 14 deletions

diff --git a/scripts/automation/trex_control_plane/client/outer_packages.py b/scripts/automation/trex_control_plane/client/outer_packages.py
index a7c34e48..5facad20 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,site

-import platform,os

+import sys

+import site

+import os

 

-CURRENT_PATH        = os.path.dirname(os.path.realpath(__file__))               

+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, 'python_lib')) 

-

+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-0.1.3',

-            'jsonrpclib-pelix-0.2.5',

-            'termstyle',

-            'rpc_exceptions-0.1'

-            ]

+                  'jsonrpclib-pelix-0.2.5',

+                  'termstyle',

+                  'rpc_exceptions-0.1'

+                  ]

+

 

-def import_client_modules ():

+def import_client_modules():

     sys.path.append(ROOT_PATH)

     import_module_list(CLIENT_MODULES)

 

-def import_module_list (modules_list):

+

+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)

+        full_path = os.path.join(PATH_TO_PYTHON_LIB, p)

+        fix_path = os.path.normcase(full_path)  # (CURRENT_PATH+p)

         site.addsitedir(full_path)

 

 import_client_modules()