Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/129529/?format=api
{ "id": 129529, "url": "http://patchwork.dpdk.org/api/patches/129529/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230713152302.21128-3-jspewock@iol.unh.edu/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230713152302.21128-3-jspewock@iol.unh.edu>", "list_archive_url": "https://inbox.dpdk.org/dev/20230713152302.21128-3-jspewock@iol.unh.edu", "date": "2023-07-13T15:21:05", "name": "[v6,1/2] dts: add smoke tests", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3817d1bd511252002a642256361f93767cad45b0", "submitter": { "id": 2772, "url": "http://patchwork.dpdk.org/api/people/2772/?format=api", "name": "Jeremy Spewock", "email": "jspewock@iol.unh.edu" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230713152302.21128-3-jspewock@iol.unh.edu/mbox/", "series": [ { "id": 28934, "url": "http://patchwork.dpdk.org/api/series/28934/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=28934", "date": "2023-07-13T15:21:04", "name": "Add DTS smoke tests", "version": 6, "mbox": "http://patchwork.dpdk.org/series/28934/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/129529/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/129529/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 1EF0B42E63;\n\tThu, 13 Jul 2023 17:23:29 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 038EC41156;\n\tThu, 13 Jul 2023 17:23:26 +0200 (CEST)", "from mail-pf1-f229.google.com (mail-pf1-f229.google.com\n [209.85.210.229])\n by mails.dpdk.org (Postfix) with ESMTP id 59D674114B\n for <dev@dpdk.org>; Thu, 13 Jul 2023 17:23:24 +0200 (CEST)", "by mail-pf1-f229.google.com with SMTP id\n d2e1a72fcca58-6686a05bc66so614123b3a.1\n for <dev@dpdk.org>; Thu, 13 Jul 2023 08:23:24 -0700 (PDT)", "from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84])\n by smtp-relay.gmail.com with ESMTPS id\n e18-20020a17090ab39200b0025ea1e17320sm703805pjr.15.2023.07.13.08.23.23\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Thu, 13 Jul 2023 08:23:23 -0700 (PDT)", "from iol.unh.edu (unknown\n [IPv6:2606:4100:3880:1271:90f9:1b64:f6e6:867f])\n by postal.iol.unh.edu (Postfix) with ESMTP id 5E6E2605246B;\n Thu, 13 Jul 2023 11:23:22 -0400 (EDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=iol.unh.edu; s=unh-iol; t=1689261803; x=1691853803;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=vRrn6TvxKArm/ZCmcc/GcNEPspHkKScFA2euhkL8Zb4=;\n b=bEhKwALql8TuSg8Uo7wur5+hUWfgzwnL3CNoTFy8iiNKeYQsql0WuNcpjcL0Yo3U/j\n kHXi8/4BfpZL5hgyOQ/sG8f6m61Svf2TL7EKq2gI6me3bngm0Zyzp7ooP2qa02xMTNiF\n nrvGCvH4MEFmfLXmzz0WjnCJGXXbGEHmU9I7s=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20221208; t=1689261803; x=1691853803;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=vRrn6TvxKArm/ZCmcc/GcNEPspHkKScFA2euhkL8Zb4=;\n b=UZzOB7SbT4HVYCN2KXZPlJoMPDBHZ+MimcDT/h1bMXbWdQJZgqwaQlfE7D4C0g5km2\n s2e+AXJGa2kEt5t4ujjYGGLGsI4bJfGpu/oH7TDIIQvgHsdVESZSBwrY3tAkVSZZw2jx\n 8217xjkMLRdYBKISHp7/QKET9aFQerNMh0n4mtHr8pa9AbYDg3NEJZiZlOYkO0VbNRFV\n GF3hN6Lsp3p3eStrWur/8JMDYmSsKZmB2yJ+ozD/AlEUZnP3LCrt9MmIHN6yUd+Sht29\n Nwu2SaTxxFPTSxZopyZj+c+uh7Z+mwBxWV/UVEJwjePyelFQUTbn1oiy6sTVFAZv0G52\n 4Z1w==", "X-Gm-Message-State": "ABy/qLY1f9/CY4rzNB+8nvhkESohAG+iFt+gTVOWQ6koh1W12hy7qWhf\n Cnm+f7b68rjbgrTEW0UeAcVM32ASLXwT6WjW6pR1Gk2uxNTInQ==", "X-Google-Smtp-Source": "\n APBJJlHqzW1CvDmT5QZcjswq6Jebx7qp1gkDILmuNN11D/7BC1IhKjnbVRzA1oy119c+s2946iDpJBKL17fe", "X-Received": "by 2002:a17:90b:388:b0:263:abea:94d1 with SMTP id\n ga8-20020a17090b038800b00263abea94d1mr1032623pjb.44.1689261803438;\n Thu, 13 Jul 2023 08:23:23 -0700 (PDT)", "X-Relaying-Domain": "iol.unh.edu", "From": "jspewock@iol.unh.edu", "To": "Honnappa.Nagarahalli@arm.com, juraj.linkes@pantheon.tech,\n thomas@monjalon.net, lijuan.tu@intel.com, wathsala.vithanage@arm.com,\n probb@iol.unh.edu", "Cc": "dev@dpdk.org,\n\tJeremy Spewock <jspewock@iol.unh.edu>", "Subject": "[PATCH v6 1/2] dts: add smoke tests", "Date": "Thu, 13 Jul 2023 11:21:05 -0400", "Message-ID": "<20230713152302.21128-3-jspewock@iol.unh.edu>", "X-Mailer": "git-send-email 2.41.0", "In-Reply-To": "<20230713152302.21128-2-jspewock@iol.unh.edu>", "References": "<20230713152302.21128-2-jspewock@iol.unh.edu>", "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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Jeremy Spewock <jspewock@iol.unh.edu>\n\nAdds a new test suite for running smoke tests that verify general\nconfiguration aspects of the system under test. If any of these tests\nfail, the DTS execution terminates as part of a \"fail-fast\" model.\n\nSigned-off-by: Jeremy Spewock <jspewock@iol.unh.edu>\n---\n dts/conf.yaml | 17 +-\n dts/framework/config/__init__.py | 107 +++++++++--\n dts/framework/config/conf_yaml_schema.json | 142 +++++++++++++-\n dts/framework/dts.py | 87 ++++++---\n dts/framework/exception.py | 12 ++\n dts/framework/remote_session/__init__.py | 11 +-\n dts/framework/remote_session/os_session.py | 53 +++++-\n dts/framework/remote_session/posix_session.py | 29 ++-\n .../remote_session/remote/__init__.py | 10 +\n .../remote/interactive_remote_session.py | 82 ++++++++\n .../remote/interactive_shell.py | 78 ++++++++\n .../remote_session/remote/testpmd_shell.py | 74 ++++++++\n dts/framework/test_result.py | 37 +++-\n dts/framework/test_suite.py | 10 +-\n dts/framework/testbed_model/node.py | 2 +\n dts/framework/testbed_model/sut_node.py | 176 +++++++++++++-----\n dts/framework/utils.py | 3 +\n dts/tests/TestSuite_smoke_tests.py | 113 +++++++++++\n 18 files changed, 945 insertions(+), 98 deletions(-)\n create mode 100644 dts/framework/remote_session/remote/interactive_remote_session.py\n create mode 100644 dts/framework/remote_session/remote/interactive_shell.py\n create mode 100644 dts/framework/remote_session/remote/testpmd_shell.py\n create mode 100644 dts/tests/TestSuite_smoke_tests.py", "diff": "diff --git a/dts/conf.yaml b/dts/conf.yaml\nindex 129801d87c..3a5d87cb49 100644\n--- a/dts/conf.yaml\n+++ b/dts/conf.yaml\n@@ -10,9 +10,13 @@ executions:\n compiler_wrapper: ccache\n perf: false\n func: true\n+ skip_smoke_tests: false # optional flag that allow you to skip smoke tests\n test_suites:\n - hello_world\n- system_under_test: \"SUT 1\"\n+ system_under_test:\n+ node_name: \"SUT 1\"\n+ vdevs: # optional; if removed, vdevs won't be used in the execution\n+ - \"crypto_openssl\"\n nodes:\n - name: \"SUT 1\"\n hostname: sut1.change.me.localhost\n@@ -25,3 +29,14 @@ nodes:\n hugepages: # optional; if removed, will use system hugepage configuration\n amount: 256\n force_first_numa: false\n+ ports:\n+ - pci: \"0000:00:08.0\"\n+ os_driver_for_dpdk: vfio-pci # OS driver that DPDK will use\n+ os_driver: i40e\n+ peer_node: \"TG 1\"\n+ peer_pci: \"0000:00:08.0\"\n+ - pci: \"0000:00:08.1\"\n+ os_driver_for_dpdk: vfio-pci\n+ os_driver: i40e\n+ peer_node: \"TG 1\"\n+ peer_pci: \"0000:00:08.1\"\ndiff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py\nindex a4b73483e6..fad56cc520 100644\n--- a/dts/framework/config/__init__.py\n+++ b/dts/framework/config/__init__.py\n@@ -11,7 +11,8 @@\n import os.path\n import pathlib\n from dataclasses import dataclass\n-from enum import auto, unique\n+from enum import Enum, auto, unique\n+from pathlib import PurePath\n from typing import Any, TypedDict\n \n import warlock # type: ignore\n@@ -65,6 +66,20 @@ class HugepageConfiguration:\n force_first_numa: bool\n \n \n+@dataclass(slots=True, frozen=True)\n+class PortConfig:\n+ node: str\n+ pci: str\n+ os_driver_for_dpdk: str\n+ os_driver: str\n+ peer_node: str\n+ peer_pci: str\n+\n+ @staticmethod\n+ def from_dict(node: str, d: dict) -> \"PortConfig\":\n+ return PortConfig(node=node, **d)\n+\n+\n @dataclass(slots=True, frozen=True)\n class NodeConfiguration:\n name: str\n@@ -77,6 +92,7 @@ class NodeConfiguration:\n use_first_core: bool\n memory_channels: int\n hugepages: HugepageConfiguration | None\n+ ports: list[PortConfig]\n \n @staticmethod\n def from_dict(d: dict) -> \"NodeConfiguration\":\n@@ -85,19 +101,36 @@ def from_dict(d: dict) -> \"NodeConfiguration\":\n if \"force_first_numa\" not in hugepage_config:\n hugepage_config[\"force_first_numa\"] = False\n hugepage_config = HugepageConfiguration(**hugepage_config)\n+ common_config = {\n+ \"name\": d[\"name\"],\n+ \"hostname\": d[\"hostname\"],\n+ \"user\": d[\"user\"],\n+ \"password\": d.get(\"password\"),\n+ \"arch\": Architecture(d[\"arch\"]),\n+ \"os\": OS(d[\"os\"]),\n+ \"lcores\": d.get(\"lcores\", \"1\"),\n+ \"use_first_core\": d.get(\"use_first_core\", False),\n+ \"memory_channels\": d.get(\"memory_channels\", 1),\n+ \"hugepages\": hugepage_config,\n+ \"ports\": [PortConfig.from_dict(d[\"name\"], port) for port in d[\"ports\"]],\n+ }\n+\n+ return NodeConfiguration(**common_config)\n \n- return NodeConfiguration(\n- name=d[\"name\"],\n- hostname=d[\"hostname\"],\n- user=d[\"user\"],\n- password=d.get(\"password\"),\n- arch=Architecture(d[\"arch\"]),\n- os=OS(d[\"os\"]),\n- lcores=d.get(\"lcores\", \"1\"),\n- use_first_core=d.get(\"use_first_core\", False),\n- memory_channels=d.get(\"memory_channels\", 1),\n- hugepages=hugepage_config,\n- )\n+\n+@dataclass(slots=True, frozen=True)\n+class NodeInfo:\n+ \"\"\"Class to hold important versions within the node.\n+\n+ This class, unlike the NodeConfiguration class, cannot be generated at the start.\n+ This is because we need to initialize a connection with the node before we can\n+ collect the information needed in this class. Therefore, it cannot be a part of\n+ the configuration class above.\n+ \"\"\"\n+\n+ os_name: str\n+ os_version: str\n+ kernel_version: str\n \n \n @dataclass(slots=True, frozen=True)\n@@ -121,6 +154,18 @@ def from_dict(d: dict) -> \"BuildTargetConfiguration\":\n )\n \n \n+@dataclass(slots=True, frozen=True)\n+class BuildTargetInfo:\n+ \"\"\"Class to hold important versions within the build target.\n+\n+ This is very similar to the NodeInfo class, it just instead holds information\n+ for the build target.\n+ \"\"\"\n+\n+ dpdk_version: str\n+ compiler_version: str\n+\n+\n class TestSuiteConfigDict(TypedDict):\n suite: str\n cases: list[str]\n@@ -150,6 +195,8 @@ class ExecutionConfiguration:\n func: bool\n test_suites: list[TestSuiteConfig]\n system_under_test: NodeConfiguration\n+ vdevs: list[str]\n+ skip_smoke_tests: bool\n \n @staticmethod\n def from_dict(d: dict, node_map: dict) -> \"ExecutionConfiguration\":\n@@ -159,15 +206,20 @@ def from_dict(d: dict, node_map: dict) -> \"ExecutionConfiguration\":\n test_suites: list[TestSuiteConfig] = list(\n map(TestSuiteConfig.from_dict, d[\"test_suites\"])\n )\n- sut_name = d[\"system_under_test\"]\n+ sut_name = d[\"system_under_test\"][\"node_name\"]\n+ skip_smoke_tests = d.get(\"skip_smoke_tests\", False)\n assert sut_name in node_map, f\"Unknown SUT {sut_name} in execution {d}\"\n-\n+ vdevs = (\n+ d[\"system_under_test\"][\"vdevs\"] if \"vdevs\" in d[\"system_under_test\"] else []\n+ )\n return ExecutionConfiguration(\n build_targets=build_targets,\n perf=d[\"perf\"],\n func=d[\"func\"],\n+ skip_smoke_tests=skip_smoke_tests,\n test_suites=test_suites,\n system_under_test=node_map[sut_name],\n+ vdevs=vdevs,\n )\n \n \n@@ -214,3 +266,28 @@ def load_config() -> Configuration:\n \n \n CONFIGURATION = load_config()\n+\n+\n+@unique\n+class InteractiveApp(Enum):\n+ \"\"\"An enum that represents different supported interactive applications.\n+\n+ The values in this enum must all be set to objects that have a key called\n+ \"default_path\" where \"default_path\" represents a PurePath object for the path\n+ to the application. This default path will be passed into the handler class\n+ for the application so that it can start the application.\n+ \"\"\"\n+\n+ testpmd = {\"default_path\": PurePath(\"app\", \"dpdk-testpmd\")}\n+\n+ @property\n+ def path(self) -> PurePath:\n+ \"\"\"Default path of the application.\n+\n+ For DPDK apps, this will be appended to the DPDK build directory.\n+ \"\"\"\n+ return self.value[\"default_path\"]\n+\n+ @path.setter\n+ def path(self, path: PurePath) -> None:\n+ self.value[\"default_path\"] = path\ndiff --git a/dts/framework/config/conf_yaml_schema.json b/dts/framework/config/conf_yaml_schema.json\nindex ca2d4a1ef2..61f52b4365 100644\n--- a/dts/framework/config/conf_yaml_schema.json\n+++ b/dts/framework/config/conf_yaml_schema.json\n@@ -6,6 +6,76 @@\n \"type\": \"string\",\n \"description\": \"A unique identifier for a node\"\n },\n+ \"NIC\": {\n+ \"type\": \"string\",\n+ \"enum\": [\n+ \"ALL\",\n+ \"ConnectX3_MT4103\",\n+ \"ConnectX4_LX_MT4117\",\n+ \"ConnectX4_MT4115\",\n+ \"ConnectX5_MT4119\",\n+ \"ConnectX5_MT4121\",\n+ \"I40E_10G-10G_BASE_T_BC\",\n+ \"I40E_10G-10G_BASE_T_X722\",\n+ \"I40E_10G-SFP_X722\",\n+ \"I40E_10G-SFP_XL710\",\n+ \"I40E_10G-X722_A0\",\n+ \"I40E_1G-1G_BASE_T_X722\",\n+ \"I40E_25G-25G_SFP28\",\n+ \"I40E_40G-QSFP_A\",\n+ \"I40E_40G-QSFP_B\",\n+ \"IAVF-ADAPTIVE_VF\",\n+ \"IAVF-VF\",\n+ \"IAVF_10G-X722_VF\",\n+ \"ICE_100G-E810C_QSFP\",\n+ \"ICE_25G-E810C_SFP\",\n+ \"ICE_25G-E810_XXV_SFP\",\n+ \"IGB-I350_VF\",\n+ \"IGB_1G-82540EM\",\n+ \"IGB_1G-82545EM_COPPER\",\n+ \"IGB_1G-82571EB_COPPER\",\n+ \"IGB_1G-82574L\",\n+ \"IGB_1G-82576\",\n+ \"IGB_1G-82576_QUAD_COPPER\",\n+ \"IGB_1G-82576_QUAD_COPPER_ET2\",\n+ \"IGB_1G-82580_COPPER\",\n+ \"IGB_1G-I210_COPPER\",\n+ \"IGB_1G-I350_COPPER\",\n+ \"IGB_1G-I354_SGMII\",\n+ \"IGB_1G-PCH_LPTLP_I218_LM\",\n+ \"IGB_1G-PCH_LPTLP_I218_V\",\n+ \"IGB_1G-PCH_LPT_I217_LM\",\n+ \"IGB_1G-PCH_LPT_I217_V\",\n+ \"IGB_2.5G-I354_BACKPLANE_2_5GBPS\",\n+ \"IGC-I225_LM\",\n+ \"IGC-I226_LM\",\n+ \"IXGBE_10G-82599_SFP\",\n+ \"IXGBE_10G-82599_SFP_SF_QP\",\n+ \"IXGBE_10G-82599_T3_LOM\",\n+ \"IXGBE_10G-82599_VF\",\n+ \"IXGBE_10G-X540T\",\n+ \"IXGBE_10G-X540_VF\",\n+ \"IXGBE_10G-X550EM_A_SFP\",\n+ \"IXGBE_10G-X550EM_X_10G_T\",\n+ \"IXGBE_10G-X550EM_X_SFP\",\n+ \"IXGBE_10G-X550EM_X_VF\",\n+ \"IXGBE_10G-X550T\",\n+ \"IXGBE_10G-X550_VF\",\n+ \"brcm_57414\",\n+ \"brcm_P2100G\",\n+ \"cavium_0011\",\n+ \"cavium_a034\",\n+ \"cavium_a063\",\n+ \"cavium_a064\",\n+ \"fastlinq_ql41000\",\n+ \"fastlinq_ql41000_vf\",\n+ \"fastlinq_ql45000\",\n+ \"fastlinq_ql45000_vf\",\n+ \"hi1822\",\n+ \"virtio\"\n+ ]\n+ },\n+\n \"ARCH\": {\n \"type\": \"string\",\n \"enum\": [\n@@ -94,6 +164,19 @@\n \"amount\"\n ]\n },\n+ \"pci_address\": {\n+ \"type\": \"string\",\n+ \"pattern\": \"^[\\\\da-fA-F]{4}:[\\\\da-fA-F]{2}:[\\\\da-fA-F]{2}.\\\\d:?\\\\w*$\"\n+ },\n+ \"port_peer_address\": {\n+ \"description\": \"Peer is a TRex port, and IXIA port or a PCI address\",\n+ \"oneOf\": [\n+ {\n+ \"description\": \"PCI peer port\",\n+ \"$ref\": \"#/definitions/pci_address\"\n+ }\n+ ]\n+ },\n \"test_suite\": {\n \"type\": \"string\",\n \"enum\": [\n@@ -165,6 +248,44 @@\n },\n \"hugepages\": {\n \"$ref\": \"#/definitions/hugepages\"\n+ },\n+ \"ports\": {\n+ \"type\": \"array\",\n+ \"items\": {\n+ \"type\": \"object\",\n+ \"description\": \"Each port should be described on both sides of the connection. This makes configuration slightly more verbose but greatly simplifies implementation. If there are an inconsistencies, then DTS will not run until that issue is fixed. An example inconsistency would be port 1, node 1 says it is connected to port 1, node 2, but port 1, node 2 says it is connected to port 2, node 1.\",\n+ \"properties\": {\n+ \"pci\": {\n+ \"$ref\": \"#/definitions/pci_address\",\n+ \"description\": \"The local PCI address of the port\"\n+ },\n+ \"os_driver_for_dpdk\": {\n+ \"type\": \"string\",\n+ \"description\": \"The driver that the kernel should bind this device to for DPDK to use it. (ex: vfio-pci)\"\n+ },\n+ \"os_driver\": {\n+ \"type\": \"string\",\n+ \"description\": \"The driver normally used by this port (ex: i40e)\"\n+ },\n+ \"peer_node\": {\n+ \"type\": \"string\",\n+ \"description\": \"The name of the node the peer port is on\"\n+ },\n+ \"peer_pci\": {\n+ \"$ref\": \"#/definitions/pci_address\",\n+ \"description\": \"The PCI address of the peer port\"\n+ }\n+ },\n+ \"additionalProperties\": false,\n+ \"required\": [\n+ \"pci\",\n+ \"os_driver_for_dpdk\",\n+ \"os_driver\",\n+ \"peer_node\",\n+ \"peer_pci\"\n+ ]\n+ },\n+ \"minimum\": 1\n }\n },\n \"additionalProperties\": false,\n@@ -211,8 +332,27 @@\n ]\n }\n },\n+ \"skip_smoke_tests\": {\n+ \"description\": \"Optional field that allows you to skip smoke testing\",\n+ \"type\": \"boolean\"\n+ },\n \"system_under_test\": {\n- \"$ref\": \"#/definitions/node_name\"\n+ \"type\":\"object\",\n+ \"properties\": {\n+ \"node_name\": {\n+ \"$ref\": \"#/definitions/node_name\"\n+ },\n+ \"vdevs\": {\n+ \"description\": \"Opentional list of names of vdevs to be used in execution\",\n+ \"type\": \"array\",\n+ \"items\": {\n+ \"type\": \"string\"\n+ }\n+ }\n+ },\n+ \"required\": [\n+ \"node_name\"\n+ ]\n }\n },\n \"additionalProperties\": false,\ndiff --git a/dts/framework/dts.py b/dts/framework/dts.py\nindex 0502284580..7b09d8fba8 100644\n--- a/dts/framework/dts.py\n+++ b/dts/framework/dts.py\n@@ -5,7 +5,13 @@\n \n import sys\n \n-from .config import CONFIGURATION, BuildTargetConfiguration, ExecutionConfiguration\n+from .config import (\n+ CONFIGURATION,\n+ BuildTargetConfiguration,\n+ ExecutionConfiguration,\n+ TestSuiteConfig,\n+)\n+from .exception import BlockingTestSuiteError\n from .logger import DTSLOG, getLogger\n from .test_result import BuildTargetResult, DTSResult, ExecutionResult, Result\n from .test_suite import get_test_suites\n@@ -82,7 +88,7 @@ def _run_execution(\n running all build targets in the given execution.\n \"\"\"\n dts_logger.info(f\"Running execution with SUT '{execution.system_under_test.name}'.\")\n- execution_result = result.add_execution(sut_node.config)\n+ execution_result = result.add_execution(sut_node.config, sut_node.node_info)\n \n try:\n sut_node.set_up_execution(execution)\n@@ -118,14 +124,15 @@ def _run_build_target(\n \n try:\n sut_node.set_up_build_target(build_target)\n- result.dpdk_version = sut_node.dpdk_version\n+ # result.dpdk_version = sut_node.dpdk_version\n+ build_target_result.add_build_target_versions(sut_node.get_build_target_info())\n build_target_result.update_setup(Result.PASS)\n except Exception as e:\n dts_logger.exception(\"Build target setup failed.\")\n build_target_result.update_setup(Result.FAIL, e)\n \n else:\n- _run_suites(sut_node, execution, build_target_result)\n+ _run_all_suites(sut_node, execution, build_target_result)\n \n finally:\n try:\n@@ -136,7 +143,7 @@ def _run_build_target(\n build_target_result.update_teardown(Result.FAIL, e)\n \n \n-def _run_suites(\n+def _run_all_suites(\n sut_node: SutNode,\n execution: ExecutionConfiguration,\n build_target_result: BuildTargetResult,\n@@ -146,27 +153,61 @@ def _run_suites(\n with possibly only a subset of test cases.\n If no subset is specified, run all test cases.\n \"\"\"\n+ end_build_target = False\n+ if not execution.skip_smoke_tests:\n+ execution.test_suites[:0] = [TestSuiteConfig.from_dict(\"smoke_tests\")]\n for test_suite_config in execution.test_suites:\n try:\n- full_suite_path = f\"tests.TestSuite_{test_suite_config.test_suite}\"\n- test_suite_classes = get_test_suites(full_suite_path)\n- suites_str = \", \".join((x.__name__ for x in test_suite_classes))\n- dts_logger.debug(\n- f\"Found test suites '{suites_str}' in '{full_suite_path}'.\"\n+ _run_single_suite(\n+ sut_node, execution, build_target_result, test_suite_config\n )\n- except Exception as e:\n- dts_logger.exception(\"An error occurred when searching for test suites.\")\n- result.update_setup(Result.ERROR, e)\n-\n- else:\n- for test_suite_class in test_suite_classes:\n- test_suite = test_suite_class(\n- sut_node,\n- test_suite_config.test_cases,\n- execution.func,\n- build_target_result,\n- )\n- test_suite.run()\n+ except BlockingTestSuiteError as e:\n+ dts_logger.exception(\n+ f\"An error occurred within {test_suite_config.test_suite}. \"\n+ \"Skipping build target...\"\n+ )\n+ result.add_error(e)\n+ end_build_target = True\n+ # if a blocking test failed and we need to bail out of suite executions\n+ if end_build_target:\n+ break\n+\n+\n+def _run_single_suite(\n+ sut_node: SutNode,\n+ execution: ExecutionConfiguration,\n+ build_target_result: BuildTargetResult,\n+ test_suite_config: TestSuiteConfig,\n+) -> None:\n+ \"\"\"Runs a single test suite.\n+\n+ Args:\n+ sut_node: Node to run tests on.\n+ execution: Execution the test case belongs to.\n+ build_target_result: Build target configuration test case is run on\n+ test_suite_config: Test suite configuration\n+\n+ Raises:\n+ BlockingTestSuiteError: If a test suite that was marked as blocking fails.\n+ \"\"\"\n+ try:\n+ full_suite_path = f\"tests.TestSuite_{test_suite_config.test_suite}\"\n+ test_suite_classes = get_test_suites(full_suite_path)\n+ suites_str = \", \".join((x.__name__ for x in test_suite_classes))\n+ dts_logger.debug(f\"Found test suites '{suites_str}' in '{full_suite_path}'.\")\n+ except Exception as e:\n+ dts_logger.exception(\"An error occurred when searching for test suites.\")\n+ result.update_setup(Result.ERROR, e)\n+\n+ else:\n+ for test_suite_class in test_suite_classes:\n+ test_suite = test_suite_class(\n+ sut_node,\n+ test_suite_config.test_cases,\n+ execution.func,\n+ build_target_result,\n+ )\n+ test_suite.run()\n \n \n def _exit_dts() -> None:\ndiff --git a/dts/framework/exception.py b/dts/framework/exception.py\nindex 44ff4e979a..001a5a5496 100644\n--- a/dts/framework/exception.py\n+++ b/dts/framework/exception.py\n@@ -25,6 +25,7 @@ class ErrorSeverity(IntEnum):\n SSH_ERR = 4\n DPDK_BUILD_ERR = 10\n TESTCASE_VERIFY_ERR = 20\n+ BLOCKING_TESTSUITE_ERR = 25\n \n \n class DTSError(Exception):\n@@ -150,3 +151,14 @@ def __init__(self, value: str):\n \n def __str__(self) -> str:\n return repr(self.value)\n+\n+\n+class BlockingTestSuiteError(DTSError):\n+ suite_name: str\n+ severity: ClassVar[ErrorSeverity] = ErrorSeverity.BLOCKING_TESTSUITE_ERR\n+\n+ def __init__(self, suite_name: str) -> None:\n+ self.suite_name = suite_name\n+\n+ def __str__(self) -> str:\n+ return f\"Blocking suite {self.suite_name} failed.\"\ndiff --git a/dts/framework/remote_session/__init__.py b/dts/framework/remote_session/__init__.py\nindex ee221503df..2c408c2557 100644\n--- a/dts/framework/remote_session/__init__.py\n+++ b/dts/framework/remote_session/__init__.py\n@@ -1,5 +1,6 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2023 PANTHEON.tech s.r.o.\n+# Copyright(c) 2023 University of New Hampshire\n \n \"\"\"\n The package provides modules for managing remote connections to a remote host (node),\n@@ -17,7 +18,15 @@\n \n from .linux_session import LinuxSession\n from .os_session import OSSession\n-from .remote import CommandResult, RemoteSession, SSHSession\n+from .remote import (\n+ CommandResult,\n+ InteractiveRemoteSession,\n+ InteractiveShell,\n+ RemoteSession,\n+ SSHSession,\n+ TestPmdDevice,\n+ TestPmdShell,\n+)\n \n \n def create_session(\ndiff --git a/dts/framework/remote_session/os_session.py b/dts/framework/remote_session/os_session.py\nindex bfd70bd480..cc13b02f16 100644\n--- a/dts/framework/remote_session/os_session.py\n+++ b/dts/framework/remote_session/os_session.py\n@@ -5,14 +5,22 @@\n from abc import ABC, abstractmethod\n from collections.abc import Iterable\n from pathlib import PurePath\n+from typing import Union\n \n-from framework.config import Architecture, NodeConfiguration\n+from framework.config import Architecture, InteractiveApp, NodeConfiguration, NodeInfo\n from framework.logger import DTSLOG\n+from framework.remote_session.remote import InteractiveShell, TestPmdShell\n from framework.settings import SETTINGS\n from framework.testbed_model import LogicalCore\n from framework.utils import MesonArgs\n \n-from .remote import CommandResult, RemoteSession, create_remote_session\n+from .remote import (\n+ CommandResult,\n+ InteractiveRemoteSession,\n+ RemoteSession,\n+ create_interactive_session,\n+ create_remote_session,\n+)\n \n \n class OSSession(ABC):\n@@ -26,6 +34,7 @@ class OSSession(ABC):\n name: str\n _logger: DTSLOG\n remote_session: RemoteSession\n+ interactive_session: InteractiveRemoteSession\n \n def __init__(\n self,\n@@ -37,6 +46,7 @@ def __init__(\n self.name = name\n self._logger = logger\n self.remote_session = create_remote_session(node_config, name, logger)\n+ self.interactive_session = create_interactive_session(node_config, name, logger)\n \n def close(self, force: bool = False) -> None:\n \"\"\"\n@@ -68,6 +78,33 @@ def send_command(\n \n return self.remote_session.send_command(command, timeout, verify, env)\n \n+ def create_interactive_shell(\n+ self,\n+ shell_type: InteractiveApp,\n+ path_to_app: PurePath,\n+ eal_parameters: str,\n+ timeout: float,\n+ ) -> Union[InteractiveShell, TestPmdShell]:\n+ \"\"\"\n+ See \"create_interactive_shell\" in SutNode\n+ \"\"\"\n+ match (shell_type):\n+ case InteractiveApp.testpmd:\n+ return TestPmdShell(\n+ self.interactive_session.session,\n+ self._logger,\n+ path_to_app,\n+ timeout=timeout,\n+ eal_flags=eal_parameters,\n+ )\n+ case _:\n+ self._logger.info(\n+ f\"Unhandled app type {shell_type.name}, defaulting to shell.\"\n+ )\n+ return InteractiveShell(\n+ self.interactive_session.session, self._logger, path_to_app, timeout\n+ )\n+\n @abstractmethod\n def _get_privileged_command(self, command: str) -> str:\n \"\"\"Modify the command so that it executes with administrative privileges.\n@@ -206,3 +243,15 @@ def setup_hugepages(self, hugepage_amount: int, force_first_numa: bool) -> None:\n if needed and mount the hugepages if needed.\n If force_first_numa is True, configure hugepages just on the first socket.\n \"\"\"\n+\n+ @abstractmethod\n+ def get_compiler_version(self, compiler_name: str) -> str:\n+ \"\"\"\n+ Get installed version of compiler used for DPDK\n+ \"\"\"\n+\n+ @abstractmethod\n+ def get_node_info(self) -> NodeInfo:\n+ \"\"\"\n+ Collect information about the node\n+ \"\"\"\ndiff --git a/dts/framework/remote_session/posix_session.py b/dts/framework/remote_session/posix_session.py\nindex 8ca0acb429..5da0516e05 100644\n--- a/dts/framework/remote_session/posix_session.py\n+++ b/dts/framework/remote_session/posix_session.py\n@@ -6,7 +6,7 @@\n from collections.abc import Iterable\n from pathlib import PurePath, PurePosixPath\n \n-from framework.config import Architecture\n+from framework.config import Architecture, NodeInfo\n from framework.exception import DPDKBuildError, RemoteCommandExecutionError\n from framework.settings import SETTINGS\n from framework.utils import MesonArgs\n@@ -221,3 +221,30 @@ def _remove_dpdk_runtime_dirs(\n \n def get_dpdk_file_prefix(self, dpdk_prefix) -> str:\n return \"\"\n+\n+ def get_compiler_version(self, compiler_name: str) -> str:\n+ match compiler_name:\n+ case \"gcc\":\n+ return self.send_command(\n+ f\"{compiler_name} --version\", SETTINGS.timeout\n+ ).stdout.split(\"\\n\")[0]\n+ case \"clang\":\n+ return self.send_command(\n+ f\"{compiler_name} --version\", SETTINGS.timeout\n+ ).stdout.split(\"\\n\")[0]\n+ case \"msvc\":\n+ return self.send_command(\"cl\", SETTINGS.timeout).stdout\n+ case \"icc\":\n+ return self.send_command(f\"{compiler_name} -V\", SETTINGS.timeout).stdout\n+ case _:\n+ raise ValueError(f\"Unknown compiler {compiler_name}\")\n+\n+ def get_node_info(self) -> NodeInfo:\n+ os_release_info = self.send_command(\n+ \"awk -F= '$1 ~ /^NAME$|^VERSION$/ {print $2}' /etc/os-release\",\n+ SETTINGS.timeout,\n+ ).stdout.split(\"\\n\")\n+ kernel_version = self.send_command(\"uname -r\", SETTINGS.timeout).stdout\n+ return NodeInfo(\n+ os_release_info[0].strip(), os_release_info[1].strip(), kernel_version\n+ )\ndiff --git a/dts/framework/remote_session/remote/__init__.py b/dts/framework/remote_session/remote/__init__.py\nindex 8a1512210a..03fd309f2b 100644\n--- a/dts/framework/remote_session/remote/__init__.py\n+++ b/dts/framework/remote_session/remote/__init__.py\n@@ -1,16 +1,26 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2023 PANTHEON.tech s.r.o.\n+# Copyright(c) 2023 University of New Hampshire\n \n # pylama:ignore=W0611\n \n from framework.config import NodeConfiguration\n from framework.logger import DTSLOG\n \n+from .interactive_remote_session import InteractiveRemoteSession\n+from .interactive_shell import InteractiveShell\n from .remote_session import CommandResult, RemoteSession\n from .ssh_session import SSHSession\n+from .testpmd_shell import TestPmdDevice, TestPmdShell\n \n \n def create_remote_session(\n node_config: NodeConfiguration, name: str, logger: DTSLOG\n ) -> RemoteSession:\n return SSHSession(node_config, name, logger)\n+\n+\n+def create_interactive_session(\n+ node_config: NodeConfiguration, name: str, logger: DTSLOG\n+) -> InteractiveRemoteSession:\n+ return InteractiveRemoteSession(node_config, logger)\ndiff --git a/dts/framework/remote_session/remote/interactive_remote_session.py b/dts/framework/remote_session/remote/interactive_remote_session.py\nnew file mode 100644\nindex 0000000000..2d94daf2a7\n--- /dev/null\n+++ b/dts/framework/remote_session/remote/interactive_remote_session.py\n@@ -0,0 +1,82 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright(c) 2023 University of New Hampshire\n+\n+import socket\n+import traceback\n+\n+from paramiko import AutoAddPolicy, SSHClient, Transport # type: ignore\n+from paramiko.ssh_exception import ( # type: ignore\n+ AuthenticationException,\n+ BadHostKeyException,\n+ NoValidConnectionsError,\n+ SSHException,\n+)\n+\n+from framework.config import NodeConfiguration\n+from framework.exception import SSHConnectionError\n+from framework.logger import DTSLOG\n+\n+\n+class InteractiveRemoteSession:\n+ hostname: str\n+ ip: str\n+ port: int\n+ username: str\n+ password: str\n+ _logger: DTSLOG\n+ _node_config: NodeConfiguration\n+ session: SSHClient\n+ _transport: Transport | None\n+\n+ def __init__(self, node_config: NodeConfiguration, _logger: DTSLOG) -> None:\n+ self._node_config = node_config\n+ self._logger = _logger\n+ self.hostname = node_config.hostname\n+ self.username = node_config.user\n+ self.password = node_config.password if node_config.password else \"\"\n+ port = \"22\"\n+ self.ip = node_config.hostname\n+ if \":\" in node_config.hostname:\n+ self.ip, port = node_config.hostname.split(\":\")\n+ self.port = int(port)\n+ self._logger.info(\n+ f\"Initializing interactive connection for {self.username}@{self.hostname}\"\n+ )\n+ self._connect()\n+ self._logger.info(\n+ f\"Interactive connection successful for {self.username}@{self.hostname}\"\n+ )\n+\n+ def _connect(self) -> None:\n+ client = SSHClient()\n+ client.set_missing_host_key_policy(AutoAddPolicy)\n+ self.session = client\n+ retry_attempts = 10\n+ for retry_attempt in range(retry_attempts):\n+ try:\n+ client.connect(\n+ self.ip,\n+ username=self.username,\n+ port=self.port,\n+ password=self.password,\n+ timeout=20 if self.port else 10,\n+ )\n+ except (TypeError, BadHostKeyException, AuthenticationException) as e:\n+ self._logger.exception(e)\n+ raise SSHConnectionError(self.hostname) from e\n+ except (NoValidConnectionsError, socket.error, SSHException) as e:\n+ self._logger.debug(traceback.format_exc())\n+ self._logger.warning(e)\n+ self._logger.info(\n+ \"Retrying interactive session connection: \"\n+ f\"retry number {retry_attempt +1}\"\n+ )\n+ else:\n+ break\n+ else:\n+ raise SSHConnectionError(self.hostname)\n+ # Interactive sessions are used on an \"as needed\" basis so we have\n+ # to set a keepalive\n+ self._transport = self.session.get_transport()\n+ if self._transport is not None:\n+ self._transport.set_keepalive(30)\ndiff --git a/dts/framework/remote_session/remote/interactive_shell.py b/dts/framework/remote_session/remote/interactive_shell.py\nnew file mode 100644\nindex 0000000000..2cabe9edca\n--- /dev/null\n+++ b/dts/framework/remote_session/remote/interactive_shell.py\n@@ -0,0 +1,78 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright(c) 2023 University of New Hampshire\n+\n+from pathlib import PurePath\n+\n+from paramiko import Channel, SSHClient, channel # type: ignore\n+\n+from framework.logger import DTSLOG\n+from framework.settings import SETTINGS\n+\n+\n+class InteractiveShell:\n+\n+ _interactive_session: SSHClient\n+ _stdin: channel.ChannelStdinFile\n+ _stdout: channel.ChannelFile\n+ _ssh_channel: Channel\n+ _logger: DTSLOG\n+ _timeout: float\n+ _path_to_app: PurePath\n+\n+ def __init__(\n+ self,\n+ interactive_session: SSHClient,\n+ logger: DTSLOG,\n+ path_to_app: PurePath,\n+ timeout: float = SETTINGS.timeout,\n+ ) -> None:\n+ self._interactive_session = interactive_session\n+ self._ssh_channel = self._interactive_session.invoke_shell()\n+ self._stdin = self._ssh_channel.makefile_stdin(\"w\")\n+ self._stdout = self._ssh_channel.makefile(\"r\")\n+ self._ssh_channel.settimeout(timeout)\n+ self._ssh_channel.set_combine_stderr(True) # combines stdout and stderr streams\n+ self._logger = logger\n+ self._timeout = timeout\n+ self._path_to_app = path_to_app\n+ self._start_application()\n+\n+ def _start_application(self) -> None:\n+ \"\"\"Starts a new interactive application based on _path_to_app.\n+\n+ This method is often overridden by subclasses as their process for\n+ starting may look different.\n+ \"\"\"\n+ self.send_command_get_output(f\"{self._path_to_app}\", \"\")\n+\n+ def send_command_get_output(self, command: str, prompt: str) -> str:\n+ \"\"\"Send a command and get all output before the expected ending string.\n+\n+ Lines that expect input are not included in the stdout buffer so they cannot be\n+ used for expect. For example, if you were prompted to log into something\n+ with a username and password, you cannot expect \"username:\" because it won't\n+ yet be in the stdout buffer. A work around for this could be consuming an\n+ extra newline character to force the current prompt into the stdout buffer.\n+\n+ Returns:\n+ All output in the buffer before expected string\n+ \"\"\"\n+ self._logger.info(f\"Sending command {command.strip()}...\")\n+ self._stdin.write(f\"{command}\\n\")\n+ self._stdin.flush()\n+ out: str = \"\"\n+ for line in self._stdout:\n+ out += line\n+ if prompt in line and not line.rstrip().endswith(\n+ command.rstrip()\n+ ): # ignore line that sent command\n+ break\n+ self._logger.debug(f\"Got output: {out}\")\n+ return out\n+\n+ def close(self) -> None:\n+ self._stdin.close()\n+ self._ssh_channel.close()\n+\n+ def __del__(self) -> None:\n+ self.close()\ndiff --git a/dts/framework/remote_session/remote/testpmd_shell.py b/dts/framework/remote_session/remote/testpmd_shell.py\nnew file mode 100644\nindex 0000000000..c0261c00f6\n--- /dev/null\n+++ b/dts/framework/remote_session/remote/testpmd_shell.py\n@@ -0,0 +1,74 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright(c) 2023 University of New Hampshire\n+\n+from pathlib import PurePath\n+\n+from paramiko import SSHClient # type: ignore\n+\n+from framework.logger import DTSLOG\n+from framework.settings import SETTINGS\n+\n+from .interactive_shell import InteractiveShell\n+\n+\n+class TestPmdDevice(object):\n+ pci_address: str\n+\n+ def __init__(self, pci_address: str):\n+ self.pci_address = pci_address\n+\n+ def __str__(self) -> str:\n+ return self.pci_address\n+\n+\n+class TestPmdShell(InteractiveShell):\n+ expected_prompt: str = \"testpmd>\"\n+ _eal_flags: str\n+\n+ def __init__(\n+ self,\n+ interactive_session: SSHClient,\n+ logger: DTSLOG,\n+ path_to_testpmd: PurePath,\n+ eal_flags: str,\n+ timeout: float = SETTINGS.timeout,\n+ ) -> None:\n+ \"\"\"Initializes an interactive testpmd session using specified parameters.\"\"\"\n+ self._eal_flags = eal_flags\n+\n+ super(TestPmdShell, self).__init__(\n+ interactive_session,\n+ logger=logger,\n+ path_to_app=path_to_testpmd,\n+ timeout=timeout,\n+ )\n+\n+ def _start_application(self) -> None:\n+ \"\"\"Starts a new interactive testpmd shell using _path_to_app.\"\"\"\n+ self.send_command(\n+ f\"{self._path_to_app} {self._eal_flags} -- -i\",\n+ )\n+\n+ def send_command(self, command: str, prompt: str = expected_prompt) -> str:\n+ \"\"\"Specific way of handling the command for testpmd\n+\n+ An extra newline character is consumed in order to force the current line into\n+ the stdout buffer.\n+ \"\"\"\n+ return self.send_command_get_output(f\"{command}\\n\", prompt)\n+\n+ def get_devices(self) -> list[TestPmdDevice]:\n+ \"\"\"Get a list of device names that are known to testpmd\n+\n+ Uses the device info listed in testpmd and then parses the output to\n+ return only the names of the devices.\n+\n+ Returns:\n+ A list of strings representing device names (e.g. 0000:14:00.1)\n+ \"\"\"\n+ dev_info: str = self.send_command(\"show device info all\")\n+ dev_list: list[TestPmdDevice] = []\n+ for line in dev_info.split(\"\\n\"):\n+ if \"device name:\" in line.lower():\n+ dev_list.append(TestPmdDevice(line.strip().split(\": \")[1].strip()))\n+ return dev_list\ndiff --git a/dts/framework/test_result.py b/dts/framework/test_result.py\nindex 743919820c..fe1994673e 100644\n--- a/dts/framework/test_result.py\n+++ b/dts/framework/test_result.py\n@@ -1,5 +1,6 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2023 PANTHEON.tech s.r.o.\n+# Copyright(c) 2023 University of New Hampshire\n \n \"\"\"\n Generic result container and reporters\n@@ -13,9 +14,11 @@\n OS,\n Architecture,\n BuildTargetConfiguration,\n+ BuildTargetInfo,\n Compiler,\n CPUType,\n NodeConfiguration,\n+ NodeInfo,\n )\n from .exception import DTSError, ErrorSeverity\n from .logger import DTSLOG\n@@ -67,12 +70,14 @@ class Statistics(dict):\n Using a dict provides a convenient way to format the data.\n \"\"\"\n \n- def __init__(self, dpdk_version):\n+ def __init__(self, output_info: dict[str, str] | None):\n super(Statistics, self).__init__()\n for result in Result:\n self[result.name] = 0\n self[\"PASS RATE\"] = 0.0\n- self[\"DPDK VERSION\"] = dpdk_version\n+ if output_info:\n+ for info_key, info_val in output_info.items():\n+ self[info_key] = info_val\n \n def __iadd__(self, other: Result) -> \"Statistics\":\n \"\"\"\n@@ -206,6 +211,8 @@ class BuildTargetResult(BaseResult):\n os: OS\n cpu: CPUType\n compiler: Compiler\n+ compiler_version: str | None\n+ dpdk_version: str | None\n \n def __init__(self, build_target: BuildTargetConfiguration):\n super(BuildTargetResult, self).__init__()\n@@ -213,6 +220,12 @@ def __init__(self, build_target: BuildTargetConfiguration):\n self.os = build_target.os\n self.cpu = build_target.cpu\n self.compiler = build_target.compiler\n+ self.compiler_version = None\n+ self.dpdk_version = None\n+\n+ def add_build_target_versions(self, versions: BuildTargetInfo) -> None:\n+ self.compiler_version = versions.compiler_version\n+ self.dpdk_version = versions.dpdk_version\n \n def add_test_suite(self, test_suite_name: str) -> TestSuiteResult:\n test_suite_result = TestSuiteResult(test_suite_name)\n@@ -228,10 +241,17 @@ class ExecutionResult(BaseResult):\n \"\"\"\n \n sut_node: NodeConfiguration\n+ sut_os_name: str\n+ sut_os_version: str\n+ sut_kernel_version: str\n \n- def __init__(self, sut_node: NodeConfiguration):\n+ def __init__(self, sut_node: NodeConfiguration, sut_version_info: NodeInfo):\n super(ExecutionResult, self).__init__()\n self.sut_node = sut_node\n+ self.sut_version_info = sut_version_info\n+ self.sut_os_name = sut_version_info.os_name\n+ self.sut_os_version = sut_version_info.os_version\n+ self.sut_kernel_version = sut_version_info.kernel_version\n \n def add_build_target(\n self, build_target: BuildTargetConfiguration\n@@ -258,6 +278,7 @@ class DTSResult(BaseResult):\n \"\"\"\n \n dpdk_version: str | None\n+ output: dict | None\n _logger: DTSLOG\n _errors: list[Exception]\n _return_code: ErrorSeverity\n@@ -267,14 +288,17 @@ class DTSResult(BaseResult):\n def __init__(self, logger: DTSLOG):\n super(DTSResult, self).__init__()\n self.dpdk_version = None\n+ self.output = None\n self._logger = logger\n self._errors = []\n self._return_code = ErrorSeverity.NO_ERR\n self._stats_result = None\n self._stats_filename = os.path.join(SETTINGS.output_dir, \"statistics.txt\")\n \n- def add_execution(self, sut_node: NodeConfiguration) -> ExecutionResult:\n- execution_result = ExecutionResult(sut_node)\n+ def add_execution(\n+ self, sut_node: NodeConfiguration, sut_version_info: NodeInfo\n+ ) -> ExecutionResult:\n+ execution_result = ExecutionResult(sut_node, sut_version_info)\n self._inner_results.append(execution_result)\n return execution_result\n \n@@ -296,7 +320,8 @@ def process(self) -> None:\n for error in self._errors:\n self._logger.debug(repr(error))\n \n- self._stats_result = Statistics(self.dpdk_version)\n+ self._stats_result = Statistics(self.output)\n+ # add information gathered from the smoke tests to the statistics\n self.add_stats(self._stats_result)\n with open(self._stats_filename, \"w+\") as stats_file:\n stats_file.write(str(self._stats_result))\ndiff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py\nindex 0705f38f98..de94c9332d 100644\n--- a/dts/framework/test_suite.py\n+++ b/dts/framework/test_suite.py\n@@ -11,7 +11,12 @@\n import re\n from types import MethodType\n \n-from .exception import ConfigurationError, SSHTimeoutError, TestCaseVerifyError\n+from .exception import (\n+ BlockingTestSuiteError,\n+ ConfigurationError,\n+ SSHTimeoutError,\n+ TestCaseVerifyError,\n+)\n from .logger import DTSLOG, getLogger\n from .settings import SETTINGS\n from .test_result import BuildTargetResult, Result, TestCaseResult, TestSuiteResult\n@@ -37,6 +42,7 @@ class TestSuite(object):\n \"\"\"\n \n sut_node: SutNode\n+ is_blocking = False\n _logger: DTSLOG\n _test_cases_to_run: list[str]\n _func: bool\n@@ -118,6 +124,8 @@ def run(self) -> None:\n f\"the next test suite may be affected.\"\n )\n self._result.update_setup(Result.ERROR, e)\n+ if len(self._result.get_errors()) > 0 and self.is_blocking:\n+ raise BlockingTestSuiteError(test_suite_name)\n \n def _execute_test_suite(self) -> None:\n \"\"\"\ndiff --git a/dts/framework/testbed_model/node.py b/dts/framework/testbed_model/node.py\nindex d48fafe65d..c5147e0ee6 100644\n--- a/dts/framework/testbed_model/node.py\n+++ b/dts/framework/testbed_model/node.py\n@@ -40,6 +40,7 @@ class Node(object):\n lcores: list[LogicalCore]\n _logger: DTSLOG\n _other_sessions: list[OSSession]\n+ _execution_config: ExecutionConfiguration\n \n def __init__(self, node_config: NodeConfiguration):\n self.config = node_config\n@@ -64,6 +65,7 @@ def set_up_execution(self, execution_config: ExecutionConfiguration) -> None:\n \"\"\"\n self._setup_hugepages()\n self._set_up_execution(execution_config)\n+ self._execution_config = execution_config\n \n def _set_up_execution(self, execution_config: ExecutionConfiguration) -> None:\n \"\"\"\ndiff --git a/dts/framework/testbed_model/sut_node.py b/dts/framework/testbed_model/sut_node.py\nindex 9dbc390848..53953718a1 100644\n--- a/dts/framework/testbed_model/sut_node.py\n+++ b/dts/framework/testbed_model/sut_node.py\n@@ -1,14 +1,27 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2010-2014 Intel Corporation\n # Copyright(c) 2023 PANTHEON.tech s.r.o.\n+# Copyright(c) 2023 University of New Hampshire\n \n import os\n import tarfile\n import time\n from pathlib import PurePath\n-\n-from framework.config import BuildTargetConfiguration, NodeConfiguration\n-from framework.remote_session import CommandResult, OSSession\n+from typing import Union\n+\n+from framework.config import (\n+ BuildTargetConfiguration,\n+ BuildTargetInfo,\n+ InteractiveApp,\n+ NodeConfiguration,\n+ NodeInfo,\n+)\n+from framework.remote_session import (\n+ CommandResult,\n+ InteractiveShell,\n+ OSSession,\n+ TestPmdShell,\n+)\n from framework.settings import SETTINGS\n from framework.utils import MesonArgs\n \n@@ -16,6 +29,52 @@\n from .node import Node\n \n \n+class EalParameters(object):\n+ def __init__(\n+ self,\n+ lcore_list: LogicalCoreList,\n+ memory_channels: int,\n+ prefix: str,\n+ no_pci: bool,\n+ vdevs: list[VirtualDevice],\n+ other_eal_param: str,\n+ ):\n+ \"\"\"\n+ Generate eal parameters character string;\n+ :param lcore_list: the list of logical cores to use.\n+ :param memory_channels: the number of memory channels to use.\n+ :param prefix: set file prefix string, eg:\n+ prefix='vf'\n+ :param no_pci: switch of disable PCI bus eg:\n+ no_pci=True\n+ :param vdevs: virtual device list, eg:\n+ vdevs=[\n+ VirtualDevice('net_ring0'),\n+ VirtualDevice('net_ring1')\n+ ]\n+ :param other_eal_param: user defined DPDK eal parameters, eg:\n+ other_eal_param='--single-file-segments'\n+ \"\"\"\n+ self._lcore_list = f\"-l {lcore_list}\"\n+ self._memory_channels = f\"-n {memory_channels}\"\n+ self._prefix = prefix\n+ if prefix:\n+ self._prefix = f\"--file-prefix={prefix}\"\n+ self._no_pci = \"--no-pci\" if no_pci else \"\"\n+ self._vdevs = \" \".join(f\"--vdev {vdev}\" for vdev in vdevs)\n+ self._other_eal_param = other_eal_param\n+\n+ def __str__(self) -> str:\n+ return (\n+ f\"{self._lcore_list} \"\n+ f\"{self._memory_channels} \"\n+ f\"{self._prefix} \"\n+ f\"{self._no_pci} \"\n+ f\"{self._vdevs} \"\n+ f\"{self._other_eal_param}\"\n+ )\n+\n+\n class SutNode(Node):\n \"\"\"\n A class for managing connections to the System under Test, providing\n@@ -30,9 +89,11 @@ class SutNode(Node):\n _env_vars: dict\n _remote_tmp_dir: PurePath\n __remote_dpdk_dir: PurePath | None\n- _dpdk_version: str | None\n _app_compile_timeout: float\n _dpdk_kill_session: OSSession | None\n+ _dpdk_version: str | None\n+ _node_info: NodeInfo | None\n+ _compiler_version: str | None\n \n def __init__(self, node_config: NodeConfiguration):\n super(SutNode, self).__init__(node_config)\n@@ -41,12 +102,14 @@ def __init__(self, node_config: NodeConfiguration):\n self._env_vars = {}\n self._remote_tmp_dir = self.main_session.get_remote_tmp_dir()\n self.__remote_dpdk_dir = None\n- self._dpdk_version = None\n self._app_compile_timeout = 90\n self._dpdk_kill_session = None\n self._dpdk_timestamp = (\n f\"{str(os.getpid())}_{time.strftime('%Y%m%d%H%M%S', time.localtime())}\"\n )\n+ self._dpdk_version = None\n+ self._node_info = None\n+ self._compiler_version = None\n \n @property\n def _remote_dpdk_dir(self) -> PurePath:\n@@ -75,6 +138,32 @@ def dpdk_version(self) -> str:\n )\n return self._dpdk_version\n \n+ @property\n+ def node_info(self) -> NodeInfo:\n+ if self._node_info is None:\n+ self._node_info = self.main_session.get_node_info()\n+ return self._node_info\n+\n+ @property\n+ def compiler_version(self) -> str:\n+ if self._compiler_version is None:\n+ if self._build_target_config is not None:\n+ self._compiler_version = self.main_session.get_compiler_version(\n+ self._build_target_config.compiler.name\n+ )\n+ else:\n+ self._logger.warning(\n+ \"Failed to get compiler version because\"\n+ \"_build_target_config is None.\"\n+ )\n+ return \"\"\n+ return self._compiler_version\n+\n+ def get_build_target_info(self) -> BuildTargetInfo:\n+ return BuildTargetInfo(\n+ dpdk_version=self.dpdk_version, compiler_version=self.compiler_version\n+ )\n+\n def _guess_dpdk_remote_dir(self) -> PurePath:\n return self.main_session.guess_dpdk_remote_dir(self._remote_tmp_dir)\n \n@@ -84,6 +173,10 @@ def _set_up_build_target(\n \"\"\"\n Setup DPDK on the SUT node.\n \"\"\"\n+ # we want to ensure that dpdk_version and compiler_version is reset for new\n+ # build targets\n+ self._dpdk_version = None\n+ self._compiler_version = None\n self._configure_build_target(build_target_config)\n self._copy_dpdk_tarball()\n self._build_dpdk()\n@@ -262,48 +355,37 @@ def run_dpdk_app(\n f\"{app_path} {eal_args}\", timeout, privileged=True, verify=True\n )\n \n-\n-class EalParameters(object):\n- def __init__(\n+ def create_interactive_shell(\n self,\n- lcore_list: LogicalCoreList,\n- memory_channels: int,\n- prefix: str,\n- no_pci: bool,\n- vdevs: list[VirtualDevice],\n- other_eal_param: str,\n- ):\n+ shell_type: InteractiveApp,\n+ timeout: float = SETTINGS.timeout,\n+ eal_parameters: EalParameters | None = None,\n+ ) -> Union[InteractiveShell, TestPmdShell]:\n+ \"\"\"Create a handler for an interactive session.\n+\n+ This method is a factory that calls a method in OSSession to create shells for\n+ different DPDK applications.\n+\n+ Args:\n+ shell_type: Enum value representing the desired application.\n+ timeout: Timeout for reading output from the SSH channel. If you are\n+ reading from the buffer and don't receive any data within the timeout\n+ it will throw an error.\n+ eal_parameters: List of EAL parameters to use to launch the app. If this\n+ isn't provided, it will default to calling create_eal_parameters().\n+ This is ignored for base \"shell\" types.\n+ Returns:\n+ Instance of the desired interactive application.\n \"\"\"\n- Generate eal parameters character string;\n- :param lcore_list: the list of logical cores to use.\n- :param memory_channels: the number of memory channels to use.\n- :param prefix: set file prefix string, eg:\n- prefix='vf'\n- :param no_pci: switch of disable PCI bus eg:\n- no_pci=True\n- :param vdevs: virtual device list, eg:\n- vdevs=[\n- VirtualDevice('net_ring0'),\n- VirtualDevice('net_ring1')\n- ]\n- :param other_eal_param: user defined DPDK eal parameters, eg:\n- other_eal_param='--single-file-segments'\n- \"\"\"\n- self._lcore_list = f\"-l {lcore_list}\"\n- self._memory_channels = f\"-n {memory_channels}\"\n- self._prefix = prefix\n- if prefix:\n- self._prefix = f\"--file-prefix={prefix}\"\n- self._no_pci = \"--no-pci\" if no_pci else \"\"\n- self._vdevs = \" \".join(f\"--vdev {vdev}\" for vdev in vdevs)\n- self._other_eal_param = other_eal_param\n-\n- def __str__(self) -> str:\n- return (\n- f\"{self._lcore_list} \"\n- f\"{self._memory_channels} \"\n- f\"{self._prefix} \"\n- f\"{self._no_pci} \"\n- f\"{self._vdevs} \"\n- f\"{self._other_eal_param}\"\n+ if not eal_parameters:\n+ eal_parameters = self.create_eal_parameters()\n+\n+ # We need to append the build directory for DPDK apps\n+ shell_type.path = self.remote_dpdk_build_dir.joinpath(shell_type.path)\n+ default_path = self.main_session.join_remote_path(shell_type.path)\n+ return self.main_session.create_interactive_shell(\n+ shell_type,\n+ default_path,\n+ str(eal_parameters),\n+ timeout,\n )\ndiff --git a/dts/framework/utils.py b/dts/framework/utils.py\nindex 510e2e3788..60abe46edf 100644\n--- a/dts/framework/utils.py\n+++ b/dts/framework/utils.py\n@@ -25,6 +25,9 @@ def __str__(self) -> str:\n return self.name\n \n \n+REGEX_FOR_PCI_ADDRESS = \"/[0-9a-fA-F]{4}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}.[0-9]{1}/\"\n+\n+\n def check_dts_python_version() -> None:\n if sys.version_info.major < 3 or (\n sys.version_info.major == 3 and sys.version_info.minor < 10\ndiff --git a/dts/tests/TestSuite_smoke_tests.py b/dts/tests/TestSuite_smoke_tests.py\nnew file mode 100644\nindex 0000000000..9cf547205f\n--- /dev/null\n+++ b/dts/tests/TestSuite_smoke_tests.py\n@@ -0,0 +1,113 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright(c) 2023 University of New Hampshire\n+\n+import re\n+\n+from framework.config import InteractiveApp, PortConfig\n+from framework.remote_session import TestPmdDevice, TestPmdShell\n+from framework.settings import SETTINGS\n+from framework.test_suite import TestSuite\n+from framework.utils import REGEX_FOR_PCI_ADDRESS\n+\n+\n+class SmokeTests(TestSuite):\n+ is_blocking = True\n+ # dicts in this list are expected to have two keys:\n+ # \"pci_address\" and \"current_driver\"\n+ nics_in_node: list[PortConfig] = []\n+\n+ def set_up_suite(self) -> None:\n+ \"\"\"\n+ Setup:\n+ Set the build directory path and generate a list of NICs in the SUT node.\n+ \"\"\"\n+ self.dpdk_build_dir_path = self.sut_node.remote_dpdk_build_dir\n+ self.nics_in_node = self.sut_node.config.ports\n+\n+ def test_unit_tests(self) -> None:\n+ \"\"\"\n+ Test:\n+ Run the fast-test unit-test suite through meson.\n+ \"\"\"\n+ self.sut_node.main_session.send_command(\n+ f\"meson test -C {self.dpdk_build_dir_path} --suite fast-tests\",\n+ 300,\n+ verify=True,\n+ )\n+\n+ def test_driver_tests(self) -> None:\n+ \"\"\"\n+ Test:\n+ Run the driver-test unit-test suite through meson.\n+ \"\"\"\n+ list_of_vdevs = \"\"\n+ for dev in self.sut_node._execution_config.vdevs:\n+ list_of_vdevs += f\"--vdev {dev} \"\n+ list_of_vdevs = list_of_vdevs[:-1]\n+ if list_of_vdevs:\n+ self._logger.info(\n+ \"Running driver tests with the following virtual \"\n+ f\"devices: {list_of_vdevs}\"\n+ )\n+ self.sut_node.main_session.send_command(\n+ f\"meson test -C {self.dpdk_build_dir_path} --suite driver-tests \"\n+ f'--test-args \"{list_of_vdevs}\"',\n+ 300,\n+ verify=True,\n+ )\n+ else:\n+ self.sut_node.main_session.send_command(\n+ f\"meson test -C {self.dpdk_build_dir_path} --suite driver-tests\",\n+ 300,\n+ verify=True,\n+ )\n+\n+ def test_devices_listed_in_testpmd(self) -> None:\n+ \"\"\"\n+ Test:\n+ Uses testpmd driver to verify that devices have been found by testpmd.\n+ \"\"\"\n+ testpmd_driver = self.sut_node.create_interactive_shell(InteractiveApp.testpmd)\n+ # We know it should always be a TestPmdShell but mypy doesn't\n+ assert isinstance(testpmd_driver, TestPmdShell)\n+ dev_list: list[TestPmdDevice] = testpmd_driver.get_devices()\n+ for nic in self.nics_in_node:\n+ self.verify(\n+ nic.pci in map(str, dev_list),\n+ f\"Device {nic.pci} was not listed in testpmd's available devices, \"\n+ \"please check your configuration\",\n+ )\n+\n+ def test_device_bound_to_driver(self) -> None:\n+ \"\"\"\n+ Test:\n+ Ensure that all drivers listed in the config are bound to the correct driver.\n+ \"\"\"\n+ path_to_devbind = self.sut_node.main_session.join_remote_path(\n+ self.sut_node._remote_dpdk_dir, \"usertools\", \"dpdk-devbind.py\"\n+ )\n+\n+ all_nics_in_dpdk_devbind = self.sut_node.main_session.send_command(\n+ f\"{path_to_devbind} --status | awk '{REGEX_FOR_PCI_ADDRESS}'\",\n+ SETTINGS.timeout,\n+ ).stdout\n+\n+ for nic in self.nics_in_node:\n+ # This regular expression finds the line in the above string that starts\n+ # with the address for the nic we are on in the loop and then captures the\n+ # name of the driver in a group\n+ devbind_info_for_nic = re.search(\n+ f\"{nic.pci}[^\\\\n]*drv=([\\\\d\\\\w]*) [^\\\\n]*\",\n+ all_nics_in_dpdk_devbind,\n+ )\n+ self.verify(\n+ devbind_info_for_nic is not None,\n+ f\"Failed to find configured device ({nic.pci}) using dpdk-devbind.py\",\n+ )\n+ # We know this isn't None, but mypy doesn't\n+ assert devbind_info_for_nic is not None\n+ self.verify(\n+ devbind_info_for_nic.group(1) == nic.os_driver,\n+ f\"Driver for device {nic.pci} does not match driver listed in \"\n+ f\"configuration (bound to {devbind_info_for_nic.group(1)})\",\n+ )\n", "prefixes": [ "v6", "1/2" ] }