some fields were missing from the ZMQ publisher

2 files changed, 15 insertions, 8 deletions

diff --git a/scripts/automation/trex_control_plane/console/trex_console.py b/scripts/automation/trex_control_plane/console/trex_console.py
index e707a9e1..8a5b29cc 100755
--- a/scripts/automation/trex_control_plane/console/trex_console.py
+++ b/scripts/automation/trex_control_plane/console/trex_console.py
@@ -257,7 +257,9 @@ class TRexConsole(cmd.Cmd):
         # make sure that the user wants to acquire all
         args = line.split()
         if len(args) < 1:
-            print "Please provide a list of ports separated by spaces, or specify 'all' to acquire all available ports"
+            print magenta("Please provide a list of ports separated by spaces, or specify 'all' to acquire all available ports")
+            return
+
         if args[0] == "all":
             ask = ConfirmMenu('Are you sure you want to acquire all ports ? ')
             rc = ask.show()
diff --git a/scripts/automation/trex_control_plane/console/trex_status.py b/scripts/automation/trex_control_plane/console/trex_status.py
index ac8e7411..a19587a3 100644
--- a/scripts/automation/trex_control_plane/console/trex_status.py
+++ b/scripts/automation/trex_control_plane/console/trex_status.py
@@ -112,19 +112,24 @@ class GeneralInfoPanel(TrexStatusPanel):
 
         self.getwin().addstr(3, 2, "{:<30} {:0.2f} %".format("CPU util.:", self.general_stats.get("m_cpu_util")))
 
-        self.getwin().addstr(5, 2, "{:<30} {:} / {:}".format("Total Tx. rate:",
+        self.getwin().addstr(6, 2, "{:<30} {:} / {:}".format("Total Tx. rate:",
                                                                self.general_stats.get("m_tx_bps", format = True, suffix = "bps"),
                                                                self.general_stats.get("m_tx_pps", format = True, suffix = "pps")))
 
-        # missing RX field
-        #self.getwin().addstr(5, 2, "{:<30} {:} / {:}".format("Total Rx. rate:",
-        #                                                       self.general_stats.get("m_rx_bps"),
-        #                                                       self.general_stats.get("m_rx_pps"), suffix = "pps"))
-
-        self.getwin().addstr(7, 2, "{:<30} {:} / {:}".format("Total Tx:",
+      
+        self.getwin().addstr(8, 2, "{:<30} {:} / {:}".format("Total Tx:",
                                                              self.general_stats.get_rel("m_total_tx_bytes", format = True, suffix = "B"),
                                                              self.general_stats.get_rel("m_total_tx_pkts", format = True, suffix = "pkts")))
 
+        self.getwin().addstr(11, 2, "{:<30} {:} / {:}".format("Total Rx. rate:",
+                                                               self.general_stats.get("m_rx_bps", format = True, suffix = "bps"),
+                                                               self.general_stats.get("m_rx_pps", format = True, suffix = "pps")))
+
+      
+        self.getwin().addstr(13, 2, "{:<30} {:} / {:}".format("Total Rx:",
+                                                             self.general_stats.get_rel("m_total_rx_bytes", format = True, suffix = "B"),
+                                                             self.general_stats.get_rel("m_total_rx_pkts", format = True, suffix = "pkts")))
+
 # all ports stats
 class PortsStatsPanel(TrexStatusPanel):
     def __init__ (self, h, l, y, x, status_obj):