fix(core): Improve octeon support

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: I0c034fff225f50c1989bc2cf700141ec74d2f805

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index 8022103..c68620b 100644 (file)
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -1023,6 +1023,8 @@ function select_tags () {
     awk_nics_sub_cmd+='gsub("nitro-50g","50ge1p1ENA");'
     awk_nics_sub_cmd+='gsub("nitro-100g","100ge1p1ENA");'
     awk_nics_sub_cmd+='gsub("nitro-200g","200ge1p1ENA");'
+    awk_nics_sub_cmd+='gsub("cavium-50g","50ge2p1cavium50g");'
+    awk_nics_sub_cmd+='gsub("cavium-100g","100ge2p1cavium100g");'
     awk_nics_sub_cmd+='gsub("virtual","1ge1p82540em");'
     awk_nics_sub_cmd+='if ($9 =="drv_avf") drv="avf-";'
     awk_nics_sub_cmd+='else if ($9 =="drv_rdma_core") drv ="rdma-";'

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 297e937..71369af 100644 (file)
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -332,8 +332,6 @@ class Constants:
         "Amazon-Nitro-50G": 10000000000,
         "Amazon-Nitro-100G": 10000000000,
         "Amazon-Nitro-200G": 16000000000,
-        "Cavium-A063-10G": 10000000000,
-        "Cavium-A063-40G": 40000000000,
         "Cavium-A063-50G": 50000000000,
         "Cavium-A063-100G": 100000000000,
         "virtual": 100000000,
@@ -354,8 +352,6 @@ class Constants:
         "Amazon-Nitro-50G": 1500000,
         "Amazon-Nitro-100G": 3000000,
         "Amazon-Nitro-200G": 6000000,
-        "Cavium-A063-10G": 78125000,
-        "Cavium-A063-40G": 78125000,
         "Cavium-A063-50G": 97656250,
         "Cavium-A063-100G": 195312500,
         "virtual": 14880952,
@@ -377,8 +373,6 @@ class Constants:
         "Mellanox-CX6DX": "100ge2p1cx6dx",
         "Mellanox-CX7VEAT": "200ge2p1cx7veat",
         "Mellanox-CX7VEAT": "200ge6p3cx7veat",
-        "Cavium-A063-10G": "10ge2p1a063",
-        "Cavium-A063-40G": "40ge2p1a063",
         "Cavium-A063-50G": "50ge2p1a063",
         "Cavium-A063-100G": "100ge2p1a063",
         "virtual": "1ge1p82540em",
@@ -398,8 +392,6 @@ class Constants:
         "100ge2p1cx6dx": "Mellanox-CX6DX",
         "200ge2p1cx7veat": "Mellanox-CX7VEAT",
         "200ge6p3cx7veat": "Mellanox-CX7VEAT",
-        "10ge2p1a063":"Cavium-A063-10G",
-        "40ge2p1a063":"Cavium-A063-40G",
         "50ge2p1a063":"Cavium-A063-50G",
         "100ge2p1a063":"Cavium-A063-100G",
         "1ge1p82540em": "virtual",
@@ -421,8 +413,6 @@ class Constants:
         "100ge2p1cx6dx": "cx6dx",
         "200ge2p1cx7veat": "cx7veat",
         "200ge6p3cx7veat": "cx7veat",
-        "10ge2p1a063": "a063",
-        "40ge2p1a063": "a063",
         "50ge2p1a063": "a063",
         "100ge2p1a063": "a063",
         "1ge1p82540em": "82540em",
@@ -443,8 +433,6 @@ class Constants:
         "Mellanox-CX556A": ["rdma-core", "mlx5_core", "af_xdp"],
         "Mellanox-CX6DX": ["rdma-core", "mlx5_core", "af_xdp"],
         "Mellanox-CX7VEAT": ["rdma-core", "mlx5_core", "af_xdp"],
-        "Cavium-A063-10G": ["vfio-pci"],
-        "Cavium-A063-40G": ["vfio-pci"],
         "Cavium-A063-50G": ["vfio-pci"],
         "Cavium-A063-100G": ["vfio-pci"],
         "virtual": ["vfio-pci"],
@@ -520,12 +508,6 @@ class Constants:
             "mlx5_core": "dpdk_plugin.so",
             "af_xdp": "af_xdp_plugin.so"
         },
