Merge branch 'master' into dan_stateless

1 files changed, 12 insertions, 12 deletions

diff --git a/scripts/automation/trex_control_plane/server/trex_launch_thread.py b/scripts/automation/trex_control_plane/server/trex_launch_thread.py
index b4be60a9..59c382ea 100755
--- a/scripts/automation/trex_control_plane/server/trex_launch_thread.py
+++ b/scripts/automation/trex_control_plane/server/trex_launch_thread.py
@@ -33,44 +33,44 @@ class AsynchronousTRexSession(threading.Thread):
         with open(os.devnull, 'w') as DEVNULL:

             self.time_stamps['start'] = self.time_stamps['run_time'] = time.time()

             self.session   = subprocess.Popen("exec "+self.cmd, cwd = self.launch_path, shell=True, stdin = DEVNULL, stderr = subprocess.PIPE, preexec_fn=os.setsid)

-            logger.info("T-Rex session initialized successfully, Parent process pid is {pid}.".format( pid = self.session.pid ))

+            logger.info("TRex session initialized successfully, Parent process pid is {pid}.".format( pid = self.session.pid ))

             while self.session.poll() is None:  # subprocess is NOT finished

                 time.sleep(0.5)

                 if self.stoprequest.is_set():

-                    logger.debug("Abort request received by handling thread. Terminating T-Rex session." )

+                    logger.debug("Abort request received by handling thread. Terminating TRex session." )

                     os.killpg(self.session.pid, signal.SIGUSR1)

                     self.trexObj.set_status(TRexStatus.Idle)

-                    self.trexObj.set_verbose_status("T-Rex is Idle")

+                    self.trexObj.set_verbose_status("TRex is Idle")

                     break

 

             self.time_stamps['run_time'] = time.time() - self.time_stamps['start']

 

             try:

                 if self.time_stamps['run_time'] < 5:

-                    logger.error("T-Rex run failed due to wrong input parameters, or due to reachability issues.")

-                    self.trexObj.set_verbose_status("T-Rex run failed due to wrong input parameters, or due to reachability issues.\n\nT-Rex command: {cmd}\n\nRun output:\n{output}".format(

+                    logger.error("TRex run failed due to wrong input parameters, or due to readability issues.")

+                    self.trexObj.set_verbose_status("TRex run failed due to wrong input parameters, or due to readability issues.\n\nTRex command: {cmd}\n\nRun output:\n{output}".format(

                         cmd = self.cmd, output = self.load_trex_output(self.export_path)))

                     self.trexObj.errcode = -11

                 elif (self.session.returncode is not None and self.session.returncode < 0) or ( (self.time_stamps['run_time'] < self.duration) and (not self.stoprequest.is_set()) ):

                     if (self.session.returncode is not None and self.session.returncode < 0):

-                        logger.debug("Failed T-Rex run due to session return code ({ret_code})".format( ret_code = self.session.returncode ) )

+                        logger.debug("Failed TRex run due to session return code ({ret_code})".format( ret_code = self.session.returncode ) )

                     elif ( (self.time_stamps['run_time'] < self.duration) and not self.stoprequest.is_set()):

-                        logger.debug("Failed T-Rex run due to running time ({runtime}) combined with no-stopping request.".format( runtime = self.time_stamps['run_time'] ) )

+                        logger.debug("Failed TRex run due to running time ({runtime}) combined with no-stopping request.".format( runtime = self.time_stamps['run_time'] ) )

 

-                    logger.warning("T-Rex run was terminated unexpectedly by outer process or by the hosting OS")

-                    self.trexObj.set_verbose_status("T-Rex run was terminated unexpectedly by outer process or by the hosting OS.\n\nRun output:\n{output}".format(

+                    logger.warning("TRex run was terminated unexpectedly by outer process or by the hosting OS")

+                    self.trexObj.set_verbose_status("TRex run was terminated unexpectedly by outer process or by the hosting OS.\n\nRun output:\n{output}".format(

                         output = self.load_trex_output(self.export_path)))

                     self.trexObj.errcode = -15

                 else:

-                    logger.info("T-Rex run session finished.")

-                    self.trexObj.set_verbose_status('T-Rex finished.')

+                    logger.info("TRex run session finished.")

+                    self.trexObj.set_verbose_status('TRex finished.')

                     self.trexObj.errcode = None

                     

             finally:

                 self.trexObj.set_status(TRexStatus.Idle)

                 logger.info("TRex running state changed to 'Idle'.")

                 self.trexObj.expect_trex.clear()

-                logger.debug("Finished handling a single run of T-Rex.")

+                logger.debug("Finished handling a single run of TRex.")

                 self.trexObj.zmq_dump   = None

 

     def join (self, timeout = None):