diff options
25 files changed, 317 insertions, 87 deletions
diff --git a/resources/job_specs/report_iterative/3na-spr/vpp-mrr-00.md b/resources/job_specs/report_iterative/3na-spr/vpp-mrr-00.md index e056c2204a..b4b7bd1c2e 100644 --- a/resources/job_specs/report_iterative/3na-spr/vpp-mrr-00.md +++ b/resources/job_specs/report_iterative/3na-spr/vpp-mrr-00.md @@ -98,9 +98,9 @@ 2c AND 64b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale20k-rnd 4c AND 64b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale20k-rnd ##### ethip4-ip4scale60k-rnd -1c AND 64b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd -2c AND 64b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd -4c AND 64b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +3c AND 64b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +6c AND 64b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +12c AND 64b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd ##### ethip4-ip4scale200k-rnd 1c AND 64b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k-rnd 2c AND 64b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k-rnd @@ -218,4 +218,4 @@ ##### ethip6srhip6-ip6base-srv6proxy-stat 1c AND 78b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-stat 2c AND 78b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-stat -4c AND 78b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-stat
\ No newline at end of file +4c AND 78b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-stat diff --git a/resources/job_specs/report_iterative/3na-spr/vpp-ndrpdr-00.md b/resources/job_specs/report_iterative/3na-spr/vpp-ndrpdr-00.md index d205ed6ccc..e2a96854f7 100644 --- a/resources/job_specs/report_iterative/3na-spr/vpp-ndrpdr-00.md +++ b/resources/job_specs/report_iterative/3na-spr/vpp-ndrpdr-00.md @@ -98,9 +98,9 @@ 2c AND 64b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale20k-rnd 4c AND 64b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale20k-rnd ##### ethip4-ip4scale60k-rnd -1c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd -2c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd -4c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +3c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +6c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +12c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd ##### ethip4-ip4scale200k-rnd 1c AND 64b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k-rnd 2c AND 64b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k-rnd @@ -218,4 +218,4 @@ ##### ethip6srhip6-ip6base-srv6proxy-stat 1c AND 78b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-stat 2c AND 78b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-stat -4c AND 78b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-stat
\ No newline at end of file +4c AND 78b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-stat diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 12f555ca84..70452e6ff4 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -485,6 +485,25 @@ class Constants: "1ge1p82540em": "nic_pfs}= | 2", } + NIC_CODE_TO_CORESCALE = { + "10ge2p1x520": 1, + "10ge2p1x710": 1, + "40ge2p1xl710": 1, + "25ge2p1xxv710": 1, + "25ge2p1e810xxv": 1, + "25ge2p1e822cq": 1, + "25ge2p1e823c": 1, + "100ge2p1e810cq": 1, + "50ge1p1ena": 1, + "100ge1p1ena": 1, + "200ge1p1ena": 1, + "100ge2p1cx556a": 1, + "100ge2p1cx6dx": 1, + "200ge2p1cx7veat": 1, + "200ge6p3cx7veat": 3, + "1ge1p82540em": 1, + } + # Not each driver is supported by each NIC. DPDK_NIC_NAME_TO_DRIVER = { "Intel-X520-DA2": ["vfio-pci"], diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index 706c250ec2..8d593fecca 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -150,16 +150,17 @@ def filter_and_edit_kwargs_for_astf(suite_id, kwargs): return kwargs -def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list): +def add_default_testcases( + testcase, nic_code, suite_id, file_out, tc_kwargs_list): """Add default testcases to file. :param testcase: Testcase class. - :param iface: Interface. + :param nic_code: NIC code. :param suite_id: Suite ID. :param file_out: File to write testcases to. :param tc_kwargs_list: Key-value pairs used to construct testcases. :type testcase: Testcase - :type iface: str + :type nic_code: str :type suite_id: str :type file_out: file :type tc_kwargs_list: dict @@ -169,23 +170,7 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list): kwargs = copy.deepcopy(kwas) # TODO: Is there a better way to disable some combinations? emit = True - if kwargs[u"frame_size"] == 9000: - if u"vic1227" in iface: - # Not supported in HW. - emit = False - if u"vic1385" in iface: - # Not supported in HW. - emit = False - if u"-16vm2t-" in suite_id or u"-16dcr2t-" in suite_id: - if kwargs[u"phy_cores"] > 3: - # CSIT lab only has 28 (physical) core processors, - # so these test would fail when attempting to assign cores. - emit = False - if u"-24vm1t-" in suite_id or u"-24dcr1t-" in suite_id: - if kwargs[u"phy_cores"] > 3: - # CSIT lab only has 28 (physical) core processors, - # so these test would fail when attempting to assign cores. - emit = False + core_scale = Constants.NIC_CODE_TO_CORESCALE[nic_code] if u"soak" in suite_id: # Soak test take too long, do not risk other than tc01. if kwargs[u"phy_cores"] != 1: @@ -196,6 +181,9 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list): else: if kwargs[u"frame_size"] not in MIN_FRAME_SIZE_VALUES: emit = False + + kwargs.update({'phy_cores': kwas['phy_cores']*core_scale}) + kwargs = filter_and_edit_kwargs_for_astf(suite_id, kwargs) if emit and kwargs is not None: file_out.write(testcase.generate(**kwargs)) @@ -347,7 +335,7 @@ def write_default_files(in_filename, in_prolog, kwargs_list): with open(out_filename, "wt") as file_out: file_out.write(out_prolog) add_default_testcases( - testcase, iface, suite_id, file_out, kwargs_list + testcase, nic_code, suite_id, file_out, kwargs_list ) continue for driver in Constants.NIC_NAME_TO_DRIVER[nic_name]: @@ -396,7 +384,7 @@ def write_default_files(in_filename, in_prolog, kwargs_list): with open(out_filename, "wt") as file_out: file_out.write(out_prolog) add_default_testcases( - testcase, iface, suite_id, file_out, kwargs_list + testcase, nic_code, suite_id, file_out, kwargs_list ) diff --git a/resources/libraries/python/model/ExportJson.py b/resources/libraries/python/model/ExportJson.py index 843949eb9f..3f923d6d0e 100644 --- a/resources/libraries/python/model/ExportJson.py +++ b/resources/libraries/python/model/ExportJson.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -301,25 +301,18 @@ class ExportJson(): self.data["test_id"] = f"{suite_part}.{test_part}" tags = self.data["tags"] # Test name does not contain thread count. - subparts = test_part.split("c-", 1) - if len(subparts) < 2 or subparts[0][-2:-1] != "-": + subparts = test_part.split("-") + if any("tg" in s for s in subparts) and subparts[1] == "": # Physical core count not detected, assume it is a TRex test. if "--" not in test_part: - raise RuntimeError(f"Cores not found for {subparts}") + raise RuntimeError(f"Invalid TG test name for: {subparts}") short_name = test_part.split("--", 1)[1] else: - short_name = subparts[1] + short_name = "-".join(subparts[2:]) # Add threads to test_part. - core_part = subparts[0][-1] + "c" - for tag in tags: - tag = tag.lower() - if len(tag) == 4 and core_part == tag[2:] and tag[1] == "t": - test_part = test_part.replace(f"-{core_part}-", f"-{tag}-") - break - else: - raise RuntimeError( - f"Threads not found for {test_part} tags {tags}" - ) + core_part = subparts[1] + tag = list(filter(lambda t: subparts[1].upper() in t, tags))[0] + test_part = test_part.replace(f"-{core_part}-", f"-{tag.lower()}-") # For long name we need NIC model, which is only in suite name. last_suite_part = suite_part.split(".")[-1] # Short name happens to be the suffix we want to ignore. diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 65e6613680..c2a013ddf1 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -152,16 +152,16 @@ | | | Run Keyword | ${dut}.Add Unix GID | | | Run Keyword | ${dut}.Add Unix Coredump | | | Run Keyword | ${dut}.Add Socksvr | ${SOCKSVR_PATH} -| | | Run Keyword | ${dut}.Add Main Heap Size | ${${heap_size_mult}*${2}}G +| | | 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 | ${dut}.Add Statseg Size | 2G +| | | Run Keyword | ${dut}.Add Statseg Size | 3G | | | Run Keyword | ${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 | 4G +| | | Run Keyword | ${dut}.Add IP6 Heap Size | 3G | | | Run Keyword | ${dut}.Add Graph Node Variant | ${GRAPH_NODE_VARIANT} | | END diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-rnd-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-rnd-ndrpdr.robot index ce3ec3c152..e72ba8e1a8 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-rnd-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-rnd-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -63,6 +63,7 @@ | ${osi_layer}= | L3 | ${overhead}= | ${0} | ${rts_per_flow}= | ${10000} +| ${rxq_ratio}= | ${3} # Traffic profile | ${traffic_profile}= | trex-stl-ethip4-ip4dst-rnd${rts_per_flow}-${nic_pfs}p diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot index 1193debe5e..25aa563ef0 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -115,6 +115,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -123,6 +127,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -131,6 +139,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -138,3 +150,7 @@ | IMIX-2c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot index 83cd6ac371..997bebb88b 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot index 588f2f0c63..62f1be2c4a 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot index 4697503713..99c3a4465e 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot index 41d98f83a6..84e3260cf4 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot index 480581f52d..7c4be7fea9 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot index 54354059cb..184322ff58 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot index e2d4ab013b..a71f9463fb 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot index 871c7d38dc..2e418d1577 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot index 48a54f15b3..fdd9ed6b3e 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot index 7ec3764476..84e66e9412 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot index e144b8e196..8bad579f89 100644 --- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot index f69a16f1e0..c5ef431c21 100644 --- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot index d53f019d67..bbee99fbfc 100644 --- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot index 30c7962eea..7fdc0fcbee 100644 --- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot index 9b77ffd0f9..45c50b0503 100644 --- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot index b4e9cf72cc..58fca61c13 100644 --- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot +++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -114,6 +114,10 @@ | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} +| 64B-4c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + | 1518B-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} @@ -122,6 +126,10 @@ | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} +| 1518B-4c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + | 9000B-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} @@ -130,6 +138,10 @@ | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} +| 9000B-4c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + | IMIX-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} @@ -137,3 +149,7 @@ | IMIX-2c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -26,16 +26,14 @@ [tox] # Fast and brief checkers to front, slow or verbose checkers to back. -envlist = job_spec, copyright_year, gpl_license, - new_line_length, line_length, autogen, pylint +envlist = copyright_year, gpl_license, new_line_length, line_length, autogen, + pylint # The following is needed as tox requires setup.py by default. skipsdist = true # Just a shorthand to avoid long lines. script_dir = ./resources/libraries/bash/entry/tox -# TODO: Tox prints various warnings. Figure them out and fix them. - # Recommended ordering withinn testenv definition: # + General comments. # + ignore_outcome for non-voting checkers, @@ -44,25 +42,23 @@ script_dir = ./resources/libraries/bash/entry/tox # + whitelist_externals to enable bash. # + Commands with a single bash to launch the corresponding script. -# Keep testenvs sorted alphabetically, please. - [testenv:autogen] setenv = PYTHONPATH = {toxinidir} -whitelist_externals = /bin/bash +whitelist_externals = bash commands = bash {[tox]script_dir}/autogen.sh [testenv:copyright_year] -whitelist_externals = /bin/bash +whitelist_externals = bash commands = bash {[tox]script_dir}/copyright_year.sh [testenv:gpl_license] -whitelist_externals = /bin/bash +whitelist_externals = bash commands = bash {[tox]script_dir}/gpl_license.sh [testenv:line_length] # Fix all transgressions and remove the ignore_outcome flag. ignore_outcome = true -whitelist_externals = /bin/bash +whitelist_externals = bash commands = bash {[tox]script_dir}/line.sh [testenv:new_line_length] @@ -70,7 +66,7 @@ commands = bash {[tox]script_dir}/line.sh # As current implementation is too dumb to filter those out, # the checker has to remain non-voting. ignore_outcome = true -whitelist_externals = /bin/bash +whitelist_externals = bash commands = bash {[tox]script_dir}/new_line.sh [testenv:pylint] @@ -79,12 +75,5 @@ ignore_outcome = true setenv = PYTHONPATH = {toxinidir} basepython = python3 deps = -r ./requirements.txt -whitelist_externals = /bin/bash +whitelist_externals = bash commands = bash {[tox]script_dir}/pylint.sh - -# Keep testenvs sorted alphabetically, please. - -# TODO: Create voting "pylint violations should not increase" checker. -# TODO: Create voting checker to reject suites with Force Tags of other suite. -# TODO: Create voting checker against tags not in tag_documentation.rst file. -# to override line check. |