Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/126318/?format=api
{ "id": 126318, "url": "http://patches.dpdk.org/api/patches/126318/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230420093109.594704-3-juraj.linkes@pantheon.tech/", "project": { "id": 1, "url": "http://patches.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": "<20230420093109.594704-3-juraj.linkes@pantheon.tech>", "list_archive_url": "https://inbox.dpdk.org/dev/20230420093109.594704-3-juraj.linkes@pantheon.tech", "date": "2023-04-20T09:31:06", "name": "[RFC,v1,2/5] dts: add traffic generator config", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "48a56932d313691193d76e2b0bcdcc820529618f", "submitter": { "id": 1626, "url": "http://patches.dpdk.org/api/people/1626/?format=api", "name": "Juraj Linkeš", "email": "juraj.linkes@pantheon.tech" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230420093109.594704-3-juraj.linkes@pantheon.tech/mbox/", "series": [ { "id": 27798, "url": "http://patches.dpdk.org/api/series/27798/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=27798", "date": "2023-04-20T09:31:04", "name": "dts: add tg abstractions and scapy", "version": 1, "mbox": "http://patches.dpdk.org/series/27798/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/126318/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/126318/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 3289442995;\n\tThu, 20 Apr 2023 11:51:19 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9327342C76;\n\tThu, 20 Apr 2023 11:51:10 +0200 (CEST)", "from mail-ej1-f44.google.com (mail-ej1-f44.google.com\n [209.85.218.44]) by mails.dpdk.org (Postfix) with ESMTP id 72C9B40EE3\n for <dev@dpdk.org>; Thu, 20 Apr 2023 11:51:08 +0200 (CEST)", "by mail-ej1-f44.google.com with SMTP id\n a640c23a62f3a-94a34d3812dso59246666b.3\n for <dev@dpdk.org>; Thu, 20 Apr 2023 02:51:08 -0700 (PDT)", "from jlinkes.pantheon.local (81.89.53.154.host.vnet.sk.\n [81.89.53.154]) by smtp.gmail.com with ESMTPSA id\n v2-20020aa7d802000000b004ad601533a3sm580801edq.55.2023.04.20.02.51.07\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 20 Apr 2023 02:51:07 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=pantheon-tech.20221208.gappssmtp.com; s=20221208; t=1681984268;\n x=1684576268;\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=qZto+FhOCTbkf7MCEx+fHxuEVFXw5qOIqWEGXHqqNlA=;\n b=zHHPpkSw8JWfx6FQKflklf18gP0A0idI5Im/NL6xPurtsooqHuqKRmgVOp1ogpnYEk\n lrNb9zN/mw5mwXk6jMpOSYV1otq/IJV5HFS8PDmUeL5emoqja9h+xuDB5ScH79AY2oYf\n M3UgCQ/mRSJvvP2MwBeP6BtFyBdFlhB5B0BeEK3Hk2RWuLztFPbHJiReFMT2hPdPy3wT\n aVXP+/t57TT7Jv5W3S4IWu/kX3Bhv7eLJbWwep3Svvn3nnnM3ZzubK/EJ73GqFIPxAbd\n 6TIOw++ZZFsvop70kmzEfxnYl/56zVN8r31vL9g1XSPihH8sTci5u2pOgQMAHCgP+RDz\n wn0g==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20221208; t=1681984268; x=1684576268;\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=qZto+FhOCTbkf7MCEx+fHxuEVFXw5qOIqWEGXHqqNlA=;\n b=UBxcwQGs728VqyZ7rM8EWgY3pkMs4oO1q1YfbYgtyCjxzxznGWAPBGA1/QZU66BoFH\n hUyoIaQQ7bQBdWRXeilWC78SOTUQ6+vkjk6VC+Gd99YPUt27YvwUjvtUCklfHe8NYA0p\n KxBPH+USx5gcY6tQ2/C6hOyIAkl6C4H9DHVX0BotsF9yyssgkWLJaNrfwOs3MvQfHHfH\n mfcyhNUJ9CGxRfe5tw5FzZb1R/cYPA4Q20TFqKVp5b6J6Cc1pX2sYNEWJCuWV8LNmIrQ\n iXm2jk8VwxzvK9Im1zxYPsz+IWUYIkMNaLE104Xlgqb8x52KhpWyan5e8GqvdmL0AFuM\n 8D2w==", "X-Gm-Message-State": "AAQBX9c+IsGiVRuTosVzBAhJivO9oXcucCEdeCZ2U1LxkVDb7zyJXE1c\n CSudZKaDpSHEBAJWDaIrNt1PzMh4CZeHbUyX0xQtevflrKfwzKuEv6i25bBVXOEuJmsJ8tDi2w=\n =", "X-Google-Smtp-Source": "\n AKy350bRP+iqP3w9o3q6WNdnG45KPurfqU/tqr/s9iHJcOyyPz+8vC9cMDseENx7J7wAPiEV1kwFrQ==", "X-Received": "by 2002:aa7:dc1a:0:b0:505:abcd:d2cc with SMTP id\n b26-20020aa7dc1a000000b00505abcdd2ccmr1299878edu.30.1681984267962;\n Thu, 20 Apr 2023 02:51:07 -0700 (PDT)", "From": "=?utf-8?q?Juraj_Linke=C5=A1?= <juraj.linkes@pantheon.tech>", "To": "thomas@monjalon.net, Honnappa.Nagarahalli@arm.com, lijuan.tu@intel.com,\n wathsala.vithanage@arm.com, jspewock@iol.unh.edu, probb@iol.unh.edu", "Cc": "dev@dpdk.org, =?utf-8?q?Juraj_Linke=C5=A1?= <juraj.linkes@pantheon.tech>", "Subject": "[RFC PATCH v1 2/5] dts: add traffic generator config", "Date": "Thu, 20 Apr 2023 11:31:06 +0200", "Message-Id": "<20230420093109.594704-3-juraj.linkes@pantheon.tech>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20230420093109.594704-1-juraj.linkes@pantheon.tech>", "References": "<20230420093109.594704-1-juraj.linkes@pantheon.tech>", "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 <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": "Node configuration - where to connect, what ports to use and what TG to\nuse.\n\nSigned-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>\n---\n dts/conf.yaml | 25 +++\n dts/framework/config/__init__.py | 107 +++++++++++--\n dts/framework/config/conf_yaml_schema.json | 172 ++++++++++++++++++++-\n 3 files changed, 287 insertions(+), 17 deletions(-)", "diff": "diff --git a/dts/conf.yaml b/dts/conf.yaml\nindex a9bd8a3ecf..4e5fd3560f 100644\n--- a/dts/conf.yaml\n+++ b/dts/conf.yaml\n@@ -13,6 +13,7 @@ executions:\n test_suites:\n - hello_world\n system_under_test: \"SUT 1\"\n+ traffic_generator_system: \"TG 1\"\n nodes:\n - name: \"SUT 1\"\n hostname: sut1.change.me.localhost\n@@ -25,3 +26,27 @@ 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+ dpdk_os_driver: vfio-pci\n+ os_driver: i40e\n+ peer_node: \"TG 1\"\n+ peer_pci: \"0000:00:08.0\"\n+ - name: \"TG 1\"\n+ hostname: tg1.change.me.localhost\n+ user: root\n+ arch: x86_64\n+ os: linux\n+ lcores: \"\"\n+ use_first_core: false\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+ dpdk_os_driver: rdma\n+ os_driver: rdma\n+ peer_node: \"SUT 1\"\n+ peer_pci: \"0000:00:08.0\"\n+ traffic_generator:\n+ type: SCAPY\ndiff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py\nindex ebb0823ff5..6b1c3159f7 100644\n--- a/dts/framework/config/__init__.py\n+++ b/dts/framework/config/__init__.py\n@@ -12,7 +12,7 @@\n import pathlib\n from dataclasses import dataclass\n from enum import Enum, auto, unique\n-from typing import Any, TypedDict\n+from typing import Any, TypedDict, Union\n \n import warlock # type: ignore\n import yaml\n@@ -61,6 +61,18 @@ class Compiler(StrEnum):\n msvc = auto()\n \n \n+@unique\n+class NodeType(StrEnum):\n+ physical = auto()\n+ virtual = auto()\n+\n+\n+@unique\n+class TrafficGeneratorType(StrEnum):\n+ NONE = auto()\n+ SCAPY = auto()\n+\n+\n # Slots enables some optimizations, by pre-allocating space for the defined\n # attributes in the underlying data structure.\n #\n@@ -72,6 +84,41 @@ class HugepageConfiguration:\n force_first_numa: bool\n \n \n+@dataclass(slots=True, frozen=True)\n+class PortConfig:\n+ id: int\n+ node: str\n+ pci: str\n+ dpdk_os_driver: str\n+ os_driver: str\n+ peer_node: str\n+ peer_pci: str\n+\n+ @staticmethod\n+ def from_dict(id: int, node: str, d: dict) -> \"PortConfig\":\n+ return PortConfig(id=id, node=node, **d)\n+\n+\n+@dataclass(slots=True, frozen=True)\n+class TrafficGeneratorConfig:\n+ traffic_generator_type: TrafficGeneratorType\n+\n+ @staticmethod\n+ def from_dict(d: dict):\n+ # This looks useless now, but is designed to allow expansion to traffic\n+ # generators that require more configuration later.\n+ match TrafficGeneratorType(d[\"type\"]):\n+ case TrafficGeneratorType.SCAPY:\n+ return ScapyTrafficGeneratorConfig(\n+ traffic_generator_type=TrafficGeneratorType.SCAPY\n+ )\n+\n+\n+@dataclass(slots=True, frozen=True)\n+class ScapyTrafficGeneratorConfig(TrafficGeneratorConfig):\n+ pass\n+\n+\n @dataclass(slots=True, frozen=True)\n class NodeConfiguration:\n name: str\n@@ -82,29 +129,52 @@ class NodeConfiguration:\n os: OS\n lcores: str\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+ def from_dict(d: dict) -> Union[\"SUTConfiguration\", \"TGConfiguration\"]:\n hugepage_config = d.get(\"hugepages\")\n if hugepage_config:\n if \"force_first_numa\" not in hugepage_config:\n hugepage_config[\"force_first_numa\"] = False\n hugepage_config = HugepageConfiguration(**hugepage_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+ common_config = {\"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+ \"hugepages\": hugepage_config,\n+ \"ports\": [\n+ PortConfig.from_dict(i, d[\"name\"], port)\n+ for i, port in enumerate(d[\"ports\"])\n+ ]}\n+\n+ if \"traffic_generator\" in d:\n+ return TGConfiguration(\n+ traffic_generator=TrafficGeneratorConfig.from_dict(\n+ d[\"traffic_generator\"]),\n+ **common_config\n+ )\n+ else:\n+ return SUTConfiguration(\n+ memory_channels=d.get(\"memory_channels\", 1),\n+ **common_config\n+ )\n+\n+\n+@dataclass(slots=True, frozen=True)\n+class SUTConfiguration(NodeConfiguration):\n+ memory_channels: int\n+\n+\n+@dataclass(slots=True, frozen=True)\n+class TGConfiguration(NodeConfiguration):\n+ traffic_generator: TrafficGeneratorConfig\n \n \n @dataclass(slots=True, frozen=True)\n@@ -156,7 +226,8 @@ class ExecutionConfiguration:\n perf: bool\n func: bool\n test_suites: list[TestSuiteConfig]\n- system_under_test: NodeConfiguration\n+ system_under_test: SUTConfiguration\n+ traffic_generator_system: TGConfiguration\n \n @staticmethod\n def from_dict(d: dict, node_map: dict) -> \"ExecutionConfiguration\":\n@@ -169,12 +240,16 @@ def from_dict(d: dict, node_map: dict) -> \"ExecutionConfiguration\":\n sut_name = d[\"system_under_test\"]\n assert sut_name in node_map, f\"Unknown SUT {sut_name} in execution {d}\"\n \n+ tg_name = d[\"traffic_generator_system\"]\n+ assert tg_name in node_map, f\"Unknown TG {tg_name} in execution {d}\"\n+\n return ExecutionConfiguration(\n build_targets=build_targets,\n perf=d[\"perf\"],\n func=d[\"func\"],\n test_suites=test_suites,\n system_under_test=node_map[sut_name],\n+ traffic_generator_system=node_map[tg_name],\n )\n \n \ndiff --git a/dts/framework/config/conf_yaml_schema.json b/dts/framework/config/conf_yaml_schema.json\nindex ca2d4a1ef2..af1d071368 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@@ -20,6 +90,20 @@\n \"linux\"\n ]\n },\n+ \"OS_WITH_OPTIONS\": {\n+ \"oneOf\": [\n+ {\n+ \"$ref\": \"#/definitions/OS\"\n+ },\n+ {\n+ \"type\": \"string\",\n+ \"enum\": [\n+ \"ALL\",\n+ \"OTHER\"\n+ ]\n+ }\n+ ]\n+ },\n \"cpu\": {\n \"type\": \"string\",\n \"description\": \"Native should be the default on x86\",\n@@ -94,6 +178,34 @@\n \"amount\"\n ]\n },\n+ \"mac_address\": {\n+ \"type\": \"string\",\n+ \"description\": \"A MAC address\",\n+ \"pattern\": \"^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$\"\n+ },\n+ \"pktgen_type\": {\n+ \"type\": \"string\",\n+ \"enum\": [\n+ \"IXIA\",\n+ \"IXIA_NETWORK\",\n+ \"TREX\",\n+ \"SCAPY\",\n+ \"NONE\"\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 +277,60 @@\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+\t \"dpdk_os_driver\": {\n+\t\t \"type\": \"string\",\n+\t\t \"description\": \"The driver that the kernel should bind this device to for DPDK to use it. (ex: vfio-pci)\"\n+\t },\n+\t\t\"os_driver\": {\n+\t\t \"type\": \"string\",\n+\t\t \"description\": \"The driver normally used by this port (ex: i40e)\"\n+\t },\n+\t \"peer_node\": {\n+\t\t \"type\": \"string\",\n+\t\t \"description\": \"The name of the node the peer port is on\"\n+\t\t},\n+\t \"peer_pci\": {\n+\t\t \"$ref\": \"#/definitions/pci_address\",\n+\t\t \"description\": \"The PCI address of the peer port\"\n+\t }\n+ },\n+ \"additionalProperties\": false,\n+ \"required\": [\n+ \"pci\",\n+\t\t\"dpdk_os_driver\",\n+\t\t\"os_driver\",\n+\t\t\"peer_node\",\n+\t\t\"peer_pci\"\n+ ]\n+ },\n+ \"minimum\": 1\n+ },\n+ \"traffic_generator\": {\n+ \"oneOf\": [\n+ {\n+ \"type\": \"object\",\n+ \"description\": \"Scapy traffic generator\",\n+ \"properties\": {\n+ \"type\": {\n+ \"type\": \"string\",\n+ \"enum\": [\n+ \"SCAPY\"\n+ ]\n+ }\n+ }\n+ }\n+ ]\n }\n },\n \"additionalProperties\": false,\n@@ -213,6 +379,9 @@\n },\n \"system_under_test\": {\n \"$ref\": \"#/definitions/node_name\"\n+ },\n+\t \"traffic_generator_system\": {\n+ \"$ref\": \"#/definitions/node_name\"\n }\n },\n \"additionalProperties\": false,\n@@ -221,7 +390,8 @@\n \"perf\",\n \"func\",\n \"test_suites\",\n- \"system_under_test\"\n+ \"system_under_test\",\n+ \"traffic_generator_system\"\n ]\n },\n \"minimum\": 1\n", "prefixes": [ "RFC", "v1", "2/5" ] }