Initial implementation of stats prompting

3 files changed, 12 insertions, 196 deletions

diff --git a/scripts/automation/trex_control_plane/console/parsing_opts.py b/scripts/automation/trex_control_plane/console/parsing_opts.py
deleted file mode 100755
index d5c21af0..00000000
--- a/scripts/automation/trex_control_plane/console/parsing_opts.py
+++ /dev/null
@@ -1,193 +0,0 @@
-import argparse
-from collections import namedtuple
-import sys
-import re
-import os
-
-ArgumentPack = namedtuple('ArgumentPack', ['name_or_flags', 'options'])
-ArgumentGroup = namedtuple('ArgumentGroup', ['type', 'args', 'options'])
-
-
-# list of available parsing options
-MULTIPLIER = 1
-PORT_LIST = 2
-ALL_PORTS = 3
-PORT_LIST_WITH_ALL = 4
-FILE_PATH = 5
-FILE_FROM_DB = 6
-SERVER_IP = 7
-STREAM_FROM_PATH_OR_FILE = 8
-DURATION = 9
-FORCE = 10
-
-# list of ArgumentGroup types
-MUTEX = 1
-
-
-def match_time_unit(val):
-    '''match some val against time shortcut inputs '''
-    match = re.match("^(\d+)([m|h]?)$", val)
-    if match:
-        digit = int(match.group(1))
-        unit = match.group(2)
-        if not unit:
-            return digit
-        elif unit == 'm':
-            return digit*60
-        else:
-            return digit*60*60
-    else:
-        raise argparse.ArgumentTypeError("Duration should be passed in the following format: \n"
-                                         "-d 100 : in sec \n"
-                                         "-d 10m : in min \n"
-                                         "-d 1h  : in hours")
-
-def match_multiplier(val):
-    '''match some val against multiplier  shortcut inputs '''
-    match = re.match("^(\d+)(gb|kpps|%?)$", val)
-    if match:
-        digit = int(match.group(1))
-        unit = match.group(2)
-        if not unit:
-            return digit
-        elif unit == 'gb':
-            raise NotImplementedError("gb units are not supported yet")
-        else:
-            raise NotImplementedError("kpps units are not supported yet")
-    else:
-        raise argparse.ArgumentTypeError("Multiplier should be passed in the following format: \n"
-                                         "-m 100    : multiply stream file by this factor \n"
-                                         "-m 10gb   : from graph calculate the maximum rate as this bandwidth (for each port)\n"
-                                         "-m 10kpps : from graph calculate the maximum rate as this pps       (for each port)\n"
-                                         "-m 40%    : from graph calculate the maximum rate as this percent from total port  (for each port)")
-
-
-
-def is_valid_file(filename):
-    if not os.path.isfile(filename):
-        raise argparse.ArgumentTypeError("The file '%s' does not exist" % filename)
-
-    return filename
-
-
-OPTIONS_DB = {MULTIPLIER: ArgumentPack(['-m', '--multiplier'],
-                                 {'help': "Set multiplier for stream",
-                                  'dest': "mult",
-                                  'default': 1.0,
-                                  'type': match_multiplier}),
-
-              PORT_LIST: ArgumentPack(['--port'],
-                                        {"nargs": '+',
-                                         'dest':'ports',
-                                         'metavar': 'PORTS',
-                                          'type': int,
-                                         'help': "A list of ports on which to apply the command",
-                                         'default': []}),
-
-              ALL_PORTS: ArgumentPack(['-a'],
-                                        {"action": "store_true",
-                                         "dest": "all_ports",
-                                         'help': "Set this flag to apply the command on all available ports"}),
-              DURATION: ArgumentPack(['-d'],
-                                        {'action': "store",
-                                         'metavar': 'TIME',
-                                         'dest': 'duration',
-                                         'type': match_time_unit,
-                                         'default': -1.0,
-                                         'help': "Set duration time for TRex."}),
-
-              FORCE: ArgumentPack(['--force'],
-                                        {"action": "store_true",
-                                         'default': False,
-                                         'help': "Set if you want to stop active ports before applying new TRex run on them."}),
-
-              FILE_PATH: ArgumentPack(['-f'],
-                                      {'metavar': 'FILE',
-                                       'dest': 'file',
-                                       'nargs': 1,
-                                       'type': is_valid_file,
-                                       'help': "File path to YAML file that describes a stream pack. "}),
-
-              FILE_FROM_DB: ArgumentPack(['--db'],
-                                         {'metavar': 'LOADED_STREAM_PACK',
-                                          'help': "A stream pack which already loaded into console cache."}),
-
-              SERVER_IP: ArgumentPack(['--server'],
-                                      {'metavar': 'SERVER',
-                                       'help': "server IP"}),
-
-              # advanced options
-              PORT_LIST_WITH_ALL: ArgumentGroup(MUTEX, [PORT_LIST,
-                                                        ALL_PORTS],
-                                                {'required': True}),
-              STREAM_FROM_PATH_OR_FILE: ArgumentGroup(MUTEX, [FILE_PATH,
-                                                              FILE_FROM_DB],
-                                                      {'required': True})
-              }
-
-
-class CCmdArgParser(argparse.ArgumentParser):
-
-    def __init__(self, stateless_client, *args, **kwargs):
-        super(CCmdArgParser, self).__init__(*args, **kwargs)
-        self.stateless_client = stateless_client
-
-    def parse_args(self, args=None, namespace=None):
-        try:
-            opts = super(CCmdArgParser, self).parse_args(args, namespace)
-            if opts is None:
-                return None
-
-            if getattr(opts, "all_ports", None):
-                opts.ports = self.stateless_client.get_port_ids()
-
-            if getattr(opts, "ports", None):
-                for port in opts.ports:
-                    if not self.stateless_client.validate_port_list([port]):
-                        self.error("port id '{0}' is not a valid port id\n".format(port))
-
-            return opts
-
-        except SystemExit:
-            # recover from system exit scenarios, such as "help", or bad arguments.
-            return None
-
-
-def get_flags (opt):
-    return OPTIONS_DB[opt].name_or_flags
-
-def gen_parser(stateless_client, op_name, description, *args):
-    parser = CCmdArgParser(stateless_client, prog=op_name, conflict_handler='resolve',
-                           description=description)
-    for param in args:
-        try:
-
-            if isinstance(param, int):
-                argument = OPTIONS_DB[param]
-            else:
-                argument = param
-
-            if isinstance(argument, ArgumentGroup):
-                if argument.type == MUTEX:
-                    # handle as mutually exclusive group
-                    group = parser.add_mutually_exclusive_group(**argument.options)
-                    for sub_argument in argument.args:
-                        group.add_argument(*OPTIONS_DB[sub_argument].name_or_flags,
-                                           **OPTIONS_DB[sub_argument].options)
-                else:
-                    # ignore invalid objects
-                    continue
-            elif isinstance(argument, ArgumentPack):
-                parser.add_argument(*argument.name_or_flags,
-                                    **argument.options)
-            else:
-                # ignore invalid objects
-                continue
-        except KeyError as e:
-            cause = e.args[0]
-            raise KeyError("The attribute '{0}' is missing as a field of the {1} option.\n".format(cause, param))
-    return parser
-
-
-if __name__ == "__main__":
-    pass
\ No newline at end of file
diff --git a/scripts/automation/trex_control_plane/console/trex_console.py b/scripts/automation/trex_control_plane/console/trex_console.py
index c03f2a82..7d4f3c27 100755
--- a/scripts/automation/trex_control_plane/console/trex_console.py
+++ b/scripts/automation/trex_control_plane/console/trex_console.py
@@ -33,8 +33,9 @@ from common.trex_streams import *
 from client.trex_stateless_client import CTRexStatelessClient
 from common.text_opts import *
 from client_utils.general_utils import user_input, get_current_user
