summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2015-12-14 15:29:10 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2015-12-14 15:29:10 +0200
commit1a0e24fac5ca0f4f5e5db42b7e60bd1c82b12c38 (patch)
tree0c8d3d951eb32e70809343fdd72871939e8b8bae
parentbae48d6cf8dd59158ffcb488391af8a96fc2e037 (diff)
publish rx_check counters via ZMQ even with iom=0
-rwxr-xr-xscripts/automation/trex_control_plane/client/trex_client.py4
-rwxr-xr-xsrc/main_dpdk.cpp8
2 files changed, 7 insertions, 5 deletions
diff --git a/scripts/automation/trex_control_plane/client/trex_client.py b/scripts/automation/trex_control_plane/client/trex_client.py
index e1130a97..49807014 100755
--- a/scripts/automation/trex_control_plane/client/trex_client.py
+++ b/scripts/automation/trex_control_plane/client/trex_client.py
@@ -88,7 +88,7 @@ class CTRexClient(object):
finally:
self.prompt_verbose_data()
- def start_trex (self, f, d, block_to_success = True, timeout = 30, user = None, **trex_cmd_options):
+ def start_trex (self, f, d, block_to_success = True, timeout = 30, user = None, trex_development = False, **trex_cmd_options):
"""
Request to start a TRex run on server.
@@ -125,7 +125,7 @@ class CTRexClient(object):
user = user or self.__default_user
try:
d = int(d)
- if d < 30: # specify a test should take at least 30 seconds long.
+ if d < 30 and not trex_development: # specify a test should take at least 30 seconds long.
raise ValueError
except ValueError:
raise ValueError('d parameter must be integer, specifying how long TRex run, and must be larger than 30 secs.')
diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index 15d7451e..441df5ce 100755
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -4043,13 +4043,15 @@ int CGlobalTRex::run_in_master(){
break;
}
- m_mg.rx_check_dump_json(json );
- m_zmq_publisher.publish_json(json);
-
}/* ex checked */
}
+ if ( get_is_rx_check_mode() ) {
+ m_mg.rx_check_dump_json(json );
+ m_zmq_publisher.publish_json(json);
+ }
+
/* backward compatible */
m_mg.dump_json(json );
m_zmq_publisher.publish_json(json);