Merge GA to Python API

2 files changed, 24 insertions, 11 deletions

diff --git a/scripts/automation/regression/outer_packages.py b/scripts/automation/regression/outer_packages.py
index bec9fe21..61ddc5cd 100755
--- a/scripts/automation/regression/outer_packages.py
+++ b/scripts/automation/regression/outer_packages.py
@@ -9,6 +9,7 @@ if not TREX_PATH or not os.path.isfile('%s/trex_daemon_server' % TREX_PATH):
     TREX_PATH       = os.path.abspath(os.path.join(CURRENT_PATH, os.pardir, os.pardir))
 PATH_TO_PYTHON_LIB  = os.path.abspath(os.path.join(TREX_PATH, 'external_libs'))
 PATH_TO_CTRL_PLANE  = os.path.abspath(os.path.join(TREX_PATH, 'automation', 'trex_control_plane')) 
+PATH_STF_API        = os.path.abspath(os.path.join(PATH_TO_CTRL_PLANE, 'stf')) 
 PATH_STL_API        = os.path.abspath(os.path.join(PATH_TO_CTRL_PLANE, 'stl')) 
 
 
@@ -57,8 +58,9 @@ def import_module_list(modules_list):
 
 def import_nightly_modules ():
     sys.path.append(TREX_PATH)
-    sys.path.append(PATH_TO_CTRL_PLANE)
+    #sys.path.append(PATH_TO_CTRL_PLANE)
     sys.path.append(PATH_STL_API)
+    sys.path.append(PATH_STF_API)
     import_module_list(NIGHTLY_MODULES)
 
 
diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py
index fb666382..3b1a25f0 100755
--- a/scripts/automation/regression/trex_unit_test.py
+++ b/scripts/automation/regression/trex_unit_test.py
@@ -36,8 +36,8 @@ import misc_methods
 from rednose import RedNose
 import termstyle
 from trex import CTRexScenario
-from stf.trex_client import *
-from stf.trex_exceptions import *
+from trex_stf_lib.trex_client import *
+from trex_stf_lib.trex_exceptions import *
 from trex_stl_lib.api import *
 import trex
 import socket
@@ -67,10 +67,10 @@ STATEFUL_STOP_COMMAND = './trex_daemon_server stop; sleep 1; ./trex_daemon_serve
 STATEFUL_RUN_COMMAND = 'rm /var/log/trex/trex_daemon_server.log; ./trex_daemon_server start; sleep 2; ./trex_daemon_server show'
 TREX_FILES = ('_t-rex-64', '_t-rex-64-o', '_t-rex-64-debug', '_t-rex-64-debug-o')
 
-def trex_remote_command(trex_data, command, background = False, from_scripts = True):
+def trex_remote_command(trex_data, command, background = False, from_scripts = True, timeout = 20):
     if from_scripts:
-        return misc_methods.run_remote_command(trex_data['trex_name'], ('cd %s; ' % CTRexScenario.scripts_path)+ command, background)
-    return misc_methods.run_remote_command(trex_data['trex_name'], command, background)
+        return misc_methods.run_remote_command(trex_data['trex_name'], ('cd %s; ' % CTRexScenario.scripts_path)+ command, background, timeout)
+    return misc_methods.run_remote_command(trex_data['trex_name'], command, background, timeout)
 
 # 1 = running, 0 - not running
 def check_trex_running(trex_data):
@@ -183,7 +183,7 @@ class CTRexTestConfiguringPlugin(Plugin):
             new_path = '/tmp/trex-scripts'
             rsync_template = 'rm -rf /tmp/trex-scripts; mkdir -p %s; rsync -Lc %s /tmp; tar -mxzf /tmp/%s -C %s; mv %s/v*.*/* %s'
             rsync_command = rsync_template % (new_path, self.pkg, os.path.basename(self.pkg), new_path, new_path, new_path)
-            return_code, stdout, stderr = trex_remote_command(self.configuration.trex, rsync_command, from_scripts = False)
+            return_code, stdout, stderr = trex_remote_command(self.configuration.trex, rsync_command, from_scripts = False, timeout = 300)
             if return_code:
                 print('Failed copying')
                 sys.exit(-1)
@@ -339,8 +339,9 @@ if __name__ == "__main__":
     finally:
         save_setup_info()
 
-    if (result == True and not CTRexScenario.is_test_list):
-        print(termstyle.green("""
+    if not CTRexScenario.is_test_list:
+        if result == True:
+            print(termstyle.green("""
                  ..::''''::..
                .;''        ``;.
               ::    ::  ::    ::
@@ -358,8 +359,18 @@ if __name__ == "__main__":
             /_/  /_/ |_/___/___(_)
 
         """))
-        sys.exit(0)
-    sys.exit(-1)
+            sys.exit(0)
+        else:
+            print(termstyle.red("""
+           /\_/\ 
+          ( o.o ) 
+           > ^ < 
+
+This cat is sad, test failed.
+        """))
+            sys.exit(-1)
+
+