aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorMiroslav Miklus <mmiklus@cisco.com>2016-05-25 21:50:50 +0200
committerPeter Mikus <pmikus@cisco.com>2016-07-11 12:29:04 +0000
commit3bb84bee3516c1e7326becfc3c2f70bf6e3f59ce (patch)
tree06af4580f5c98469f05bb73e4933aef200f888af /resources
parente8cb6da0c3687f63b4973ef11ee2aed43c37bd87 (diff)
TB2 XL710 topology files
JIRA: CSIT-106 Change-Id: If3e76d971c7196da3f83a8daacd1308c6374c786 Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/TrafficGenerator.py1
-rw-r--r--resources/libraries/python/VatJsonUtil.py5
-rw-r--r--resources/libraries/robot/performance.robot15
3 files changed, 18 insertions, 3 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index a98fb0df12..91a43fb0ca 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -182,7 +182,6 @@ class TrafficGenerator(object):
"- port_limit : 2\n"
" version : 2\n"
" interfaces : [\"{}\",\"{}\"]\n"
- " port_bandwidth_gb : 10\n"
" port_info :\n"
" - dest_mac : [{}]\n"
" src_mac : [{}]\n"
diff --git a/resources/libraries/python/VatJsonUtil.py b/resources/libraries/python/VatJsonUtil.py
index e17375ab56..1cafff0d27 100644
--- a/resources/libraries/python/VatJsonUtil.py
+++ b/resources/libraries/python/VatJsonUtil.py
@@ -95,8 +95,9 @@ class VatJsonUtil(object):
interface_dict = VatJsonUtil.get_vpp_interface_by_mac(
interface_list, if_mac)
if not interface_dict:
- raise Exception('Interface {0} not found by MAC {1}'
- .format(ifc, if_mac))
+ logger.trace('Interface {0} not found by MAC {1}'
+ .format(ifc, if_mac))
+ continue
ifc['name'] = interface_dict["interface_name"]
ifc['vpp_sw_index'] = interface_dict["sw_if_index"]
ifc['mtu'] = interface_dict["mtu"]
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 53fbf26488..cb9abe5176 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -53,6 +53,14 @@
| | ${10Ge_linerate_pps_1522B}= | Set Variable | 810635
| | ${10Ge_linerate_pps_9000B}= | Set Variable | 138580
| | ${10Ge_linerate_pps_9004B}= | Set Variable | 138519
+| | ${40Ge_linerate_pps_64B}= | Set Variable | 59523809
+| | ${40Ge_linerate_pps_68B}= | Set Variable | 56818181
+| | ${40Ge_linerate_pps_78B}= | Set Variable | 51020408
+| | ${40Ge_linerate_pps_1518B}= | Set Variable | 3250975
+| | ${40Ge_linerate_pps_1522B}= | Set Variable | 3242542
+| | ${40Ge_linerate_pps_9000B}= | Set Variable | 554323
+| | ${40Ge_linerate_pps_9004B}= | Set Variable | 554078
+
| | Set Suite Variable | ${10Ge_linerate_pps_64B}
| | Set Suite Variable | ${10Ge_linerate_pps_68B}
| | Set Suite Variable | ${10Ge_linerate_pps_78B}
@@ -60,6 +68,13 @@
| | Set Suite Variable | ${10Ge_linerate_pps_1522B}
| | Set Suite Variable | ${10Ge_linerate_pps_9000B}
| | Set Suite Variable | ${10Ge_linerate_pps_9004B}
+| | Set Suite Variable | ${40Ge_linerate_pps_64B}
+| | Set Suite Variable | ${40Ge_linerate_pps_68B}
+| | Set Suite Variable | ${40Ge_linerate_pps_78B}
+| | Set Suite Variable | ${40Ge_linerate_pps_1518B}
+| | Set Suite Variable | ${40Ge_linerate_pps_1522B}
+| | Set Suite Variable | ${40Ge_linerate_pps_9000B}
+| | Set Suite Variable | ${40Ge_linerate_pps_9004B}
| Setup performance global Variables
| | [Documentation] | Setup performance global Variables