Merge remote-tracking branch 'origin/master'

2 files changed, 41 insertions, 5 deletions

diff --git a/scripts/automation/trex_control_plane/stl/console/trex_console.py b/scripts/automation/trex_control_plane/stl/console/trex_console.py
index 2b53b7ec..a126bf35 100755
--- a/scripts/automation/trex_control_plane/stl/console/trex_console.py
+++ b/scripts/automation/trex_control_plane/stl/console/trex_console.py
@@ -289,7 +289,7 @@ class TRexConsole(TRexGeneralCmd):
     @verify_connected
     def do_ping (self, line):
         '''Ping the server\n'''
-        self.stateless_client.ping()
+        self.stateless_client.ping_line(line)
 
 
     # set verbose on / off
@@ -421,6 +421,9 @@ class TRexConsole(TRexGeneralCmd):
         '''Release ports\n'''
         self.stateless_client.release_line(line)
 
+    def do_reacquire (self, line):
+        '''reacquire all the ports under your logged user name'''
+        self.stateless_client.reacquire_line(line)
 
     def help_acquire (self):
         self.do_acquire("-h")
@@ -428,6 +431,9 @@ class TRexConsole(TRexGeneralCmd):
     def help_release (self):
         self.do_release("-h")
 
+    def help_reacquire (self):
+        self.do_reacquire("-h")
+
     ############### start
 
     def complete_start(self, text, line, begidx, endidx):
@@ -774,7 +780,29 @@ def setParserOptions():
 
     return parser
 
-    
+# a simple info printed on log on
+def show_intro (logger, c):
+    x   = c.get_server_system_info()
+    ver = c.get_server_version().get('version', 'N/A')
+
+    # find out which NICs the server has
+    port_types = {}
+    for port in x['ports']:
+        key = (port['speed'], port['driver'])
+        if not key in port_types:
+            port_types[key] = 0
+        port_types[key] += 1
+
+    port_line = ''
+    for k, v in port_types.items():
+        port_line += "{0} x {1}Gbps @ {2}".format(v, k[0], k[1])
+
+    logger.log(format_text("\nServer Info:\n", 'underline'))
+    logger.log("Server version:   {:>}".format(format_text(ver, 'bold')))
+    logger.log("Server CPU:       {:>}".format(format_text("{:>} x {:>}".format(x.get('dp_core_count'), x.get('core_type')), 'bold')))
+    logger.log("Ports count:      {:>}".format(format_text(port_line, 'bold')))
+
+
 def main():
     parser = setParserOptions()
     options = parser.parse_args()
@@ -824,6 +852,9 @@ def main():
     if options.readonly:
         logger.log(format_text("\nRead only mode - only few commands will be available", 'bold'))
 
+    show_intro(logger, stateless_client)
+    
+
     # a script mode
     if options.batch:
         cont = run_script_file(options.batch[0], stateless_client)
diff --git a/scripts/automation/trex_control_plane/stl/console/trex_tui.py b/scripts/automation/trex_control_plane/stl/console/trex_tui.py
index effcf55e..cbaae392 100644
--- a/scripts/automation/trex_control_plane/stl/console/trex_tui.py
+++ b/scripts/automation/trex_control_plane/stl/console/trex_tui.py
@@ -73,7 +73,10 @@ class TrexTUIDashBoard(TrexTUIPanel):
         self.key_actions['o'] = {'action': self.action_show_owned,  'legend': 'owned ports', 'show': True}
         self.key_actions['a'] = {'action': self.action_show_all,  'legend': 'all ports', 'show': True}
 
-        self.ports_filter = self.FILTER_ALL
+        if self.stateless_client.get_acquired_ports():
+            self.ports_filter = self.FILTER_ACQUIRED
+        else:
+            self.ports_filter = self.FILTER_ALL
 
 
     def get_ports (self):
@@ -99,7 +102,7 @@ class TrexTUIDashBoard(TrexTUIPanel):
         allowed['o'] = self.key_actions['o']
         allowed['a'] = self.key_actions['a']
 
-        if self.ports_filter == self.FILTER_ALL:
+        if self.ports_filter == self.FILTER_ALL and self.stateless_client.get_acquired_ports() != self.stateless_client.get_all_ports():
             return allowed
 
         if len(self.stateless_client.get_transmitting_ports()) > 0:
@@ -201,7 +204,7 @@ class TrexTUIPort(TrexTUIPanel):
         allowed['c'] = self.key_actions['c']
         allowed['t'] = self.key_actions['t']
 
-        if self.stateless_client.is_all_ports_acquired():
+        if self.port_id not in self.stateless_client.get_acquired_ports():
             return allowed
 
         if self.port.state == self.port.STATE_TX:
@@ -535,7 +538,9 @@ class TrexTUI():
             sys.stdout = old_stdout
 
             self.clear_screen()
+
             print(mystdout.getvalue())
+
             sys.stdout.flush()
 
             self.draw_policer = 0