summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane/server
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2016-05-23 15:30:21 +0300
committerYaroslav Brustinov <ybrustin@cisco.com>2016-05-23 15:30:21 +0300
commitd279c8c12f136ab15b5fefd496c296ef1585c628 (patch)
treebeca6adbe9152141453d015e041f49e8982202b9 /scripts/automation/trex_control_plane/server
parent131be7a0a855f2c027d28060ab6a42cbeddc69da (diff)
replace t-rex to TRex
regression: instead of checking map and reconnecting for eact STL test, do in only for those with disconnect (+revert of commit 0f8e6065f467703b1461e87c3912f8d4bd616807)
Diffstat (limited to 'scripts/automation/trex_control_plane/server')
-rwxr-xr-xscripts/automation/trex_control_plane/server/trex_server.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/automation/trex_control_plane/server/trex_server.py b/scripts/automation/trex_control_plane/server/trex_server.py
index 3dcb3e97..81f3d28f 100755
--- a/scripts/automation/trex_control_plane/server/trex_server.py
+++ b/scripts/automation/trex_control_plane/server/trex_server.py
@@ -46,7 +46,7 @@ class CTRexServer(object):
Parameters
----------
trex_host : str
- a string of the t-rex ip address or hostname.
+ a string of the TRex ip address or hostname.
default value: machine hostname as fetched from socket.gethostname()
trex_daemon_port : int
the port number on which the trex-daemon server can be reached
@@ -243,7 +243,7 @@ class CTRexServer(object):
logger.error(err_str)
return Fault(-33, err_str)
- def stop_handler (self, signum, frame):
+ def stop_handler (self, *args, **kwargs):
logger.info("Daemon STOP request detected.")
if self.is_running():
# in case TRex process is currently running, stop it before terminating server process
@@ -559,13 +559,13 @@ class CTRex(object):
def stop_trex(self):
if self.status == TRexStatus.Idle:
- # t-rex isn't running, nothing to abort
+ # TRex isn't running, nothing to abort
logger.info("TRex isn't running. No need to stop anything.")
if self.errcode is not None: # some error occurred, notify client despite TRex already stopped
return Fault(self.errcode, self.verbose_status) # raise at client relevant exception, depending on the reason the error occured
return False
else:
- # handle stopping t-rex's run
+ # handle stopping TRex's run
self.session.join()
logger.info("TRex session has been successfully aborted.")
return True