1 files changed, 34 insertions, 4 deletions
diff --git a/src/console/trex_console.py b/src/console/trex_console.py
index 404a2ee0..3e452bf5 100755
--- a/src/console/trex_console.py
+++ b/src/console/trex_console.py
@@ -1,6 +1,8 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*- 
 import cmd
+import json
+
 from trex_rpc_client import RpcClient
 
 class TrexConsole(cmd.Cmd):
@@ -12,12 +14,18 @@ class TrexConsole(cmd.Cmd):
         self.intro  = "\n-=TRex Console V1.0=-\n" 
         self.rpc_client = rpc_client
         self.verbose = False
+        rc, msg = self.rpc_client.query_rpc_server()
+
+        if rc:
+            lst = msg.split('\n')
+            self.supported_rpc = [str(x) for x in lst if x]
 
     # a cool hack - i stole this function and added space
     def completenames(self, text, *ignored):
         dotext = 'do_'+text
         return [a[3:]+' ' for a in self.get_names() if a.startswith(dotext)]
 
+    # set verbose on / off
     def do_verbose (self, line):
         '''shows or set verbose mode\nusage: verbose [on/off]\n'''
         if line == "":
@@ -34,7 +42,7 @@ class TrexConsole(cmd.Cmd):
         else:
             print "please specify 'on' or 'off'\n"
 
-
+    # query the server for registered commands
     def do_query_server(self, line):
         '''\nquery the RPC server for supported remote commands\n'''
         rc, msg = self.rpc_client.query_rpc_server()
@@ -44,7 +52,7 @@ class TrexConsole(cmd.Cmd):
         print "RPC server supports the following commands: \n\n" + msg
 
     def do_ping (self, line):
-        '''pings the RPC server \n'''
+        '''pings the RPC server\n'''
         print "Pinging RPC server"
 
         rc, msg = self.rpc_client.ping_rpc_server()
@@ -53,6 +61,23 @@ class TrexConsole(cmd.Cmd):
         else:
             print "[FAILED]\n"
 
+    def do_rpc (self, line):
+        '''Launches a RPC on the server\n'''
+        if line == "":
+            print "Please provide method name\n"
+            return
+
+        rc, msg = self.rpc_client.invoke_rpc_method(line)
+        if rc:
+            print "[SUCCESS]\n"
+        else:
+            print "[FAILED]\n"
+
+        print "Server Response:\n\n{0}\n".format(json.dumps(msg))
+
+    def complete_rpc (self, text, line, begidx, endidx):
+        return [x for x in self.supported_rpc if x.startswith(text)]
+
     def do_quit(self, line):
         '''\nexit the client\n'''
         return True
@@ -73,8 +98,13 @@ def main ():
         exit(-1)
 
     # console
-    console = TrexConsole(rpc_client)
-    console.cmdloop()
+    try:
+        console = TrexConsole(rpc_client)
+        console.cmdloop()
+    except KeyboardInterrupt as e:
+        print "\n\n*** Caught Ctrl + C... Exiting...\n\n"
+        return
 
 if __name__ == '__main__':
     main()
+