[v2,6/8] dts: use testpmd params for scatter test suite
Checks
Commit Message
Update the buffer scatter test suite to use TestPmdParameters
instead of the StrParams implementation.
Signed-off-by: Luca Vizzarro <luca.vizzarro@arm.com>
Reviewed-by: Paul Szczepanek <paul.szczepanek@arm.com>
---
dts/tests/TestSuite_pmd_buffer_scatter.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
Comments
Tested-by: Nicholas Pratte <npratte@iol.unh.edu>
Reviewed-by: Nicholas Pratte <npratte@iol.unh.edu>
On Thu, May 9, 2024 at 7:21 AM Luca Vizzarro <luca.vizzarro@arm.com> wrote:
>
> Update the buffer scatter test suite to use TestPmdParameters
> instead of the StrParams implementation.
>
> Signed-off-by: Luca Vizzarro <luca.vizzarro@arm.com>
> Reviewed-by: Paul Szczepanek <paul.szczepanek@arm.com>
> ---
> dts/tests/TestSuite_pmd_buffer_scatter.py | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/dts/tests/TestSuite_pmd_buffer_scatter.py b/dts/tests/TestSuite_pmd_buffer_scatter.py
> index 578b5a4318..6d206c1a40 100644
> --- a/dts/tests/TestSuite_pmd_buffer_scatter.py
> +++ b/dts/tests/TestSuite_pmd_buffer_scatter.py
> @@ -16,14 +16,14 @@
> """
>
> import struct
> +from dataclasses import asdict
>
> from scapy.layers.inet import IP # type: ignore[import-untyped]
> from scapy.layers.l2 import Ether # type: ignore[import-untyped]
> from scapy.packet import Raw # type: ignore[import-untyped]
> from scapy.utils import hexstr # type: ignore[import-untyped]
>
> -from framework.params import Params
> -from framework.params.testpmd import SimpleForwardingModes
> +from framework.params.testpmd import SimpleForwardingModes, TestPmdParams
> from framework.remote_session.testpmd_shell import TestPmdShell
> from framework.test_suite import TestSuite
>
> @@ -105,16 +105,16 @@ def pmd_scatter(self, mbsize: int) -> None:
> """
> testpmd = self.sut_node.create_interactive_shell(
> TestPmdShell,
> - app_params=Params.from_str(
> - "--mbcache=200 "
> - f"--mbuf-size={mbsize} "
> - "--max-pkt-len=9000 "
> - "--port-topology=paired "
> - "--tx-offloads=0x00008000"
> + app_params=TestPmdParams(
> + forward_mode=SimpleForwardingModes.mac,
> + mbcache=200,
> + mbuf_size=[mbsize],
> + max_pkt_len=9000,
> + tx_offloads=0x00008000,
> + **asdict(self.sut_node.create_eal_parameters()),
> ),
> privileged=True,
> )
> - testpmd.set_forward_mode(SimpleForwardingModes.mac)
> testpmd.start()
>
> for offset in [-1, 0, 1, 4, 5]:
> --
> 2.34.1
>
Reviewed-by: Jeremy Spewock <jspewock@iol.unh.edu>
@@ -16,14 +16,14 @@
"""
import struct
+from dataclasses import asdict
from scapy.layers.inet import IP # type: ignore[import-untyped]
from scapy.layers.l2 import Ether # type: ignore[import-untyped]
from scapy.packet import Raw # type: ignore[import-untyped]
from scapy.utils import hexstr # type: ignore[import-untyped]
-from framework.params import Params
-from framework.params.testpmd import SimpleForwardingModes
+from framework.params.testpmd import SimpleForwardingModes, TestPmdParams
from framework.remote_session.testpmd_shell import TestPmdShell
from framework.test_suite import TestSuite
@@ -105,16 +105,16 @@ def pmd_scatter(self, mbsize: int) -> None:
"""
testpmd = self.sut_node.create_interactive_shell(
TestPmdShell,
- app_params=Params.from_str(
- "--mbcache=200 "
- f"--mbuf-size={mbsize} "
- "--max-pkt-len=9000 "
- "--port-topology=paired "
- "--tx-offloads=0x00008000"
+ app_params=TestPmdParams(
+ forward_mode=SimpleForwardingModes.mac,
+ mbcache=200,
+ mbuf_size=[mbsize],
+ max_pkt_len=9000,
+ tx_offloads=0x00008000,
+ **asdict(self.sut_node.create_eal_parameters()),
),
privileged=True,
)
- testpmd.set_forward_mode(SimpleForwardingModes.mac)
testpmd.start()
for offset in [-1, 0, 1, 4, 5]: