patch 'dts: fix deterministic doc' has been queued to stable release 24.11.3

Kevin Traynor ktraynor at redhat.com
Fri Jul 18 21:31:34 CEST 2025


Hi,

FYI, your patch has been queued to stable release 24.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/23/25. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/aad310ede343b3786400e292270df4f8902ba161

Thanks.

Kevin

---
>From aad310ede343b3786400e292270df4f8902ba161 Mon Sep 17 00:00:00 2001
From: Clemens Famulla-Conrad <cfamullaconrad at suse.com>
Date: Wed, 11 Jun 2025 16:05:30 +0200
Subject: [PATCH] dts: fix deterministic doc

[ upstream commit 5603ab87f2ed666c59cdb3ef7a210c68f3af1f2d ]

Previously, `capture_name` defaulted to a "dynamic" value.
This caused non-deterministic documentation and could lead
to overwriting capture files if the method was called
multiple times within a single Python process.

Bugzilla ID: 1718
Fixes: cecfe0aabf58 ("dts: add traffic generator abstractions")

Signed-off-by: Clemens Famulla-Conrad <cfamullaconrad at suse.com>
Reviewed-by: Luca Vizzarro <luca.vizzarro at arm.com>
---
 .mailmap                                                     | 1 +
 .../traffic_generator/capturing_traffic_generator.py         | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index fc55ecbb4a..4b8a6fc21d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -275,4 +275,5 @@ Ciara Loftus <ciara.loftus at intel.com>
 Ciara Power <ciara.power at intel.com>
 Claire Murphy <claire.k.murphy at intel.com>
+Clemens Famulla-Conrad <cfamullaconrad at suse.com>
 Cody Doucette <doucette at bu.edu>
 Congwen Zhang <zhang.congwen at zte.com.cn>
diff --git a/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py b/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py
index 66a77da9c4..f485043f73 100644
--- a/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py
+++ b/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py
@@ -71,5 +71,5 @@ class CapturingTrafficGenerator(TrafficGenerator):
         filter_config: PacketFilteringConfig,
         duration: float,
-        capture_name: str = _get_default_capture_name(),
+        capture_name: str = "",
     ) -> list[Packet]:
         """Send `packets` and capture received traffic.
@@ -105,4 +105,7 @@ class CapturingTrafficGenerator(TrafficGenerator):
         )
 
+        if not capture_name:
+            capture_name = _get_default_capture_name()
+
         self._logger.debug(f"Received packets: {get_packet_summaries(received_packets)}")
         self._write_capture_from_packets(capture_name, received_packets)
-- 
2.50.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-18 20:29:16.582029778 +0100
+++ 0160-dts-fix-deterministic-doc.patch	2025-07-18 20:29:11.158908030 +0100
@@ -1 +1 @@
-From 5603ab87f2ed666c59cdb3ef7a210c68f3af1f2d Mon Sep 17 00:00:00 2001
+From aad310ede343b3786400e292270df4f8902ba161 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5603ab87f2ed666c59cdb3ef7a210c68f3af1f2d ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index eba7383c7d..c7d55c7386 100644
+index fc55ecbb4a..4b8a6fc21d 100644
@@ -26 +27 @@
-@@ -277,4 +277,5 @@ Ciara Loftus <ciara.loftus at intel.com>
+@@ -275,4 +275,5 @@ Ciara Loftus <ciara.loftus at intel.com>
@@ -33 +34 @@
-index 61e5033f0b..a85858ba07 100644
+index 66a77da9c4..f485043f73 100644
@@ -36 +37 @@
-@@ -73,5 +73,5 @@ class CapturingTrafficGenerator(TrafficGenerator):
+@@ -71,5 +71,5 @@ class CapturingTrafficGenerator(TrafficGenerator):
@@ -43 +44 @@
-@@ -107,4 +107,7 @@ class CapturingTrafficGenerator(TrafficGenerator):
+@@ -105,4 +105,7 @@ class CapturingTrafficGenerator(TrafficGenerator):



More information about the stable mailing list