From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 5769D45BFF;
Mon, 28 Oct 2024 18:51:34 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 0C0A7427D2;
Mon, 28 Oct 2024 18:51:21 +0100 (CET)
Received: from foss.arm.com (foss.arm.com [217.140.110.172])
by mails.dpdk.org (Postfix) with ESMTP id C0D33427B7
for <dev@dpdk.org>; Mon, 28 Oct 2024 18:51:15 +0100 (CET)
Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])
by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B246A497;
Mon, 28 Oct 2024 10:51:44 -0700 (PDT)
Received: from localhost.localdomain (JR4XG4HTQC.cambridge.arm.com
[10.1.31.47])
by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6DC553F66E;
Mon, 28 Oct 2024 10:51:14 -0700 (PDT)
From: Luca Vizzarro <luca.vizzarro@arm.com>
To: dev@dpdk.org
Cc: Paul Szczepanek <paul.szczepanek@arm.com>,
Patrick Robb <probb@iol.unh.edu>, Luca Vizzarro <luca.vizzarro@arm.com>
Subject: [PATCH v4 3/8] dts: refactor build and node info classes
Date: Mon, 28 Oct 2024 17:49:43 +0000
Message-ID: <20241028174949.3283701-4-luca.vizzarro@arm.com>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20241028174949.3283701-1-luca.vizzarro@arm.com>
References: <20240822163941.1390326-1-luca.vizzarro@arm.com>
<20241028174949.3283701-1-luca.vizzarro@arm.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
The DPDKBuildInfo and NodeInfo classes, representing information
gathered in runtime, were erroneously placed in the configuration
package. This moves them in more appropriate modules.
NodeInfo, specifically, ia moved to os_session instead of node mostly
as a consequence of circular dependencies. And given os_session is the
top-most module to reference it, it appears to be the most suitable
place outside of node.
Signed-off-by: Luca Vizzarro <luca.vizzarro@arm.com>
Reviewed-by: Paul Szczepanek <paul.szczepanek@arm.com>
---
dts/framework/config/__init__.py | 31 --------------------
dts/framework/test_result.py | 4 ++-
dts/framework/testbed_model/os_session.py | 21 ++++++++++++-
dts/framework/testbed_model/posix_session.py | 4 +--
dts/framework/testbed_model/sut_node.py | 18 ++++++++++--
5 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index d0d95d00c7..7403ccbf14 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -318,24 +318,6 @@ class TGNodeConfiguration(NodeConfiguration):
traffic_generator: TrafficGeneratorConfig
-@dataclass(slots=True, frozen=True)
-class NodeInfo:
- """Supplemental node information.
-
- Attributes:
- os_name: The name of the running operating system of
- the :class:`~framework.testbed_model.node.Node`.
- os_version: The version of the running operating system of
- the :class:`~framework.testbed_model.node.Node`.
- kernel_version: The kernel version of the running operating system of
- the :class:`~framework.testbed_model.node.Node`.
- """
-
- os_name: str
- os_version: str
- kernel_version: str
-
-
@dataclass(slots=True, frozen=True)
class DPDKBuildConfiguration:
"""DPDK build configuration.
@@ -493,19 +475,6 @@ def from_dict(cls, d: DPDKConfigurationDict) -> Self:
)
-@dataclass(slots=True, frozen=True)
-class DPDKBuildInfo:
- """Various versions and other information about a DPDK build.
-
- Attributes:
- dpdk_version: The DPDK version that was built.
- compiler_version: The version of the compiler used to build DPDK.
- """
-
- dpdk_version: str | None
- compiler_version: str | None
-
-
@dataclass(slots=True, frozen=True)
class TestSuiteConfig:
"""Test suite configuration.
diff --git a/dts/framework/test_result.py b/dts/framework/test_result.py
index 00263ad69e..d2f3a90eed 100644
--- a/dts/framework/test_result.py
+++ b/dts/framework/test_result.py
@@ -30,11 +30,13 @@
from framework.testbed_model.capability import Capability
-from .config import DPDKBuildInfo, NodeInfo, TestRunConfiguration, TestSuiteConfig
+from .config import TestRunConfiguration, TestSuiteConfig
from .exception import DTSError, ErrorSeverity
from .logger import DTSLogger
from .settings import SETTINGS
from .test_suite import TestCase, TestSuite
+from .testbed_model.os_session import NodeInfo
+from .testbed_model.sut_node import DPDKBuildInfo
@dataclass(slots=True, frozen=True)
diff --git a/dts/framework/testbed_model/os_session.py b/dts/framework/testbed_model/os_session.py
index 6194ddb989..5f087f40d6 100644
--- a/dts/framework/testbed_model/os_session.py
+++ b/dts/framework/testbed_model/os_session.py
@@ -24,11 +24,12 @@
"""
from abc import ABC, abstractmethod
from collections.abc import Iterable
+from dataclasses import dataclass
from ipaddress import IPv4Interface, IPv6Interface
from pathlib import Path, PurePath, PurePosixPath
from typing import Union
-from framework.config import Architecture, NodeConfiguration, NodeInfo
+from framework.config import Architecture, NodeConfiguration
from framework.logger import DTSLogger
from framework.remote_session import (
InteractiveRemoteSession,
@@ -44,6 +45,24 @@
from .port import Port
+@dataclass(slots=True, frozen=True)
+class NodeInfo:
+ """Supplemental node information.
+
+ Attributes:
+ os_name: The name of the running operating system of
+ the :class:`~framework.testbed_model.node.Node`.
+ os_version: The version of the running operating system of
+ the :class:`~framework.testbed_model.node.Node`.
+ kernel_version: The kernel version of the running operating system of
+ the :class:`~framework.testbed_model.node.Node`.
+ """
+
+ os_name: str
+ os_version: str
+ kernel_version: str
+
+
class OSSession(ABC):
"""OS-unaware to OS-aware translation API definition.
diff --git a/dts/framework/testbed_model/posix_session.py b/dts/framework/testbed_model/posix_session.py
index 5ab7c18fb7..0d3abbc519 100644
--- a/dts/framework/testbed_model/posix_session.py
+++ b/dts/framework/testbed_model/posix_session.py
@@ -15,7 +15,7 @@
from collections.abc import Iterable
from pathlib import Path, PurePath, PurePosixPath
-from framework.config import Architecture, NodeInfo
+from framework.config import Architecture
from framework.exception import DPDKBuildError, RemoteCommandExecutionError
from framework.settings import SETTINGS
from framework.utils import (
@@ -26,7 +26,7 @@
extract_tarball,
)
-from .os_session import OSSession
+from .os_session import NodeInfo, OSSession
class PosixSession(OSSession):
diff --git a/dts/framework/testbed_model/sut_node.py b/dts/framework/testbed_model/sut_node.py
index e160386324..a6c42b548c 100644
--- a/dts/framework/testbed_model/sut_node.py
+++ b/dts/framework/testbed_model/sut_node.py
@@ -14,13 +14,12 @@
import os
import time
+from dataclasses import dataclass
from pathlib import PurePath
from framework.config import (
DPDKBuildConfiguration,
- DPDKBuildInfo,
DPDKLocation,
- NodeInfo,
SutNodeConfiguration,
TestRunConfiguration,
)
@@ -30,10 +29,23 @@
from framework.utils import MesonArgs, TarCompressionFormat
from .node import Node
-from .os_session import OSSession
+from .os_session import NodeInfo, OSSession
from .virtual_device import VirtualDevice
+@dataclass(slots=True, frozen=True)
+class DPDKBuildInfo:
+ """Various versions and other information about a DPDK build.
+
+ Attributes:
+ dpdk_version: The DPDK version that was built.
+ compiler_version: The version of the compiler used to build DPDK.
+ """
+
+ dpdk_version: str | None
+ compiler_version: str | None
+
+
class SutNode(Node):
"""The system under test node.
--
2.43.0