From 69f6ba4c5dfd0848397da01436671e7c5a0551a9 Mon Sep 17 00:00:00 2001
From: Yaroslav Brustinov <ybrustin@cisco.com>
Date: Tue, 3 Jan 2017 17:54:20 +0200
Subject: STL Console: fix crash in case of no supported speeds reported by
DPDK Regression: update stl performance kiwi benchmark (was my typo)
Change-Id: I0ea615d2511ea0339665e8fa5c8621eec9ebcb1e
Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>
---
scripts/automation/regression/setups/kiwi02/benchmark.yaml | 2 +-
scripts/automation/trex_control_plane/stl/console/trex_console.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'scripts/automation')
diff --git a/scripts/automation/regression/setups/kiwi02/benchmark.yaml b/scripts/automation/regression/setups/kiwi02/benchmark.yaml
index 6e29d196..5337b878 100644
--- a/scripts/automation/regression/setups/kiwi02/benchmark.yaml
+++ b/scripts/automation/regression/setups/kiwi02/benchmark.yaml
@@ -254,7 +254,7 @@ test_performance_vm_single_cpu:
cfg:
mult : "90%"
mpps_per_core_golden :
- min: 11.5
+ min: 11.2
max: 13.1
diff --git a/scripts/automation/trex_control_plane/stl/console/trex_console.py b/scripts/automation/trex_control_plane/stl/console/trex_console.py
index 7d47128b..cecdd72e 100755
--- a/scripts/automation/trex_control_plane/stl/console/trex_console.py
+++ b/scripts/automation/trex_control_plane/stl/console/trex_console.py
@@ -838,10 +838,10 @@ def show_intro (logger, c):
# find out which NICs the server has
port_types = {}
for port in x['ports']:
- if 'supp_speeds' in port:
+ if 'supp_speeds' in port and port['supp_speeds']:
speed = max(port['supp_speeds']) // 1000
else:
- speed = port['speed']
+ speed = c.ports[port['index']].get_speed_gbps()
key = (speed, port.get('description', port['driver']))
if key not in port_types:
port_types[key] = 0
--
cgit