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 056D1456A2; Wed, 24 Jul 2024 16:09:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D68A43456; Wed, 24 Jul 2024 16:09:35 +0200 (CEST) Received: from mail-qk1-f225.google.com (mail-qk1-f225.google.com [209.85.222.225]) by mails.dpdk.org (Postfix) with ESMTP id E20C343440 for ; Wed, 24 Jul 2024 16:09:31 +0200 (CEST) Received: by mail-qk1-f225.google.com with SMTP id af79cd13be357-7a1d0ad7113so17870885a.2 for ; Wed, 24 Jul 2024 07:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1721830171; x=1722434971; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lKfIMOjchiDqQ35BGZ6y1D1NM8d+uqo8TPgpqpZjO/w=; b=II4ABMp5KL1s9LZDB6gI3lvx0bhKthJD746EGg+/rVjS/LGUue6Fs8r6yd0w2JM1bI rfHR/pFy7V5OlTTquHzI14Qn31FLJe8UtFaK/OWMHLjipugk32axSsFiTppo7RG6ZZy+ Rs3P7HbDcuLsBwM+E9Je60k6BvIH+IIxM1LIw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721830171; x=1722434971; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lKfIMOjchiDqQ35BGZ6y1D1NM8d+uqo8TPgpqpZjO/w=; b=ZcKuR6rCoQfOy3qpwm13sx+VnG5tBk6gfdHzxaUHAgvEi4ej1pcYqbNYImdqMPKd+U B/pt+HeKRMNgHG4aKDCBrnefo437bsT+3n5Qa6+RknE9YoYIlLFRX7LtglcCk5S3sozn UtuFh4MTK4nSrxbA9BuYGg8QFjD72WMBWNLMzdz79QnybeSiaYIjeyYJ9GBvX6tJKdCQ IuJLnm7RI46V1F8y/R5MRmAhmjnEryHp9+z4Zn+KIJ6aDLy1/DzFBTf/kB/TvOaKfEpF Mtvh9V7CDZwahhpL/xhj23Vr5P4zIUjXOO+Od0AYF6G/pzjbRuNtIsrHDMjzqEk3cofr 8ztA== X-Gm-Message-State: AOJu0YyUv8Z1gxGnpNFlvnaWBaUatLc+h3Cdinhd0oHluM1A1InQ5nkF WtMCHBM/t+lKnvHj71NuWLSQ9m2sai4xP+NL0ryKpr10VEndYvZ1oW6rwNqkj5E78fRE67o87Xd CMbkXK8DsirRcxlq6nHrm+rhY9Z2I3y7o X-Google-Smtp-Source: AGHT+IG+nVsBKe/9ORi/Fn7wmSEs6ARyraDkUU+f50f/sICoIc44BvyDpG23lPgtPyf6IbCslonumEPcgYb0 X-Received: by 2002:a05:620a:2686:b0:79f:137a:e503 with SMTP id af79cd13be357-7a1cbcd2f38mr249781485a.10.1721830171231; Wed, 24 Jul 2024 07:09:31 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id af79cd13be357-7a1990942d1sm30722985a.6.2024.07.24.07.09.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jul 2024 07:09:31 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Received: from iol.unh.edu (unknown [IPv6:2606:4100:3880:1257::1083]) by postal.iol.unh.edu (Postfix) with ESMTP id 1C82560526E2; Wed, 24 Jul 2024 10:09:30 -0400 (EDT) From: jspewock@iol.unh.edu To: Honnappa.Nagarahalli@arm.com, npratte@iol.unh.edu, Luca.Vizzarro@arm.com, paul.szczepanek@arm.com, wathsala.vithanage@arm.com, probb@iol.unh.edu, thomas@monjalon.net, yoan.picchi@foss.arm.com, juraj.linkes@pantheon.tech Cc: dev@dpdk.org, Jeremy Spewock , Luca Vizzarro Subject: [PATCH v5 3/3] dts: Improve logging for interactive shells Date: Wed, 24 Jul 2024 10:08:38 -0400 Message-ID: <20240724140838.171012-4-jspewock@iol.unh.edu> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240724140838.171012-1-jspewock@iol.unh.edu> References: <20240501161623.26672-1-jspewock@iol.unh.edu> <20240724140838.171012-1-jspewock@iol.unh.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Jeremy Spewock The messages being logged by interactive shells currently are using the same logger as the node they were created from. Because of this, when sending interactive commands, the logs make no distinction between when you are sending a command directly to the host and when you are using an interactive shell on the host. This change adds names to interactive shells so that they are able to use their own loggers with distinct names. Signed-off-by: Jeremy Spewock Reviewed-by: Juraj Linkeš Tested-by: Nicholas Pratte Reviewed-by: Nicholas Pratte Reviewed-by: Luca Vizzarro --- dts/framework/remote_session/dpdk_shell.py | 3 ++- .../remote_session/single_active_interactive_shell.py | 9 +++++++-- dts/framework/remote_session/testpmd_shell.py | 2 ++ dts/framework/testbed_model/traffic_generator/scapy.py | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dts/framework/remote_session/dpdk_shell.py b/dts/framework/remote_session/dpdk_shell.py index 950c6ca670..c5f5c2d116 100644 --- a/dts/framework/remote_session/dpdk_shell.py +++ b/dts/framework/remote_session/dpdk_shell.py @@ -82,6 +82,7 @@ def __init__( ascending_cores: bool = True, append_prefix_timestamp: bool = True, app_params: EalParams = EalParams(), + name: str | None = None, ) -> None: """Extends :meth:`~.interactive_shell.InteractiveShell.__init__`. @@ -96,7 +97,7 @@ def __init__( append_prefix_timestamp, ) - super().__init__(node, privileged, timeout, app_params) + super().__init__(node, privileged, timeout, app_params, name) def _update_real_path(self, path: PurePath) -> None: """Extends :meth:`~.interactive_shell.InteractiveShell._update_real_path`. diff --git a/dts/framework/remote_session/single_active_interactive_shell.py b/dts/framework/remote_session/single_active_interactive_shell.py index 0e5a04885f..7014444d0c 100644 --- a/dts/framework/remote_session/single_active_interactive_shell.py +++ b/dts/framework/remote_session/single_active_interactive_shell.py @@ -32,7 +32,7 @@ InteractiveSSHSessionDeadError, InteractiveSSHTimeoutError, ) -from framework.logger import DTSLogger +from framework.logger import DTSLogger, get_dts_logger from framework.params import Params from framework.settings import SETTINGS from framework.testbed_model.node import Node @@ -92,6 +92,7 @@ def __init__( privileged: bool = False, timeout: float = SETTINGS.timeout, app_params: Params = Params(), + name: str | None = None, ) -> None: """Create an SSH channel during initialization. @@ -102,9 +103,13 @@ def __init__( shell. This timeout is for collecting output, so if reading from the buffer and no output is gathered within the timeout, an exception is thrown. app_params: The command line parameters to be passed to the application on startup. + name: Name for the interactive shell to use for logging. This name will be appended to + the name of the underlying node which it is running on. """ self._node = node - self._logger = node._logger + if name is None: + name = type(self).__name__ + self._logger = get_dts_logger(f"{node.name}.{name}") self._app_params = app_params self._privileged = privileged self._timeout = timeout diff --git a/dts/framework/remote_session/testpmd_shell.py b/dts/framework/remote_session/testpmd_shell.py index eda6eb320f..43e9f56517 100644 --- a/dts/framework/remote_session/testpmd_shell.py +++ b/dts/framework/remote_session/testpmd_shell.py @@ -604,6 +604,7 @@ def __init__( lcore_filter_specifier: LogicalCoreCount | LogicalCoreList = LogicalCoreCount(), ascending_cores: bool = True, append_prefix_timestamp: bool = True, + name: str | None = None, **app_params: Unpack[TestPmdParamsDict], ) -> None: """Overrides :meth:`~.dpdk_shell.DPDKShell.__init__`. Changes app_params to kwargs.""" @@ -615,6 +616,7 @@ def __init__( ascending_cores, append_prefix_timestamp, TestPmdParams(**app_params), + name, ) def start(self, verify: bool = True) -> None: diff --git a/dts/framework/testbed_model/traffic_generator/scapy.py b/dts/framework/testbed_model/traffic_generator/scapy.py index 08e1f4ae7e..13fc1107aa 100644 --- a/dts/framework/testbed_model/traffic_generator/scapy.py +++ b/dts/framework/testbed_model/traffic_generator/scapy.py @@ -261,7 +261,9 @@ def __init__(self, tg_node: Node, config: ScapyTrafficGeneratorConfig): self._tg_node.config.os == OS.linux ), "Linux is the only supported OS for scapy traffic generation" - self.session = PythonShell(self._tg_node, timeout=5, privileged=True) + self.session = PythonShell( + self._tg_node, timeout=5, privileged=True, name="ScapyXMLRPCServer" + ) self.session.start_application() -- 2.45.2