From: Miroslav Miklus <mmiklus@cisco.com>
Date: Mon, 3 Oct 2016 14:30:44 +0000 (+0200)
Subject: IPv4 2M scale tests - adjust heapsize to 3G
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=80e71dac74145241aef844491ebf21cc486d4a23

IPv4 2M scale tests - adjust heapsize to 3G

Change-Id: I78e700e2137fd35d79c9b6b5ba27bb21adc3f6fa
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
---

diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot
index 4764bf629e..238749aef1 100644
--- a/resources/libraries/robot/default.robot
+++ b/resources/libraries/robot/default.robot
@@ -147,6 +147,16 @@
 | | [Arguments] | ${node} | ${pci_address}
 | | Add PCI device | ${node} | ${pci_address}
 
+| Add Heapsize Config to all DUTs
+| | [Documentation] | Add Add Heapsize Config to VPP startup configuration
+| | ...             | to all DUTs
+| | ... | *Arguments:*
+| | ... | - ${heapsize} - Heapsize string (5G, 200M, ...)
+| | [Arguments] | ${heapsize}
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Add Heapsize Config | ${nodes['${dut}']} | ${heapsize}
+
 | Add No Multi Seg to all DUTs
 | | [Documentation] | Add No Multi Seg to VPP startup configuration to all
 | | ...             | DUTs
diff --git a/tests/perf/Long_IPv4_Fib_2M_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_Fib_2M_Intel-X520-DA2.robot
index de7450bc46..5a0427553c 100644
--- a/tests/perf/Long_IPv4_Fib_2M_Intel-X520-DA2.robot
+++ b/tests/perf/Long_IPv4_Fib_2M_Intel-X520-DA2.robot
@@ -69,6 +69,7 @@
 | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -93,6 +94,7 @@
 | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -119,6 +121,7 @@
 | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -143,6 +146,7 @@
 | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -168,6 +172,7 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -191,6 +196,7 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -217,6 +223,7 @@
 | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -241,6 +248,7 @@
 | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -267,6 +275,7 @@
 | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -291,6 +300,7 @@
 | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -316,6 +326,7 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -339,6 +350,7 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -365,6 +377,7 @@
 | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -389,6 +402,7 @@
 | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -415,6 +429,7 @@
 | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -439,6 +454,7 @@
 | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -464,6 +480,7 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -487,6 +504,7 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
diff --git a/tests/perf/Short_IPv4_Fib_2M_Intel-X520-DA2.robot b/tests/perf/Short_IPv4_Fib_2M_Intel-X520-DA2.robot
index 9adaf23dcb..aaf94d5946 100644
--- a/tests/perf/Short_IPv4_Fib_2M_Intel-X520-DA2.robot
+++ b/tests/perf/Short_IPv4_Fib_2M_Intel-X520-DA2.robot
@@ -56,6 +56,7 @@
 | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -75,6 +76,7 @@
 | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -93,6 +95,7 @@
 | | ${rate}= | Set Variable | 138580pps
 | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -112,6 +115,7 @@
 | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -131,6 +135,7 @@
 | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -149,6 +154,7 @@
 | | ${rate}= | Set Variable | 138580pps
 | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -168,6 +174,7 @@
 | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -187,6 +194,7 @@
 | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
 | | And   Add No Multi Seg to all DUTs
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}
@@ -205,6 +213,7 @@
 | | ${rate}= | Set Variable | 138580pps
 | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
 | | And   Add PCI devices to DUTs from 3-node single link topology
+| | And   Add Heapsize Config to all DUTs | 3G
 | | And   Apply startup configuration on all VPP DUTs
 | | And   Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ...   | ${rts_per_flow}