From d4dc81145d339e9cae7991f528b472d4c4178913 Mon Sep 17 00:00:00 2001 From: imarom Date: Wed, 23 Nov 2016 12:00:01 +0200 Subject: merge issues Signed-off-by: imarom --- .../trex_control_plane/stl/trex_stl_lib/trex_stl_client.py | 5 ++++- .../trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'scripts/automation/trex_control_plane') diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py index 9e727993..d23010db 100755 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py @@ -1765,6 +1765,9 @@ class STLClient(object): self.__release(ports) raise STLError(rc) + for port_id in ports: + if not self.ports[port_id].is_resolved(): + self.logger.log(format_text('*** Warning - Port {0} destination is unresolved ***'.format(port_id), 'bold')) @__api_check(True) def release (self, ports = None): @@ -3118,7 +3121,7 @@ class STLClient(object): parsing_opts.SOURCE_PORT, parsing_opts.PING_IPV4, parsing_opts.PKT_SIZE, - parsing_opts.COUNT) + parsing_opts.PING_COUNT) opts = parser.parse_args(line.split()) if not opts: 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 f20bdad6..8a667dc0 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 @@ -57,7 +57,8 @@ RETRIES = 37 RX_FILTER_MODE = 38 SOURCE_PORT = 39 PING_IPV4 = 40 -PKT_SIZE = 41 +PING_COUNT = 41 +PKT_SIZE = 42 GLOBAL_STATS = 50 PORT_STATS = 51 @@ -431,6 +432,12 @@ OPTIONS_DB = {MULTIPLIER: ArgumentPack(['-m', '--multiplier'], 'required': True, 'type': check_ipv4_addr}), + PING_COUNT: ArgumentPack(['-n', '--count'], + {'help': 'How many times to ping [default is 5]', + 'dest': 'count', + 'default': 5, + 'type': int}), + PKT_SIZE: ArgumentPack(['-s'], {'dest':'pkt_size', 'help': 'packet size to use', -- cgit 1.2.3-korg