From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 61CAA46BAE for ; Fri, 18 Jul 2025 21:38:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5DDCE40E30; Fri, 18 Jul 2025 21:38:31 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id BE0BB40611 for ; Fri, 18 Jul 2025 21:38:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UqG5C/YJh8euOdS54DbgIZVPYtfQEKrAdoCZmU1aUqs=; b=hlKR4Ilksuf0nTwjw2UVxVK3/B4w0gKlr571NLyx+JAPa7sQGnuRjX0+tLb/GQmRf/eoxG H1/pJL0Ouy4j77vt25AebqT18r+rBIssddbhbRCoSeGm5exwQbRM7HR2yJ8CL84tOED+FK vRW0oslBoLTWxwFD7W4x7OuG0fEXdu4= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-WfTuet1sO5CUdT-7diUGCg-1; Fri, 18 Jul 2025 15:38:25 -0400 X-MC-Unique: WfTuet1sO5CUdT-7diUGCg-1 X-Mimecast-MFC-AGG-ID: WfTuet1sO5CUdT-7diUGCg_1752867504 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5EA64195608C; Fri, 18 Jul 2025 19:38:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 75E1C18003FC; Fri, 18 Jul 2025 19:38:22 +0000 (UTC) From: Kevin Traynor To: Clemens Famulla-Conrad Cc: Luca Vizzarro , dpdk stable Subject: patch 'dts: fix deterministic doc' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:31:34 +0100 Message-ID: <20250718193247.1008129-160-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: GAFFlYgAE0nt4En2zoILZSBcfvJNcvNb53wRtb67p4c_1752867504 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Reviewed-by: Luca Vizzarro --- .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 Power Claire Murphy +Clemens Famulla-Conrad Cody Doucette Congwen Zhang 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@dpdk.org @@ -23 +24 @@ -index eba7383c7d..c7d55c7386 100644 +index fc55ecbb4a..4b8a6fc21d 100644 @@ -26 +27 @@ -@@ -277,4 +277,5 @@ Ciara Loftus +@@ -275,4 +275,5 @@ Ciara Loftus @@ -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):