ip6lisp: Do not fail on string overhead value

+ Set overhead in those suites to numeric values.
+ Change the library to tolerate string representations anyway.

Change-Id: Ic6215840f7797801c994a38db5637999eb85a034
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/resources/libraries/robot/performance/performance_vars.robot b/resources/libraries/robot/performance/performance_vars.robot
index 9fff489..4f2cc50 100644 (file)
--- a/resources/libraries/robot/performance/performance_vars.robot
+++ b/resources/libraries/robot/performance/performance_vars.robot
@@ -514,7 +514,8 @@
 | | ... | Set Variable | ${353.83333}
 | | ... | ELSE
 | | ... | Convert To Number | ${frame_size}
-| | ${avg_frame_size} = | Evaluate | $bare_avg_frame_size + $max_overhead
+| | # Do not use $max_overhead (without braces), that does not tolerate string.
+| | ${avg_frame_size} = | Evaluate | ${bare_avg_frame_size} + ${max_overhead}
 | | Set Test Variable | \${avg_frame_size}
 | | ${bare_max_frame_size} = | Run Keyword If | '${frame_size}' == 'IMIX_v4_1'
 | | ... | Set Variable | ${1518}

diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
index ce37625..aad9d1f 100644 (file)
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
@@ -56,7 +56,7 @@
 | ${nic_pfs}= | 2
 | ${nic_vfs}= | 0
 | ${osi_layer}= | L3
-| ${overhead}= | 48
+| ${overhead}= | ${48}
 # Traffic profile:
 | ${traffic_profile}= | trex-stl-3n-ethip6-ip6src253
 

diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
index 620a864..df45bff 100644 (file)
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
@@ -56,7 +56,7 @@
 | ${nic_pfs}= | 2
 | ${nic_vfs}= | 0
 | ${osi_layer}= | L3
-| ${overhead}= | 8
+| ${overhead}= | ${8}
 # Traffic profile:
 | ${traffic_profile}= | trex-stl-3n-ethip6-ip6src253