1 files changed, 53 insertions, 44 deletions

diff --git a/scripts/automation/trex_control_plane/console/trex_console.py b/scripts/automation/trex_control_plane/console/trex_console.py
index 5470e694..7931dfc9 100755
--- a/scripts/automation/trex_control_plane/console/trex_console.py
+++ b/scripts/automation/trex_control_plane/console/trex_console.py
@@ -160,46 +160,7 @@ class TRexConsole(cmd.Cmd):
                 for x in os.listdir(path)
                 if x.startswith(start_string)]
 
-    ####################### shell commands #######################
-
-    # set verbose on / off
-    def do_verbose(self, line):
-        '''Shows or set verbose mode\n'''
-        if line == "":
-            print "\nverbose is " + ("on\n" if self.verbose else "off\n")
-
-        elif line == "on":
-            self.verbose = True
-            self.stateless_client.set_verbose(True)
-            print green("\nverbose set to on\n")
-
-        elif line == "off":
-            self.verbose = False
-            self.stateless_client.set_verbose(False)
-            print green("\nverbose set to off\n")
-
-        else:
-            print magenta("\nplease specify 'on' or 'off'\n")
-
-    ############### connect
-    def do_connect (self, line):
-        '''Connects to the server\n'''
-
-        res_ok, msg = self.stateless_client.connect()
-        if res_ok:
-            print format_text("[SUCCESS]\n", 'green', 'bold')
-        else:
-            print "\n*** " + msg + "\n"
-            print format_text("[FAILED]\n", 'red', 'bold')
-            return
-
-        self.supported_rpc = self.stateless_client.get_supported_cmds().data
-
-        if self.acquire_all_ports:
-            res_ok, log = self.stateless_client.acquire(self.stateless_client.get_port_ids())
-            if not res_ok:
-                print "\n*** Failed to acquire all ports... exiting..."""
-
+    # annotation method
     @staticmethod
     def annotate (desc, rc = None, err_log = None, ext_err_msg = None):
         print format_text('\n{:<40}'.format(desc), 'bold'),
@@ -230,6 +191,54 @@ class TRexConsole(cmd.Cmd):
             return True
 
 
+    ####################### shell commands #######################
+    def do_ping (self, line):
+        '''Ping the server\n'''
+
+        rc = self.stateless_client.cmd_ping()
+        if rc.bad():
+            return
+
+    def do_test (self, line):
+        print self.stateless_client.get_acquired_ports()
+
+    # set verbose on / off
+    def do_verbose(self, line):
+        '''Shows or set verbose mode\n'''
+        if line == "":
+            print "\nverbose is " + ("on\n" if self.verbose else "off\n")
+
+        elif line == "on":
+            self.verbose = True
+            self.stateless_client.set_verbose(True)
+            print format_text("\nverbose set to on\n", 'green', 'bold')
+
+        elif line == "off":
+            self.verbose = False
+            self.stateless_client.set_verbose(False)
+            print format_text("\nverbose set to off\n", 'green', 'bold')
+
+        else:
+            print format_text("\nplease specify 'on' or 'off'\n", 'bold')
+
+
+    ############### connect
+    def do_connect (self, line):
+        '''Connects to the server\n'''
+
+        rc = self.stateless_client.cmd_connect()
+        if rc.bad():
+            return
+
+
+    def do_disconnect (self, line):
+        '''Disconnect from the server\n'''
+
+        rc = self.stateless_client.cmd_disconnect()
+        if rc.bad():
+            return
+
+ 
     ############### start
 
     def complete_start(self, text, line, begidx, endidx):
@@ -276,7 +285,7 @@ class TRexConsole(cmd.Cmd):
                 return
 
 
-        self.stateless_client.cmd_start(opts.ports, stream_list, opts.mult, opts.force, self.annotate)
+        self.stateless_client.cmd_start(opts.ports, stream_list, opts.mult, opts.force)
         return
 
 
@@ -295,7 +304,7 @@ class TRexConsole(cmd.Cmd):
         if opts is None:
             return
 
-        self.stateless_client.cmd_stop(opts.ports, self.annotate)
+        self.stateless_client.cmd_stop(opts.ports)
         return
 
     def help_stop(self):
@@ -304,7 +313,7 @@ class TRexConsole(cmd.Cmd):
     ########## reset
     def do_reset (self, line):
         '''force stop all ports\n'''
-        self.stateless_client.cmd_reset(self.annotate)
+        self.stateless_client.cmd_reset()
 
   
     # tui
@@ -312,7 +321,7 @@ class TRexConsole(cmd.Cmd):
         '''Shows a graphical console\n'''
 
         if not self.stateless_client.is_connected():
-            print "Not connected to server\n"
+            print format_text("\nNot connected to server\n", 'bold')
             return
 
         self.do_verbose('off')