aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-07-24 08:55:53 +0000
committerVratko Polak <vrpolak@cisco.com>2018-07-24 13:34:11 +0200
commit491fea98425d47eb02a5581666815557c57ef935 (patch)
tree1e631f73c2516120f42e7785762298a505133af5 /tests/vpp
parent83bba1edaebd4a9a9b9c752bc75db318660a117e (diff)
CSIT-1097: Unify max NIC bandwidth in ip4
Also, minor fix in ip6. Change-Id: I3a23e49d2162e34a1d2a8671ae9f7e74b832315c Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'tests/vpp')
-rw-r--r--tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-mrr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-mrr.robot6
-rw-r--r--tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-ndrpdr.robot11
4 files changed, 12 insertions, 15 deletions
diff --git a/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-mrr.robot b/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-mrr.robot
index aebe1e85b8..2556649d3c 100644
--- a/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-mrr.robot
+++ b/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-mrr.robot
@@ -44,8 +44,8 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-# XXV710-DA2 bandwidth limit ~50Gbps/2=25Gbps
-| ${s_25G} | ${25000000000}
+# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G} | ${24500000000}
# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
| ${s_18.75Mpps} | ${18750000}
# Traffic profile:
diff --git a/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ndrpdr.robot
index a1d6aaa16a..3ef23ba1ab 100644
--- a/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ndrpdr.robot
@@ -49,8 +49,8 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-# XXV710-DA2 bandwidth limit ~50Gbps/2=25Gbps
-| ${s_25G} | ${25000000000}
+# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G} | ${24500000000}
# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
| ${s_18.75Mpps} | ${18750000}
# Traffic profile:
@@ -77,7 +77,7 @@
| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
| | And Add PCI devices to all DUTs
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_25G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
| | And Apply startup configuration on all VPP DUTs
| | When Initialize IPv4 forwarding in 2-node circular topology
| | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-mrr.robot b/tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-mrr.robot
index eacbafdd2d..8828e9a8d0 100644
--- a/tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-mrr.robot
+++ b/tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-mrr.robot
@@ -45,8 +45,8 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-# XXV710-DA2 bandwidth limit ~50Gbps/2=25Gbps
-| ${s_25G} | ${25000000000}
+# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G} | ${24500000000}
# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
| ${s_18.75Mpps} | ${18750000}
# Traffic profile:
@@ -71,7 +71,7 @@
| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
| | And Add PCI devices to all DUTs
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_25G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
| | And Apply startup configuration on all VPP DUTs
| | And Initialize IPv6 forwarding in 2-node circular topology
| | Then Traffic should pass with maximum rate
diff --git a/tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-ndrpdr.robot
index 08df2d35f7..a7cfccedc9 100644
--- a/tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-25ge2p1xxv710-ethip6-ip6base-ndrpdr.robot
@@ -49,8 +49,8 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-# XXV710-DA2 bandwidth limit ~50Gbps/2=25Gbps
-| ${s_25G} | ${25000000000}
+# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G} | ${24500000000}
# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
| ${s_18.75Mpps} | ${18750000}
# Traffic profile:
@@ -73,14 +73,11 @@
| | ...
| | Set Test Variable | ${framesize}
| | Set Test Variable | ${min_rate} | ${20000}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_25G} | ${get_framesize}
-| | ${max_rate}= | Set Variable If
-| | ... | ${max_rate} > ${s_18.75Mpps} | ${s_18.75Mpps} | ${max_rate}
+| | ...
| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
| | And Add PCI devices to all DUTs
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_25G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
| | And Apply startup configuration on all VPP DUTs
| | And Initialize IPv6 forwarding in 2-node circular topology
| | Then Find NDR and PDR intervals using optimized search