summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2017-02-20 16:01:59 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2017-02-20 16:01:59 +0200
commit209351684a344408b92a24284ad459286d0ef375 (patch)
treeaba1656bb1dbe83dfbdf55e8d210991576f6c257
parent54227de8e60843065064f1c3b35f67a3efda4223 (diff)
STF daemon: add message error if server is already running by current user.
Change-Id: I35400a64d976ce690d298d560dce2ae2254bfb6b Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>
-rwxr-xr-xscripts/automation/trex_control_plane/server/trex_server.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/automation/trex_control_plane/server/trex_server.py b/scripts/automation/trex_control_plane/server/trex_server.py
index 8abd8838..60febc6a 100755
--- a/scripts/automation/trex_control_plane/server/trex_server.py
+++ b/scripts/automation/trex_control_plane/server/trex_server.py
@@ -334,9 +334,10 @@ class CTRexServer(object):
logger.info("TRex is reserved to another user ({res_user}). Only that user is allowed to initiate new runs.".format(res_user = self.__reservation['user']))
return Fault(-33, "TRex is reserved to another user ({res_user}). Only that user is allowed to initiate new runs.".format(res_user = self.__reservation['user'])) # raise at client TRexRequestDenied
elif self.trex.get_status() != TRexStatus.Idle:
- logger.info("TRex is already taken, cannot create another run until done.")
- return Fault(-13, '') # raise at client TRexInUseError
-
+ err = 'TRex is already taken, cannot create another run until done.'
+ logger.info(err)
+ return Fault(-13, err) # raise at client TRexInUseError
+
try:
server_cmd_data = self.generate_run_cmd(stateless = stateless, debug_image = debug_image, trex_args = trex_args, **trex_cmd_options)
self.zmq_monitor.first_dump = True