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 69E9A440EC; Tue, 28 May 2024 17:45:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 56BEE40698; Tue, 28 May 2024 17:45:14 +0200 (CEST) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by mails.dpdk.org (Postfix) with ESMTP id B474140697 for ; Tue, 28 May 2024 17:45:13 +0200 (CEST) Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2e726a507beso784151fa.2 for ; Tue, 28 May 2024 08:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1716911113; x=1717515913; darn=dpdk.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=RRbLCgzkLngHD75hmFw0SxgvSwHgiCww5bNeFcJ49FE=; b=ZqA7Rqm/MEVIDjXBGnNkYWiVkZOdGZidY/kDxJj1RzNtKw97sWRykQtHpcgQinjd1m Ex7i1mIfbU+yf8sozGTLDJF9GMTfUwszrbxgzn6Mcl5AZoMHLrKiE9mqHpTtaj15umVG dz2h4nJudN/CUfxRKgISu5GrC60FEQgsRd84w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716911113; x=1717515913; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RRbLCgzkLngHD75hmFw0SxgvSwHgiCww5bNeFcJ49FE=; b=CcQuJ2pk9oanX610lX6LPmn3BsPFC+D3S2EED7Zz63sAANOUAmKMyK44LzlxyU9LOf OR29b1hDYoc/r9AHD4H8nMNh6M8h2c0zqMHTrnVlkDKhnmruUln9+q4lOQoU2DAu0/HF tuvTIEyrnjrmLe6tWX19WOjE5wvoyEssH0yXE9j/bmo/ZDWIs4ixtIKL704QY5P1hCsK fes4dtxZiD58W3OnYk3/zroglLsfTvYQgvD5w+DfdWT3RVXNvUF1YjiMIt7ZFnHmEdKU iVWeNnwMPjnDakrhdAQv4vFKFCXvmqe+5F4zWH0sclQ+Bbw0CfKpD2d1mtb01s79wsvw IFLg== X-Gm-Message-State: AOJu0YxomUqvATkVOC46FLHuIjNA7TsL1Rj9dIPYTy8iL4GQI0vH67UX fghhA2Q733XTcSYjna8Ls8jzooPPBlfyzPSs6pLOrjADGEg9MpP0MmBYAtPOlqM4DO5rmj1Pef5 IYDN5GnIGhIg+WmgAFz+9iFFvTvaNKsADuCyP1/LsntNyN7Q3iDQ= X-Google-Smtp-Source: AGHT+IEhdFYNxHOvtjpB7RuRS2dxrMRX/V0jkW0jkuWS8VTco75sjp57RESX8xa+1IIr/PImeHRcxFoUw+TLgQxvZow= X-Received: by 2002:a2e:9cc7:0:b0:2e6:f1bf:9897 with SMTP id 38308e7fff4ca-2e95b3278b7mr74177131fa.4.1716911113195; Tue, 28 May 2024 08:45:13 -0700 (PDT) MIME-Version: 1.0 References: <20240326190422.577028-1-luca.vizzarro@arm.com> <20240509112057.1167947-1-luca.vizzarro@arm.com> <20240509112057.1167947-5-luca.vizzarro@arm.com> In-Reply-To: <20240509112057.1167947-5-luca.vizzarro@arm.com> From: Nicholas Pratte Date: Tue, 28 May 2024 11:45:02 -0400 Message-ID: Subject: Re: [PATCH v2 4/8] dts: remove module-wide imports To: Luca Vizzarro Cc: dev@dpdk.org, =?UTF-8?Q?Juraj_Linke=C5=A1?= , Jeremy Spewock , Paul Szczepanek Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 Tested-by: Nicholas Pratte Reviewed-by: Nicholas Pratte On Thu, May 9, 2024 at 7:21=E2=80=AFAM Luca Vizzarro wrote: > > Remove the imports in the testbed_model and remote_session modules init > file, to avoid the initialisation of unneeded modules, thus removing or > limiting the risk of circular dependencies. > > Signed-off-by: Luca Vizzarro > Reviewed-by: Paul Szczepanek > --- > dts/framework/remote_session/__init__.py | 5 +---- > dts/framework/runner.py | 4 +++- > dts/framework/test_suite.py | 5 ++++- > dts/framework/testbed_model/__init__.py | 7 ------- > dts/framework/testbed_model/os_session.py | 4 ++-- > dts/framework/testbed_model/sut_node.py | 2 +- > dts/framework/testbed_model/traffic_generator/scapy.py | 2 +- > dts/tests/TestSuite_hello_world.py | 2 +- > dts/tests/TestSuite_smoke_tests.py | 2 +- > 9 files changed, 14 insertions(+), 19 deletions(-) > > diff --git a/dts/framework/remote_session/__init__.py b/dts/framework/rem= ote_session/__init__.py > index 1910c81c3c..29000a4642 100644 > --- a/dts/framework/remote_session/__init__.py > +++ b/dts/framework/remote_session/__init__.py > @@ -18,11 +18,8 @@ > from framework.logger import DTSLogger > > from .interactive_remote_session import InteractiveRemoteSession > -from .interactive_shell import InteractiveShell > -from .python_shell import PythonShell > -from .remote_session import CommandResult, RemoteSession > +from .remote_session import RemoteSession > from .ssh_session import SSHSession > -from .testpmd_shell import TestPmdShell > > > def create_remote_session( > diff --git a/dts/framework/runner.py b/dts/framework/runner.py > index d74f1871db..e6c23af7c7 100644 > --- a/dts/framework/runner.py > +++ b/dts/framework/runner.py > @@ -26,6 +26,9 @@ > from types import FunctionType > from typing import Iterable, Sequence > > +from framework.testbed_model.sut_node import SutNode > +from framework.testbed_model.tg_node import TGNode > + > from .config import ( > BuildTargetConfiguration, > Configuration, > @@ -51,7 +54,6 @@ > TestSuiteWithCases, > ) > from .test_suite import TestSuite > -from .testbed_model import SutNode, TGNode > > > class DTSRunner: > diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py > index 8768f756a6..9d3debb00f 100644 > --- a/dts/framework/test_suite.py > +++ b/dts/framework/test_suite.py > @@ -20,9 +20,12 @@ > from scapy.layers.l2 import Ether # type: ignore[import-untyped] > from scapy.packet import Packet, Padding # type: ignore[import-untyped] > > +from framework.testbed_model.port import Port, PortLink > +from framework.testbed_model.sut_node import SutNode > +from framework.testbed_model.tg_node import TGNode > + > from .exception import TestCaseVerifyError > from .logger import DTSLogger, get_dts_logger > -from .testbed_model import Port, PortLink, SutNode, TGNode > from .testbed_model.traffic_generator import PacketFilteringConfig > from .utils import get_packet_summaries > > diff --git a/dts/framework/testbed_model/__init__.py b/dts/framework/test= bed_model/__init__.py > index 6086512ca2..4f8a58c039 100644 > --- a/dts/framework/testbed_model/__init__.py > +++ b/dts/framework/testbed_model/__init__.py > @@ -19,10 +19,3 @@ > """ > > # pylama:ignore=3DW0611 > - > -from .cpu import LogicalCoreCount, LogicalCoreCountFilter, LogicalCoreLi= st > -from .node import Node > -from .port import Port, PortLink > -from .sut_node import SutNode > -from .tg_node import TGNode > -from .virtual_device import VirtualDevice > diff --git a/dts/framework/testbed_model/os_session.py b/dts/framework/te= stbed_model/os_session.py > index 1a77aee532..e5f5fcbe0e 100644 > --- a/dts/framework/testbed_model/os_session.py > +++ b/dts/framework/testbed_model/os_session.py > @@ -32,13 +32,13 @@ > from framework.logger import DTSLogger > from framework.params import Params > from framework.remote_session import ( > - CommandResult, > InteractiveRemoteSession, > - InteractiveShell, > RemoteSession, > create_interactive_session, > create_remote_session, > ) > +from framework.remote_session.interactive_shell import InteractiveShell > +from framework.remote_session.remote_session import CommandResult > from framework.settings import SETTINGS > from framework.utils import MesonArgs > > diff --git a/dts/framework/testbed_model/sut_node.py b/dts/framework/test= bed_model/sut_node.py > index e1163106a3..83ad06ae2d 100644 > --- a/dts/framework/testbed_model/sut_node.py > +++ b/dts/framework/testbed_model/sut_node.py > @@ -26,7 +26,7 @@ > ) > from framework.params import Params, Switch > from framework.params.eal import EalParams > -from framework.remote_session import CommandResult > +from framework.remote_session.remote_session import CommandResult > from framework.settings import SETTINGS > from framework.utils import MesonArgs > > diff --git a/dts/framework/testbed_model/traffic_generator/scapy.py b/dts= /framework/testbed_model/traffic_generator/scapy.py > index ed5467d825..7bc1c2cc08 100644 > --- a/dts/framework/testbed_model/traffic_generator/scapy.py > +++ b/dts/framework/testbed_model/traffic_generator/scapy.py > @@ -25,7 +25,7 @@ > from scapy.packet import Packet # type: ignore[import-untyped] > > from framework.config import OS, ScapyTrafficGeneratorConfig > -from framework.remote_session import PythonShell > +from framework.remote_session.python_shell import PythonShell > from framework.settings import SETTINGS > from framework.testbed_model.node import Node > from framework.testbed_model.port import Port > diff --git a/dts/tests/TestSuite_hello_world.py b/dts/tests/TestSuite_hel= lo_world.py > index fd7ff1534d..0d6995f260 100644 > --- a/dts/tests/TestSuite_hello_world.py > +++ b/dts/tests/TestSuite_hello_world.py > @@ -8,7 +8,7 @@ > """ > > from framework.test_suite import TestSuite > -from framework.testbed_model import ( > +from framework.testbed_model.cpu import ( > LogicalCoreCount, > LogicalCoreCountFilter, > LogicalCoreList, > diff --git a/dts/tests/TestSuite_smoke_tests.py b/dts/tests/TestSuite_smo= ke_tests.py > index a553e89662..ca678f662d 100644 > --- a/dts/tests/TestSuite_smoke_tests.py > +++ b/dts/tests/TestSuite_smoke_tests.py > @@ -15,7 +15,7 @@ > import re > > from framework.config import PortConfig > -from framework.remote_session import TestPmdShell > +from framework.remote_session.testpmd_shell import TestPmdShell > from framework.settings import SETTINGS > from framework.test_suite import TestSuite > from framework.utils import REGEX_FOR_PCI_ADDRESS > -- > 2.34.1 >