+ Make the skipping logic in autogen more flexible.
+ Do not emit 4c cases when there is too much VMs/containers.
+ Peter says the second -eth- should be renamed away from suites.
+ Regenerate suites so test case names match (new) suite names.
Change-Id: I95ecc47ca07b8bae6693d5d4330811ff55672fc4
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
"ip6": 78,
"vxlan+ip4": 114 # What is the real minimum for latency stream?
}
+ min_framesize_values = protocol_to_min_framesize.values()
def get_iface_and_suite_id(filename):
"""Get interface and suite ID.
:rtype: int
"""
# TODO: Is there a better way to disable some combinations?
- if kwargs["framesize"] == 9000 and "vic1227" in iface:
- # Not supported in HW.
- pass
- elif kwargs["framesize"] == 9000 and "avf" in suite_id:
- # Not supported by AVF driver.
- # https://git.fd.io/vpp/tree/src/plugins/avf/README.md
- pass
- elif ("soak" in suite_id and
- (kwargs["phy_cores"] != 1
- or kwargs["framesize"] in (1518, 9000, "IMIX_v4_1"))):
+ emit = True
+ if kwargs["framesize"] == 9000:
+ if "vic1227" in iface:
+ # Not supported in HW.
+ emit = False
+ if "avf" in suite_id:
+ # Not supported by AVF driver.
+ # https://git.fd.io/vpp/tree/src/plugins/avf/README.md
+ emit = False
+ if "-16vm-" in suite_id or "-16dcr-" in suite_id:
+ if kwargs["phy_cores"] > 3:
+ # CSIT lab only has 28 (physical) core processors,
+ # so these test would fail when attempting to assign cores.
+ emit = False
+ if "soak" in suite_id:
# Soak test take too long, do not risk other than tc01.
- pass
- else:
+ if kwargs["phy_cores"] != 1:
+ emit = False
+ if kwargs["framesize"] not in min_framesize_values:
+ emit = False
+ if emit:
file_out.write(testcase.generate(num=num, **kwargs))
+ # We bump tc number in any case, so that future enables/disables
+ # do not affect the numbering of other test cases.
return num + 1
def add_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc01-64B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-64B-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc02-64B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc03-64B-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc03-64B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc04-1518B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc04-1518B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | 1518B | 1C
| | framesize=${1518} | phy_cores=${1}
-| tc05-1518B-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc05-1518B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | 1518B | 2C
| | framesize=${1518} | phy_cores=${2}
-| tc06-1518B-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc06-1518B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc07-9000B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc07-9000B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | 9000B | 1C
| | framesize=${9000} | phy_cores=${1}
-| tc08-9000B-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc08-9000B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | 9000B | 2C
| | framesize=${9000} | phy_cores=${2}
-| tc09-9000B-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc09-9000B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | IMIX | 1C
| | framesize=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
| tc11-IMIX-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-
| tc11-IMIX-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-
| tc11-IMIX-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-
| tc11-IMIX-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-
| tc11-IMIX-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-
| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-
| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-
| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc01-64B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-64B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc02-64B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc03-64B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc03-64B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc04-1518B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc04-1518B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | 1518B | 1C
| | framesize=${1518} | phy_cores=${1}
-| tc05-1518B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc05-1518B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | 1518B | 2C
| | framesize=${1518} | phy_cores=${2}
-| tc06-1518B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc06-1518B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc07-9000B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc07-9000B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | 9000B | 1C
| | framesize=${9000} | phy_cores=${1}
-| tc08-9000B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc08-9000B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | 9000B | 2C
| | framesize=${9000} | phy_cores=${2}
-| tc09-9000B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc09-9000B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | IMIX | 1C
| | framesize=IMIX_v4_1 | phy_cores=${1}
-| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
| tc11-IMIX-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
| | [Tags] | IMIX | 2C
| | framesize=IMIX_v4_1 | phy_cores=${2}
-