1 files changed, 81 insertions, 1 deletions
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
index 34cafd79..e7f04546 100755
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
@@ -1,6 +1,6 @@
 import argparse
 from collections import namedtuple, OrderedDict
-from .common import list_intersect, list_difference
+from .common import list_intersect, list_difference, is_valid_ipv4, is_valid_mac
 from .text_opts import format_text
 from ..trex_stl_types import *
 from .constants import ON_OFF_DICT, UP_DOWN_DICT, FLOW_CTRL_DICT
@@ -45,6 +45,17 @@ FLOW_CTRL = 28
 SUPPORTED = 29
 FILE_PATH_NO_CHECK = 30
 
+OUTPUT_FILENAME = 31
+ALL_FILES = 32
+LIMIT = 33
+PORT_RESTART   = 34
+
+IPV4 = 35
+DEST = 36
+RETRIES = 37
+
+RX_FILTER_MODE = 38
+
 GLOBAL_STATS = 50
 PORT_STATS = 51
 PORT_STATUS = 52
@@ -218,8 +229,20 @@ def is_valid_file(filename):
 
     return filename
 
+def check_ipv4_addr (ipv4_str):
+    if not is_valid_ipv4(ipv4_str):
+        raise argparse.ArgumentTypeError("invalid IPv4 address: '{0}'".format(ipv4_str))
 
+    return ipv4_str
 
+    
+def check_dest_addr (addr):
+    if not (is_valid_ipv4(addr) or is_valid_mac(addr)):
+        raise argparse.ArgumentTypeError("not a valid IPv4 or MAC address: '{0}'".format(addr))
+        
+    return addr
+
+    
 def decode_tunables (tunable_str):
     tunables = {}
 
@@ -304,6 +327,62 @@ OPTIONS_DB = {MULTIPLIER: ArgumentPack(['-m', '--multiplier'],
                                     'dest': 'flow_ctrl',
                                     'choices': FLOW_CTRL_DICT}),
 
+              RX_FILTER_MODE: ArgumentPack(['--rxf'],
+                                           {'help': 'Set RX filtering mode',
+                                            'dest': 'rx_filter_mode',
+                                            'choices': ['hw', 'all']}),
+
+
+              IPV4: ArgumentPack(['--ipv4'],
+                                 {'help': 'IPv4 address(s) for the port(s)',
+                                  'dest': 'ipv4',
+                                  'nargs': '+',
+                                  'default': None,
+                                  'type': check_ipv4_addr}),
+
+              DEST: ArgumentPack(['--dest'],
+                                 {'help': 'Destination address(s) for the port(s) in either IPv4 or MAC format',
+                                  'dest': 'dest',
+                                  'nargs': '+',
+                                  'default': None,
+                                  'type': check_dest_addr}),
+              
+              RETRIES: ArgumentPack(['-r', '--retries'],
+                                    {'help': 'retries count [default is zero]',
+                                     'dest': 'retries',
+                                     'default':  0,
+                                     'type': int}),
+                
+
+              OUTPUT_FILENAME: ArgumentPack(['-o', '--output'],
+                                            {'help': 'Output PCAP filename',
+                                             'dest': 'output_filename',
+                                             'default': None,
+                                             'required': True,
+                                             'type': str}),
+
+
+              PORT_RESTART: ArgumentPack(['-r', '--restart'],
+                                         {'help': 'hard restart port(s)',
+                                          'dest': 'restart',
+                                          'default': False,
+                                          'action': 'store_true'}),
+
+
+              ALL_FILES: ArgumentPack(['--all'],
+                                      {'help': 'change RX port filter to fetch all packets',
+                                       'dest': 'all',
+                                       'default': False,
+                                       'action': "store_true"}),
+
+
+              LIMIT: ArgumentPack(['-l', '--limit'],
+                                  {'help': 'Limit the packet count to be written to the file',
+                                   'dest': 'limit',
+                                   'default':  1000,
+                                   'type': int}),
+
+
               SUPPORTED: ArgumentPack(['--supp'],
                                    {'help': 'Show which attributes are supported by current NICs',
                                     'default': None,
@@ -461,6 +540,7 @@ OPTIONS_DB = {MULTIPLIER: ArgumentPack(['-m', '--multiplier'],
                                                         ALL_PORTS],
                                                 {'required': False}),
 
+
               STREAM_FROM_PATH_OR_FILE: ArgumentGroup(MUTEX, [FILE_PATH,
                                                               FILE_FROM_DB],
                                                       {'required': True}),