+from client_utils import parsing_opts
 import trex_status
-import parsing_opts
+
 
 
 __version__ = "1.1"
@@ -283,6 +284,14 @@ class TRexConsole(TRexGeneralCmd):
         '''force stop all ports\n'''
         self.stateless_client.cmd_reset()
 
+    def do_stats(self, line):
+        '''Fetch statistics from TRex server by port\n'''
+        self.stateless_client.cmd_stats_line(line)
+        pass
+
+    def help_stats(self):
+        self.do_stats("-h")
+
   
     # tui
     def do_tui (self, line):
diff --git a/scripts/automation/trex_control_plane/console/trex_status.py b/scripts/automation/trex_control_plane/console/trex_status.py
index 869812a1..10ac75c9 100644
--- a/scripts/automation/trex_control_plane/console/trex_status.py
+++ b/scripts/automation/trex_control_plane/console/trex_status.py
@@ -385,7 +385,7 @@ class TrexStatusCommands():
 # 
 #
 #
-class TrexStatus():
+class CTRexStatus():
     def __init__ (self, stdscr, stateless_client):
         self.stdscr = stdscr
 
@@ -506,7 +506,7 @@ def show_trex_status_internal (stdscr, stateless_client):
     global trex_status
 
     if trex_status == None:
-        trex_status = TrexStatus(stdscr, stateless_client)
+        trex_status = CTRexStatus(stdscr, stateless_client)
 
     trex_status.run()