diff options
| author |   Yaroslav Brustinov <ybrustin@cisco.com> | 2016-10-25 16:46:47 +0200 |
|---|---|---|
| committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-10-28 14:38:35 +0200 |
| commit | 1016c3d481dc9e2eb9ab03332aff441c03239614 (patch) | |
| tree | c0a0946a8418aaea8521ed6fe8c72ada455f1b43 /scripts/automation/trex_control_plane/stl/trex_stl_lib | |
| parent | 528f62bb50ca111f387b56b280f3a4b271f8ace3 (diff) | |
console: rearrange lines at "stats --ps"
in case of start traffic with link down, return error with link state
Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>
Diffstat (limited to 'scripts/automation/trex_control_plane/stl/trex_stl_lib')
3 files changed, 11 insertions, 6 deletions
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 a2821cc2..80a4c4dc 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 @@ -2050,6 +2050,11 @@ class STLClient(object): validate_type('total', total, bool) validate_type('core_mask', core_mask, (int, list)) + # verify link status + ports_link_down = [port_id for port_id in ports if self.ports[port_id].attr.get('link',{}).get('up') == False] + if not force and ports_link_down: + raise STLError("Port(s) %s - link DOWN - check the connection or specify 'force'" % ports_link_down) + ######################### # decode core mask argument decoded_mask = self.__decode_core_mask(ports, core_mask) diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py index d0f34f48..1ce21973 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py @@ -719,8 +719,8 @@ class Port(object): "--": "", "---": "", "link speed": "{speed} Gb/s".format(speed=info['speed']), - "status": info['status'], - "link": info['link'], + "port status": info['status'], + "link status": info['link'], "promiscuous" : info['prom'], "flow ctrl" : info['fc'], } diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py index fd4ad953..915eabb2 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py @@ -342,7 +342,7 @@ class CTRexInfoGenerator(object): def _generate_latency_stats(self): lat_stats = self._latency_stats_ref - latency_window_size = 10 + latency_window_size = 14 # for TUI - maximum 5 pg_ids = list(filter(is_intable, lat_stats.latest_stats.keys()))[:5] @@ -456,7 +456,7 @@ class CTRexInfoGenerator(object): stats_table.set_cols_width([10, 3, 6] + [3] * (show_len - 1)) stats_table.set_cols_dtype(['t'] * (show_len + 2)) - for i in range(min(14, len(cpu_stats))): + for i in range(min(18, len(cpu_stats))): history = cpu_stats[i]["history"] ports = cpu_stats[i]["ports"] avg = int(round(sum(history[:avg_len]) / avg_len)) @@ -666,9 +666,9 @@ class CTRexInfoGenerator(object): return_stats_data = {} per_field_status = OrderedDict([("driver", []), ("description", []), + ("link status", []), ("link speed", []), - ("link", []), - ("status", []), + ("port status", []), ("promiscuous", []), ("flow ctrl", []), ("--", []), |