diff options
| author |   Hanoh Haim <hhaim@cisco.com> | 2015-11-22 13:03:34 +0200 |
|---|---|---|
| committer | Hanoh Haim <hhaim@cisco.com> | 2015-11-22 13:03:34 +0200 |
| commit | b08b2c0990d29141a1c6eecc6a8fed405cf8b979 (patch) | |
| tree | ac54796d466126108aa5046b7ab62d38ba2866bd /scripts/automation/trex_control_plane/console | |
| parent | 3408c03067a85789b2128352fdc2343ab707ae32 (diff) | |
| parent | 903b855393acd411e85b25e6b2df1158d9fe2856 (diff) | |
Merge from master
Diffstat (limited to 'scripts/automation/trex_control_plane/console')
| -rwxr-xr-x | scripts/automation/trex_control_plane/console/trex_console.py | 5 | ||||
| -rw-r--r-- | scripts/automation/trex_control_plane/console/trex_status.py | 16 |
2 files changed, 6 insertions, 15 deletions
diff --git a/scripts/automation/trex_control_plane/console/trex_console.py b/scripts/automation/trex_control_plane/console/trex_console.py index ea2f5f12..995965fd 100755 --- a/scripts/automation/trex_control_plane/console/trex_console.py +++ b/scripts/automation/trex_control_plane/console/trex_console.py @@ -197,8 +197,6 @@ class TRexConsole(TRexGeneralCmd): if rc.bad(): return - def do_test (self, line): - print self.stateless_client.get_acquired_ports() # set verbose on / off def do_verbose(self, line): @@ -252,7 +250,7 @@ class TRexConsole(TRexGeneralCmd): return TRexConsole.tree_autocomplete(s[l - 1]) def do_start(self, line): - '''Start selected traffic in specified ports on TRex\n''' + '''Start selected traffic in specified port(s) on TRex\n''' self.stateless_client.cmd_start_line(line) @@ -262,6 +260,7 @@ class TRexConsole(TRexGeneralCmd): ############# stop def do_stop(self, line): + '''stops port(s) transmitting traffic\n''' self.stateless_client.cmd_stop_line(line) diff --git a/scripts/automation/trex_control_plane/console/trex_status.py b/scripts/automation/trex_control_plane/console/trex_status.py index a54b718e..869812a1 100644 --- a/scripts/automation/trex_control_plane/console/trex_status.py +++ b/scripts/automation/trex_control_plane/console/trex_status.py @@ -398,13 +398,9 @@ class TrexStatus(): self.general_stats = stateless_client.get_stats_async().get_general_stats() # fetch server info - rc, self.server_sys_info = self.stateless_client.get_system_info() - if not rc: - return + self.server_sys_info = self.stateless_client.get_system_info() - rc, self.server_version = self.stateless_client.get_version() - if not rc: - return + self.server_version = self.stateless_client.get_version() # list of owned ports self.owned_ports_list = self.stateless_client.get_acquired_ports() @@ -416,9 +412,7 @@ class TrexStatus(): self.owned_ports[str(port_id)] = {} self.owned_ports[str(port_id)]['streams'] = {} - rc, stream_list = self.stateless_client.get_all_streams(port_id) - if not rc: - raise Exception("unable to get streams") + stream_list = self.stateless_client.get_all_streams(port_id) self.owned_ports[str(port_id)] = stream_list @@ -481,9 +475,7 @@ class TrexStatus(): self.owned_ports[str(port_id)] = {} self.owned_ports[str(port_id)]['streams'] = {} - rc, stream_list = self.stateless_client.get_all_streams(port_id) - if not rc: - raise Exception("unable to get streams") + stream_list = self.stateless_client.get_all_streams(port_id) self.owned_ports[str(port_id)] = stream_list |