-        "Cavium-A063-10G": {
-            "vfio-pci": "dev_octeon_plugin.so"
-        },
-        "Cavium-A063-40G": {
-            "vfio-pci": "dev_octeon_plugin.so"
-        },
         "Cavium-A063-50G": {
             "vfio-pci": "dev_octeon_plugin.so"
         },
@@ -580,8 +562,6 @@ class Constants:
         "100ge2p1cx6dx": "nic_pfs}= | 2",
         "200ge2p1cx7veat": "nic_pfs}= | 2",
         "200ge6p3cx7veat": "nic_pfs}= | 6",
-        "10ge2p1a063": "nic_pfs}= | 2",
-        "40ge2p1a063": "nic_pfs}= | 2",
         "50ge2p1a063": "nic_pfs}= | 2",
         "100ge2p1a063": "nic_pfs}= | 2",
         "1ge1p82540em": "nic_pfs}= | 2",
@@ -602,8 +582,6 @@ class Constants:
         "100ge2p1cx6dx": 1,
         "200ge2p1cx7veat": 1,
         "200ge6p3cx7veat": 3,
-        "10ge2p1a063": 1,
-        "40ge2p1a063": 1,
         "50ge2p1a063": 1,
         "100ge2p1a063": 1,
         "1ge1p82540em": 1,
@@ -624,8 +602,6 @@ class Constants:
         "Mellanox-CX556A": ["mlx5_core"],
         "Mellanox-CX6DX": ["mlx5_core"],
         "Mellanox-CX7VEAT": ["mlx5_core"],
-        "Cavium-A063-10G": ["vfio-pci"],
-        "Cavium-A063-40G": ["vfio-pci"],
         "Cavium-A063-50G": ["vfio-pci"],
         "Cavium-A063-100G": ["vfio-pci"],
         "virtual": ["vfio-pci"],

diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index 094d277..3853cfa 100644 (file)
--- a/resources/libraries/robot/shared/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -145,6 +145,7 @@
 | | FOR | ${dut} | IN | @{duts}
 | | | Import Library | resources.libraries.python.VppConfigGenerator
 | | | ... | WITH NAME | ${dut}
+| | | ${marvel}= | Get Node Model Bool | ${nodes['${dut}']} | Marvel-Octeon
 | | | Run Keyword | ${dut}.Set Node | ${nodes['${dut}']} | node_key=${dut}
 | | | Run Keyword | ${dut}.Add Unix Log
 | | | Run Keyword | ${dut}.Add Unix CLI Listen
@@ -152,16 +153,22 @@
 | | | Run Keyword | ${dut}.Add API Segment Prefix | ${dut}
 | | | Run Keyword | ${dut}.Add Unix Coredump
 | | | Run Keyword | ${dut}.Add Socksvr | ${SOCKSVR_PATH}
-| | | Run Keyword | ${dut}.Add Main Heap Size | ${${heap_size_mult}*${3}}G
-| | | Run Keyword | ${dut}.Add Main Heap Page Size | ${page_size}
-| | | Run Keyword | ${dut}.Add Default Hugepage Size | ${page_size}
+| | | Run Keyword If | not ${marvel}
+| | | ... | ${dut}.Add Main Heap Size | ${${heap_size_mult}*${3}}G
+| | | Run Keyword If | not ${marvel}
+| | | ... | ${dut}.Add Main Heap Page Size | ${page_size}
+| | | Run Keyword If | not ${marvel}
+| | | ... | ${dut}.Add Default Hugepage Size | ${page_size}
 | | | Run Keyword | ${dut}.Add Statseg Size | 3G
