From 3d9e10fc35e2ca031f242f64328d8bbd9939dcc1 Mon Sep 17 00:00:00 2001 From: Kishor Dhanawade Date: Mon, 19 May 2025 14:12:59 +0000 Subject: [PATCH] fix(infra): Octeon bits Fixing typo. Change-Id: I15ea41ee501c48765ab94a08aae58e0505192fe7 Signed-off-by: Kishor Dhanawade --- resources/libraries/python/VppConfigGenerator.py | 2 +- resources/libraries/robot/shared/default.robot | 14 +++++++------- topologies/available/lf_3n_oct_testbed215.yaml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index dc939928b5..11e4c85537 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -833,7 +833,7 @@ class VppInitConfig: vpp_config.add_statseg_per_node_counters("on") vpp_config.add_plugin("disable", "default") vpp_config.add_buffers_per_numa(107520) - if Topology.get_node_model_bool(node, "Marvel-Octeon"): + if Topology.get_node_model_bool(node, "Marvell-Octeon"): vpp_config.add_plugin("enable", "dev_octeon_plugin.so") else: vpp_config.add_main_heap_size("2G") diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 3853cfafb2..1779695ebe 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -145,7 +145,7 @@ | | FOR | ${dut} | IN | @{duts} | | | Import Library | resources.libraries.python.VppConfigGenerator | | | ... | WITH NAME | ${dut} -| | | ${marvel}= | Get Node Model Bool | ${nodes['${dut}']} | Marvel-Octeon +| | | ${marvell}= | Get Node Model Bool | ${nodes['${dut}']} | Marvell-Octeon | | | Run Keyword | ${dut}.Set Node | ${nodes['${dut}']} | node_key=${dut} | | | Run Keyword | ${dut}.Add Unix Log | | | Run Keyword | ${dut}.Add Unix CLI Listen @@ -153,21 +153,21 @@ | | | Run Keyword | ${dut}.Add API Segment Prefix | ${dut} | | | Run Keyword | ${dut}.Add Unix Coredump | | | Run Keyword | ${dut}.Add Socksvr | ${SOCKSVR_PATH} -| | | Run Keyword If | not ${marvel} +| | | Run Keyword If | not ${marvell} | | | ... | ${dut}.Add Main Heap Size | ${${heap_size_mult}*${3}}G -| | | Run Keyword If | not ${marvel} +| | | Run Keyword If | not ${marvell} | | | ... | ${dut}.Add Main Heap Page Size | ${page_size} -| | | Run Keyword If | not ${marvel} +| | | Run Keyword If | not ${marvell} | | | ... | ${dut}.Add Default Hugepage Size | ${page_size} | | | Run Keyword | ${dut}.Add Statseg Size | 3G -| | | Run Keyword If | not ${marvel} +| | | Run Keyword If | not ${marvell} | | | ... | ${dut}.Add Statseg Page Size | ${page_size} | | | Run Keyword | ${dut}.Add Statseg Per Node Counters | on | | | Run Keyword | ${dut}.Add Plugin | disable | default | | | Run Keyword | ${dut}.Add Plugin | enable | @{plugins_to_enable} -| | | Run Keyword If | not ${marvel} +| | | Run Keyword If | not ${marvell} | | | ... | ${dut}.Add IP6 Hash Buckets | 2000000 -| | | Run Keyword If | not ${marvel} +| | | Run Keyword If | not ${marvell} | | | ... | ${dut}.Add IP6 Heap Size | 3G | | | Run Keyword | ${dut}.Add Graph Node Variant | ${GRAPH_NODE_VARIANT} | | END diff --git a/topologies/available/lf_3n_oct_testbed215.yaml b/topologies/available/lf_3n_oct_testbed215.yaml index f919978dd5..69b4c592aa 100644 --- a/topologies/available/lf_3n_oct_testbed215.yaml +++ b/topologies/available/lf_3n_oct_testbed215.yaml @@ -34,7 +34,7 @@ nodes: model: Intel-E810CQ DUT1: type: DUT - model: Marvel-OcteonCN10K + model: Marvell-OcteonCN10K host: 10.30.51.95 arch: aarch64 port: 22 @@ -68,7 +68,7 @@ nodes: model: Cavium-A063-100G DUT2: type: DUT - model: Marvel-OcteonCN10K + model: Marvell-OcteonCN10K host: 10.30.51.96 arch: aarch64 port: 22 @@ -99,4 +99,4 @@ nodes: ip4_address: 172.16.30.2 driver: rvu_nicpf link: link2 - model: Cavium-A063-100G \ No newline at end of file + model: Cavium-A063-100G -- 2.16.6