1 files changed, 75 insertions, 17 deletions
diff --git a/scripts/automation/trex_control_plane/console/parsing_opts.py b/scripts/automation/trex_control_plane/console/parsing_opts.py
index c94a7461..e701b7db 100755
--- a/scripts/automation/trex_control_plane/console/parsing_opts.py
+++ b/scripts/automation/trex_control_plane/console/parsing_opts.py
@@ -1,6 +1,7 @@
 import argparse
 from collections import namedtuple
 import sys
+import re
 
 ArgumentPack = namedtuple('ArgumentPack', ['name_or_flags', 'options'])
 ArgumentGroup = namedtuple('ArgumentGroup', ['type', 'args', 'options'])
@@ -14,29 +15,88 @@ PORT_LIST_WITH_ALL = 4
 FILE_PATH = 5
 FILE_FROM_DB = 6
 STREAM_FROM_PATH_OR_FILE = 7
+DURATION = 8
+FORCE = 9
 
 # 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)")
+
+
 
 
 OPTIONS_DB = {MULTIPLIER: ArgumentPack(['-m', '--multiplier'],
-                                 {'help': "Set multiplier for stream", 'dest': "mult", 'type': float}),
+                                 {'help': "Set multiplier for stream",
+                                  'dest': "mult",
+                                  'default': 1.0,
+                                  'type': match_multiplier}),
               PORT_LIST: ArgumentPack(['--port'],
                                         {"nargs": '+',
                                          # "action": "store_"
+                                         '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",
+                                         "dest": "all_ports",
                                          'help': "Set this flag to apply the command on all available ports"}),
-
+              DURATION: ArgumentPack(['-d'],
+                                        {"action": "store",
+                                         'metavar': 'TIME',
+                                         "type": match_time_unit,
+                                         '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'],
-                                      {'help': "File path to YAML file that describes a stream pack"}),
+                                      {'metavar': ('FILE', 'DB_NAME'),
+                                       'dest': 'file',
+                                       'nargs': 2,
+                                       'help': "File path to YAML file that describes a stream pack. "
+                                               "Second argument is a name to store the loaded yaml file into db."}),
               FILE_FROM_DB: ArgumentPack(['--db'],
-                                         {'help': "A stream pack which already loaded into console cache."}),
+                                         {'metavar': 'LOADED_STREAM_PACK',
+                                          'help': "A stream pack which already loaded into console cache."}),
               # advanced options
               PORT_LIST_WITH_ALL: ArgumentGroup(MUTEX, [PORT_LIST,
                                                         ALL_PORTS],
@@ -51,25 +111,23 @@ class CCmdArgParser(argparse.ArgumentParser):
 
     def __init__(self, *args, **kwargs):
         super(CCmdArgParser, self).__init__(*args, **kwargs)
-        pass
 
-    # def error(self, message):
+    # def exit(self, status=0, message=None):
     #     try:
-    #         super(CCmdArgParser, self).error(message)   # this will trigger system exit!
+    #         return super(CCmdArgParser, self).exit(status, message)   # this will trigger system exit!
     #     except SystemExit:
+    #         print "Caught system exit!!"
     #         return -1
-    #
-    #     # self.print_usage(sys.stderr)
-    #     # print ('%s: error: %s\n') % (self.prog, message)
-    #     # self.print_help()
-    #     return
+    #     # return
 
-    def exit(self, status=0, message=None):
+    def parse_args(self, args=None, namespace=None):
         try:
-            super(CCmdArgParser, self).exit(status, message)   # this will trigger system exit!
+            return super(CCmdArgParser, self).parse_args(args, namespace)
         except SystemExit:
-            return -1
-        return
+            # recover from system exit scenarios, such as "help", or bad arguments.
+            return None
+
+
 
 def gen_parser(op_name, description, *args):
     parser = CCmdArgParser(prog=op_name, conflict_handler='resolve',