-| | | Run Keyword | ${dut}.Add Statseg Page Size | ${page_size}
+| | | Run Keyword If | not ${marvel}
+| | | ... | ${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 | ${dut}.Add IP6 Hash Buckets | 2000000
-| | | Run Keyword | ${dut}.Add IP6 Heap Size | 3G
+| | | Run Keyword If | not ${marvel}
+| | | ... | ${dut}.Add IP6 Hash Buckets | 2000000
+| | | Run Keyword If | not ${marvel}
+| | | ... | ${dut}.Add IP6 Heap Size | 3G
 | | | Run Keyword | ${dut}.Add Graph Node Variant | ${GRAPH_NODE_VARIANT}
 | | END
 

diff --git a/topologies/available/2n_hw_testbed1.yaml.example b/topologies/available/2n_hw_testbed1.yaml.example
index c023d04..7f205a3 100644 (file)
--- a/topologies/available/2n_hw_testbed1.yaml.example
+++ b/topologies/available/2n_hw_testbed1.yaml.example
@@ -40,6 +40,18 @@ nodes:
         link: link4
         driver: e1000
         model: virtual
+      port5:
+        mac_address: "00:00:00:00:00:00"
+        pci_address: "0000:00:03.0"
+        driver: e1000
+        link: link5
+        model: Cavium-A063-50G
+      port6:
+        mac_address: "00:00:00:00:00:00"
+        pci_address: "0000:00:04.0"
+        link: link5
+        driver: e1000
+        model: Cavium-A063-50G
   DUT1:
     type: DUT
     model: Intel-Sapphirerapids

diff --git a/topologies/available/lf_2n_spr_testbed23.yaml b/topologies/available/lf_2n_spr_testbed23.yaml
index 2df5eb7..259896d 100644 (file)
--- a/topologies/available/lf_2n_spr_testbed23.yaml
+++ b/topologies/available/lf_2n_spr_testbed23.yaml
@@ -155,9 +155,9 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:76:00.0"
-        driver: "4xxx"
-        model: "HW_4xxx"
-        module: "qat_4xxx"
+        driver: 4xxx
+        model: HW_4xxx
+        module: qat_4xxx
         numvfs: 8
       #device2:
       #  pci_address: "0000:7a:00.0"

diff --git a/topologies/available/lf_3n_oct_testbed215.yaml b/topologies/available/lf_3n_oct_testbed215.yaml
index 41c1164..e939803 100644 (file)
--- a/topologies/available/lf_3n_oct_testbed215.yaml
+++ b/topologies/available/lf_3n_oct_testbed215.yaml
@@ -78,9 +78,9 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0002:20:00.0"
-        driver: "rvu_cptpf"
-        model: "HW_A0FD"
-        module: "rvu_cptpf"
+        driver: rvu_cptpf
+        model: HW_A0FD
+        module: rvu_cptpf
         numvfs: 1
     eventdev: "0002:0e:00.0"
     interfaces:

diff --git a/topologies/available/lf_3n_snr_testbed39.yaml b/topologies/available/lf_3n_snr_testbed39.yaml
index e4f2d82..23d8972 100644 (file)
--- a/topologies/available/lf_3n_snr_testbed39.yaml
+++ b/topologies/available/lf_3n_snr_testbed39.yaml
@@ -47,7 +47,7 @@ nodes:
         ip4_address: 172.16.60.1
         driver: ice
         link: link5
-        model: Intel-E810XXV"
+        model: Intel-E810XXV
   DUT1:
     type: DUT
     model: Intel-Snowridge
@@ -73,7 +73,7 @@ nodes:
         ip4_address: 172.16.10.2
         driver: ice
         link: link2
-        model: "Intel-E822CQ"
+        model: Intel-E822CQ
       port2:
         # s93-t39-sut1-c1/p2 - 25GE port2 Intel E822-CQDA4 4p25GE.
         mac_address: "00:00:00:01:01:01"

diff --git a/topologies/available/vpp_device.template b/topologies/available/vpp_device.template
index 6b9fb7d..2f25de5 100644 (file)
--- a/topologies/available/vpp_device.template
+++ b/topologies/available/vpp_device.template
@@ -8,7 +8,7 @@ metadata:
 nodes:
   TG:
     type: TG
-    model: Virtual
+    model: virtual
     host: ${CSIT_TG_HOST}
     arch: ${CSIT_TG_ARCH}
     port: ${CSIT_TG_PORT}
@@ -18,11 +18,11 @@ nodes:
 ${CSIT_TG_INTERFACES}
   DUT1:
     type: DUT
-    model: Virtual
+    model: virtual
     host: ${CSIT_DUT1_HOST}
     arch: ${CSIT_DUT1_ARCH}
     port: ${CSIT_DUT1_PORT}
     username: root
     password: Csit1234
     interfaces:
-${CSIT_DUT1_INTERFACES}
+${CSIT_DUT1_INTERFACES}
\ No newline at end of file