summaryrefslogtreecommitdiffstats
path: root/scripts/automation
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2017-03-01 18:40:58 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2017-03-01 18:40:58 +0200
commitdc905a7dd6c6938b170964d957a0fafb3cb1ac7f (patch)
tree62be98d6156789dc08095aa543a440b7c7e24ecc /scripts/automation
parenta875cce88abb1facc2b6d59b3af011ae797b6d18 (diff)
STF publisher: ensure latest results are sent by CPP + get latest dump via Python API
Change-Id: I1836c0366785246acbcd8d238400440f5f3970f5 Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>
Diffstat (limited to 'scripts/automation')
-rwxr-xr-xscripts/automation/trex_control_plane/server/trex_launch_thread.py2
-rwxr-xr-xscripts/automation/trex_control_plane/server/trex_server.py24
-rwxr-xr-xscripts/automation/trex_control_plane/server/zmq_monitor_thread.py2
-rwxr-xr-xscripts/automation/trex_control_plane/stf/trex_stf_lib/trex_client.py14
4 files changed, 33 insertions, 9 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 f4ee0d6b..a4a7a97c 100755
--- a/scripts/automation/trex_control_plane/server/trex_launch_thread.py
+++ b/scripts/automation/trex_control_plane/server/trex_launch_thread.py
@@ -27,7 +27,7 @@ class AsynchronousTRexSession(threading.Thread):
self.session = None
self.trexObj = trexObj
self.time_stamps = {'start' : None, 'run_time' : None}
- self.trexObj.zmq_dump = {}
+ self.trexObj.clear_zmq_dump()
def run (self):
try:
diff --git a/scripts/automation/trex_control_plane/server/trex_server.py b/scripts/automation/trex_control_plane/server/trex_server.py
index 60febc6a..cd4af11a 100755
--- a/scripts/automation/trex_control_plane/server/trex_server.py
+++ b/scripts/automation/trex_control_plane/server/trex_server.py
@@ -25,7 +25,7 @@ import CCustomLogger
from trex_launch_thread import AsynchronousTRexSession
from zmq_monitor_thread import ZmqMonitorSession
from argparse import ArgumentParser, RawTextHelpFormatter
-from json import JSONEncoder
+import json
import re
import shlex
import tempfile
@@ -140,6 +140,7 @@ class CTRexServer(object):
self.server.register_function(self.get_file)
self.server.register_function(self.get_files_list)
self.server.register_function(self.get_files_path)
+ self.server.register_function(self.get_latest_dump)
self.server.register_function(self.get_running_info)
self.server.register_function(self.get_running_status)
self.server.register_function(self.get_trex_cmds)
@@ -432,6 +433,9 @@ class CTRexServer(object):
logger.info("Processing get_running_info() command.")
return self.trex.get_running_info()
+ def get_latest_dump(self):
+ logger.info("Processing get_latest_dump() command.")
+ return self.trex.get_latest_dump()
def generate_run_cmd (self, iom = 0, export_path="/tmp/trex.txt", stateless = False, debug_image = False, trex_args = '', **kwargs):
""" generate_run_cmd(self, iom, export_path, kwargs) -> str
@@ -554,11 +558,11 @@ class CTRex(object):
self.errcode = None
self.session = None
self.zmq_monitor = None
- self.zmq_dump = None
+ self.__zmq_dump = {}
+ self.zmq_dump_lock = threading.Lock()
self.zmq_error = None
self.seq = None
self.expect_trex = threading.Event()
- self.encoder = JSONEncoder()
def get_status(self):
return self.status
@@ -578,9 +582,21 @@ class CTRex(object):
def get_seq (self):
return self.seq
+ def get_latest_dump(self):
+ with self.zmq_dump_lock:
+ return json.dumps(self.__zmq_dump)
+
+ def update_zmq_dump_key(self, key, val):
+ with self.zmq_dump_lock:
+ self.__zmq_dump[key] = val
+
+ def clear_zmq_dump(self):
+ with self.zmq_dump_lock:
+ self.__zmq_dump = {}
+
def get_running_info (self):
if self.status == TRexStatus.Running:
- return self.encoder.encode(self.zmq_dump)
+ return self.get_latest_dump()
else:
logger.info("TRex isn't running. Running information isn't available.")
if self.status == TRexStatus.Idle:
diff --git a/scripts/automation/trex_control_plane/server/zmq_monitor_thread.py b/scripts/automation/trex_control_plane/server/zmq_monitor_thread.py
index f559ebc1..172e2eb3 100755
--- a/scripts/automation/trex_control_plane/server/zmq_monitor_thread.py
+++ b/scripts/automation/trex_control_plane/server/zmq_monitor_thread.py
@@ -72,7 +72,7 @@ class ZmqMonitorSession(threading.Thread):
# add to trex_obj zmq latest dump, based on its 'name' header
if dict_obj != {}:
- self.trexObj.zmq_dump[dict_obj['name']] = dict_obj
+ self.trexObj.update_zmq_dump_key(dict_obj['name'], dict_obj)
if self.first_dump:
# change TRexStatus from starting to Running once the first ZMQ dump is obtained and parsed successfully
self.first_dump = False
diff --git a/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_client.py b/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_client.py
index 43504c96..09f9b489 100755
--- a/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_client.py
+++ b/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_client.py
@@ -11,7 +11,7 @@ import copy
import binascii
from distutils.util import strtobool
from collections import deque, OrderedDict
-from json import JSONDecoder
+import json
import traceback
import signal
@@ -92,7 +92,6 @@ class CTRexClient(object):
self.__default_user = get_current_user()
self.verbose = verbose
self.result_obj = CTRexResult(max_history_size, filtered_latency_amount)
- self.decoder = JSONDecoder()
self.history = jsonrpclib.history.History()
self.master_daemon_path = "http://{hostname}:{port}/".format( hostname = self.trex_host, port = master_daemon_port )
self.master_daemon = jsonrpclib.Server(self.master_daemon_path, history = self.history)
@@ -523,7 +522,7 @@ class CTRexClient(object):
return self.result_obj.get_latest_dump()
else:
try:
- latest_dump = self.decoder.decode( self.server.get_running_info() ) # latest dump is not a dict, but json string. decode it.
+ latest_dump = json.loads( self.server.get_running_info() ) # latest dump is not a dict, but json string. decode it.
self.result_obj.update_result_data(latest_dump)
return latest_dump
except TypeError as inst:
@@ -606,6 +605,15 @@ class CTRexClient(object):
time.sleep(time_between_samples)
except TRexWarning:
pass
+
+ # try to get final server dump
+ try:
+ latest_server_dump = json.loads(self.server.get_latest_dump())
+ if latest_server_dump != self.result_obj.get_latest_dump():
+ self.result_obj.update_result_data(latest_server_dump)
+ except ProtocolError:
+ pass
+
results = self.get_result_obj()
return results