rls2001 perf: fix hoststack test packet sizes

- TCP packet size is 1460B not 9000B
- QUIC packet size is 1280B not 9000B

Change-Id: I6604a74fa533db4ac782782c85ea54038688627a
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index 8278bf0..6d6f3f1 100644 (file)
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -457,7 +457,10 @@ class Regenerator:
             {u"frame_size": 0, u"phy_cores": i} for i in (1, 2, 4)
         ]
         hs_bps_kwargs_list = [
-            {u"frame_size": 0, u"phy_cores": 1},
+            {u"frame_size": 1460, u"phy_cores": 1},
+        ]
+        hs_quic_kwargs_list = [
+            {u"frame_size": 1280, u"phy_cores": 1},
         ]
 
         for in_filename in glob(pattern):
@@ -486,7 +489,10 @@ class Regenerator:
             elif in_filename[-10:] in (u"-cps.robot", u"-rps.robot"):
                 write_tcp_files(in_filename, in_prolog, hs_wrk_kwargs_list)
             elif in_filename.endswith(u"-bps.robot"):
-                write_tcp_files(in_filename, in_prolog, hs_bps_kwargs_list)
+                hoststack_kwargs_list = \
+                    hs_quic_kwargs_list if u"quic" in in_filename \
+                    else hs_bps_kwargs_list
+                write_tcp_files(in_filename, in_prolog, hoststack_kwargs_list)
             else:
                 raise RuntimeError(
                     f"Error in {in_filename}: non-primary suite type found."

diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py
index d419b29..c4ed606 100644 (file)
--- a/resources/libraries/python/autogen/Testcase.py
+++ b/resources/libraries/python/autogen/Testcase.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -110,8 +110,8 @@ class Testcase:
 | | phy_cores=${{cores_num}}
 '''
         else:
-            template_string = \
-                f"\n| ${{tc_num}}-9000B-${{cores_str}}c-{suite_id[:-4]}" \
-                f"-{suite_id[-3:]}\n" \
-                f"| | [Tags] | ${{cores_str}}C\n| | phy_cores=${{cores_num}}\n"
+            template_string = f'''
+| ${{tc_num}}-${{frame_str}}-${{cores_str}}c-{suite_id[:-4]}-{suite_id[-3:]}
+| | [Tags] | ${{cores_str}}C\n| | phy_cores=${{cores_num}}
+'''
         return cls(template_string)

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot
index d344426..2f28652 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot
@@ -17,9 +17,10 @@
 | Resource | resources/libraries/robot/hoststack/hoststack.robot
 |
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
+
 | ... | TCP | NIC_Intel-X710 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | HOSTSTACK
-| ... | LDPRELOAD | IPERF3 | 1CLIENT | 1STREAM | 9000B
+| ... | LDPRELOAD | IPERF3 | 1CLIENT | 1STREAM | 1460B
 | ... | eth-ip4tcpbase-ldpreload-iperf3
 |
 | Suite Setup | Setup suite single link no tg
@@ -29,7 +30,7 @@
 |
 | Test Template | Local template
 |
-| Documentation | *Iperf3 client -> Iperf3 server throughput.
+| Documentation | *Iperf3 client -> Iperf3 server goodput.
 |
 | ... | *[Top] Network Topologies:* DUT-DUT 2-node topology
 | ... | with single link between nodes.
@@ -58,6 +59,6 @@
 | | ... | Defered Failure From Hoststack Iperf3 Test Program
 
 *** Test Cases ***
-| tc01-9000B-1c-eth-ip4tcpbase-ldpreload-iperf3-bps
+| tc01-1460B-1c-eth-ip4tcpbase-ldpreload-iperf3-bps
 | | [Tags] | 1C
 | | phy_cores=${1}

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot
index f8cb279..21f81d4 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot
@@ -19,7 +19,7 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
 | ... | TCP | NIC_Intel-X710 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | HOSTSTACK
-| ... | NSIM | LDPRELOAD | IPERF3 | 1CLIENT | 1STREAM | 9000B
+| ... | NSIM | LDPRELOAD | IPERF3 | 1CLIENT | 1STREAM | 1460B
 | ... | eth-ip4tcpbase-nsim-ldpreload-iperf3
 |
 | Suite Setup | Setup suite single link no tg
@@ -29,7 +29,7 @@
 |
 | Test Template | Local template
 |
-| Documentation | *Iperf3 client -> Iperf3 server throughput.
+| Documentation | *Iperf3 client -> Iperf3 server goodput.
 |
 | ... | *[Top] Network Topologies:* DUT-DUT 2-node topology
 | ... | with single link between nodes.
@@ -60,6 +60,6 @@
 | | ... | Defered Failure From Hoststack Iperf3 Test Program
 
 *** Test Cases ***
-| tc01-9000B-1c-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps
+| tc01-1460B-1c-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps
 | | [Tags] | 1C
 | | phy_cores=${1}

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot
index ec78dfd..d8187af 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot
@@ -19,7 +19,7 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
 | ... | TCP | NIC_Intel-X710 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | HOSTSTACK
-| ... | LDPRELOAD | IPERF3 | 1CLIENT | 10STREAM | 9000B
+| ... | LDPRELOAD | IPERF3 | 1CLIENT | 10STREAM | 1460B
 | ... | eth-ip4tcpscale1cl10s-ldpreload-iperf3
 |
 | Suite Setup | Setup suite single link no tg
@@ -29,7 +29,7 @@
 |
 | Test Template | Local template
 |
-| Documentation | *Iperf3 client -> Iperf3 server throughput.
+| Documentation | *Iperf3 client -> Iperf3 server goodput.
 |
 | ... | *[Top] Network Topologies:* DUT-DUT 2-node topology
 | ... | with single link between nodes.
@@ -60,6 +60,6 @@
 | | ... | Defered Failure From Hoststack Iperf3 Test Program
 
 *** Test Cases ***
-| tc01-9000B-1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps
+| tc01-1460B-1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps
 | | [Tags] | 1C
 | | phy_cores=${1}

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot
index 50ba48c..ceb5eb0 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot
@@ -19,7 +19,7 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
 | ... | TCP | NIC_Intel-X710 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | HOSTSTACK
-| ... | NSIM | LDPRELOAD | IPERF3 | 1CLIENT | 10STREAM | 9000B
+| ... | NSIM | LDPRELOAD | IPERF3 | 1CLIENT | 10STREAM | 1460B
 | ... | eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3
 |
 | Suite Setup | Setup suite single link no tg
@@ -29,7 +29,7 @@
 |
 | Test Template | Local template
 |
-| Documentation | *Iperf3 client -> Iperf3 server throughput.
+| Documentation | *Iperf3 client -> Iperf3 server goodput.
 |
 | ... | *[Top] Network Topologies:* DUT-DUT 2-node topology
 | ... | with single link between nodes.
@@ -62,6 +62,6 @@
 | | ... | Defered Failure From Hoststack Iperf3 Test Program
 
 *** Test Cases ***
-| tc01-9000B-1c-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps
+| tc01-1460B-1c-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps
 | | [Tags] | 1C
 | | phy_cores=${1}

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot
index 6f49c7d..3f41e43 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot
@@ -19,7 +19,7 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
 | ... | NIC_Intel-X710 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | UDP | QUIC | VPPECHO
-| ... | 1CLIENT | 1STREAM | HOSTSTACK | 9000B | eth-ip4udpquicbase-vppecho
+| ... | 1CLIENT | 1STREAM | HOSTSTACK | 1280B | eth-ip4udpquicbase-vppecho
 |
 | Suite Setup | Setup suite single link no tg
 | Suite Teardown | Tear down suite
@@ -28,7 +28,7 @@
 |
 | Test Template | Local template
 |
-| Documentation | *QUIC Unidirectional Echo Client -> Echo Server throughput.
+| Documentation | *QUIC Unidirectional Echo Client -> Echo Server goodput.
 |
 | ... | *[Top] Network Topologies:* DUT-DUT 2-node topology
 | ... | with single link between nodes.
@@ -59,6 +59,6 @@
 | | ... | Defered Failure From Hoststack VPP Echo Test Program
 
 *** Test Cases ***
-| tc01-9000B-1c-eth-ip4udpquicbase-vppecho-bps
+| tc01-1280B-1c-eth-ip4udpquicbase-vppecho-bps
 | | [Tags] | 1C
 | | phy_cores=${1}

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot
index 42247ec..adaedb9 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot
@@ -19,7 +19,7 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
 | ... | NIC_Intel-X710 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | UDP | QUIC | VPPECHO
-| ... | HOSTSTACK | 10CLIENT | 10STREAM | 9000B
+| ... | HOSTSTACK | 10CLIENT | 10STREAM | 1280B
 | ... | eth-ip4udpquicscale10cl10s-vppecho
 |
 | Suite Setup | Setup suite single link no tg
@@ -29,7 +29,7 @@
 |
 | Test Template | Local template
 |
-| Documentation | *QUIC Unidirectional Echo Client -> Echo Server throughput.
+| Documentation | *QUIC Unidirectional Echo Client -> Echo Server goodput.
 |
 | ... | *[Top] Network Topologies:* DUT-DUT 2-node topology
 | ... | with single link between nodes.
@@ -64,6 +64,6 @@
 | | ... | Defered Failure From Hoststack VPP Echo Test Program
 
 *** Test Cases ***
-| tc01-9000B-1c-eth-ip4udpquicscale10cl10s-vppecho-bps
+| tc01-1280B-1c-eth-ip4udpquicscale10cl10s-vppecho-bps
 | | [Tags] | 1C
 | | phy_cores=${1}

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot
index f94c54b..b244ccc 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot
@@ -19,7 +19,7 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
 | ... | NIC_Intel-X710 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | UDP | QUIC | VPPECHO
-| ... | HOSTSTACK | 10CLIENT | 1STREAM | 9000B
+| ... | HOSTSTACK | 10CLIENT | 1STREAM | 1280B
 | ... | eth-ip4udpquicscale10cl1s-vppecho
 |
 | Suite Setup | Setup suite single link no tg
@@ -29,7 +29,7 @@
 |
 | Test Template | Local template
 |
-| Documentation | *QUIC Unidirectional Echo Client -> Echo Server throughput.
+| Documentation | *QUIC Unidirectional Echo Client -> Echo Server goodput.
 |
 | ... | *[Top] Network Topologies:* DUT-DUT 2-node topology
 | ... | with single link between nodes.
@@ -63,6 +63,6 @@
 | | ... | Defered Failure From Hoststack VPP Echo Test Program
 
 *** Test Cases ***
-| tc01-9000B-1c-eth-ip4udpquicscale10cl1s-vppecho-bps
+| tc01-1280B-1c-eth-ip4udpquicscale10cl1s-vppecho-bps
 | | [Tags] | 1C
 | | phy_cores=${1}

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot
index 0f303f8..aee102d 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot
@@ -19,7 +19,7 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
 | ... | NIC_Intel-X710 | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0 | UDP | QUIC | VPPECHO
-| ... | HOSTSTACK | 1CLIENT | 10STREAM | 9000B
+| ... | HOSTSTACK | 1CLIENT | 10STREAM | 1280B
 | ... | eth-ip4udpquicscale1cl10s-vppecho
 |
 | Suite Setup | Setup suite single link no tg
@@ -29,7 +29,7 @@
 |
 | Test Template | Local template
 |
-| Documentation | *QUIC Unidirectional Echo Client -> Echo Server throughput.
+| Documentation | *QUIC Unidirectional Echo Client -> Echo Server goodput.
 |
 | ... | *[Top] Network Topologies:* DUT-DUT 2-node topology
 | ... | with single link between nodes.
@@ -63,6 +63,6 @@
 | | ... | Defered Failure From Hoststack VPP Echo Test Program
 
 *** Test Cases ***
-| tc01-9000B-1c-eth-ip4udpquicscale1cl10s-vppecho-bps
+| tc01-1280B-1c-eth-ip4udpquicscale1cl10s-vppecho-bps
 | | [Tags] | 1C
 | | phy_cores=${1}