aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-08-17 14:03:58 +0000
committerPeter Mikus <pmikus@cisco.com>2021-08-19 18:18:54 +0000
commit9f5525de03c3d1cbca8b7e2a324414308645a9f3 (patch)
treeb96b5f8ce9436e226180f5ad6f0d9c4ba6b95d50 /resources
parent8079ed2ff7e2fdd41474d286b98cd9be19481f7a (diff)
vpp_device: Multiple NICs (suitegen)
Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: I81958fbf6ef240d53a0fb8708ca882baf02f606c
Diffstat (limited to 'resources')
-rwxr-xr-xresources/libraries/bash/entry/bootstrap_vpp_device.sh5
-rw-r--r--resources/libraries/bash/entry/check/tc_naming.sh4
-rw-r--r--resources/libraries/bash/function/common.sh73
-rw-r--r--resources/libraries/bash/function/device.sh4
-rw-r--r--resources/libraries/python/Constants.py4
-rw-r--r--resources/libraries/python/autogen/Regenerator.py75
6 files changed, 97 insertions, 68 deletions
diff --git a/resources/libraries/bash/entry/bootstrap_vpp_device.sh b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
index 95708e888d..ae4c26a1ba 100755
--- a/resources/libraries/bash/entry/bootstrap_vpp_device.sh
+++ b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
@@ -35,15 +35,16 @@ common_dirs || die
check_prerequisites || die
get_test_code "${1-}" || die
get_test_tag_string || die
-select_topology || die
select_arch_os || die
gather_build || die
check_download_dir || die
activate_virtualenv || die
generate_tests || die
archive_tests || die
+prepare_topology || die
+select_topology || die
activate_docker_topology || die
-select_vpp_device_tags || die
+select_tags || die
compose_pybot_arguments || die
set_environment_variables || die
run_pybot || die
diff --git a/resources/libraries/bash/entry/check/tc_naming.sh b/resources/libraries/bash/entry/check/tc_naming.sh
index bc2ac32671..f392ad7b9a 100644
--- a/resources/libraries/bash/entry/check/tc_naming.sh
+++ b/resources/libraries/bash/entry/check/tc_naming.sh
@@ -64,7 +64,7 @@ r_testc_rules=(
#'(ipsec[[:digit:]]+tnlhw|ipsec[[:digit:]]+tnlsw|'
#'srhip6|tcp|udp|lispip6|lispip4|vxlan){0,1}'
#'(http){0,1}-'
- '(.*)-(dev|ndrpdr|bps|cps|rps|reconf)$'
+ '(.*)-(scapy|ndrpdr|bps|cps|rps|reconf)$'
)
s_suite_rules=(
'number of SUT nodes'
@@ -83,7 +83,7 @@ r_suite_rules=(
#'(ipsec[[:digit:]]+tnlhw|ipsec[[:digit:]]+tnlsw|'
#'srhip6|tcp|udp|lispip6|lispip4|vxlan){0,1}'
#'(http){0,1}-'
- '(.*)-(dev|ndrpdr|bps|cps|rps|reconf)$'
+ '(.*)-(scapy|ndrpdr|bps|cps|rps|reconf)$'
)
rm -f "tc_naming.log" || die
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index 68ad5ef926..ce0c526863 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -86,7 +86,7 @@ function activate_docker_topology () {
die "Topology file create failed!"
}
- WORKING_TOPOLOGY="/tmp/topology.yaml"
+ WORKING_TOPOLOGY="${CSIT_DIR}/topologies/available/vpp_device.yaml"
mv topo.yml "${WORKING_TOPOLOGY}" || {
die "Topology move failed!"
}
@@ -864,6 +864,12 @@ function select_tags () {
tfd="${JOB_SPECS_DIR}"
case "${TEST_CODE}" in
# Select specific performance tests based on jenkins job type variable.
+ *"vpp-device"* )
+ readarray -t test_tag_array <<< $(grep -v "#" \
+ ${tfd}/vpp_device/${DUT}-${NODENESS}-${FLAVOR}.md |
+ awk {"$awk_nics_sub_cmd"} || echo "devicetest") || die
+ SELECTION_MODE="--test"
+ ;;
*"ndrpdr-weekly"* )
readarray -t test_tag_array <<< $(grep -v "#" \
${tfd}/mlr_weekly/${DUT}-${NODENESS}-${FLAVOR}.md |
@@ -922,6 +928,10 @@ function select_tags () {
# Reasons for blacklisting:
# - ipsechw - Blacklisted on testbeds without crypto hardware accelerator.
case "${TEST_CODE}" in
+ *"1n-vbox"*)
+ test_tag_array+=("!avf")
+ test_tag_array+=("!vhost")
+ ;;
*"2n-skx"*)
test_tag_array+=("!ipsechw")
;;
@@ -1084,67 +1094,6 @@ function select_topology () {
}
-function select_vpp_device_tags () {
-
- # Variables read:
- # - TEST_CODE - String affecting test selection, usually jenkins job name.
- # - TEST_TAG_STRING - String selecting tags, from gerrit comment.
- # Can be unset.
- # Variables set:
- # - TAGS - Array of processed tag boolean expressions.
-
- set -exuo pipefail
-
- case "${TEST_CODE}" in
- # Select specific device tests based on jenkins job type variable.
- * )
- if [[ -z "${TEST_TAG_STRING-}" ]]; then
- # If nothing is specified, we will run pre-selected tests by
- # following tags. Items of array will be concatenated by OR
- # in Robot Framework.
- test_tag_array=()
- else
- # If trigger contains tags, split them into array.
- test_tag_array=(${TEST_TAG_STRING//:/ })
- fi
- SELECTION_MODE="--include"
- ;;
- esac
-
- # Blacklisting certain tags per topology.
- #
- # Reasons for blacklisting:
- # - avf - AVF is not possible to run on enic driver of VirtualBox.
- # - vhost - VirtualBox does not support nesting virtualization on Intel CPU.
- case "${TEST_CODE}" in
- *"1n-vbox"*)
- test_tag_array+=("!avf")
- test_tag_array+=("!vhost")
- ;;
- *)
- ;;
- esac
-
- TAGS=()
-
- # We will prefix with devicetest to prevent running other tests
- # (e.g. Functional).
- prefix="devicetestAND"
- if [[ "${TEST_CODE}" == "vpp-"* ]]; then
- # Automatic prefixing for VPP jobs to limit testing.
- prefix="${prefix}"
- fi
- for tag in "${test_tag_array[@]}"; do
- if [[ ${tag} == "!"* ]]; then
- # Exclude tags are not prefixed.
- TAGS+=("${tag}")
- else
- TAGS+=("${prefix}${tag}")
- fi
- done
-}
-
-
function set_environment_variables () {
# Depending on testbed topology, overwrite defaults set in the
diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index 8bfb2e458c..eab31a65a6 100644
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -527,7 +527,7 @@ function parse_env_variables () {
mac_address: "${TG_NETMACS[$((port-1))]}"
pci_address: "${TG_PCIDEVS[$((port-1))]}"
link: "link$((port-1))"
- model: "${TG_MODELS[$((port-1))]}"
+ model: ${TG_MODELS[$((port-1))]}
driver: "${TG_DRIVERS[$((port-1))]}"
vlan: ${TG_VLANS[$((port-1))]}
EOF
@@ -540,7 +540,7 @@ EOF
mac_address: "${DUT1_NETMACS[$((port-1))]}"
pci_address: "${DUT1_PCIDEVS[$((port-1))]}"
link: "link$((port-1))"
- model: "${DUT1_MODELS[$((port-1))]}"
+ model: ${DUT1_MODELS[$((port-1))]}
driver: "${DUT1_DRIVERS[$((port-1))]}"
vlan: ${DUT1_VLANS[$((port-1))]}
EOF
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index f8c4c7fae9..ec6c5898a6 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -415,6 +415,10 @@ class Constants:
u"Intel-XL710": u"HW_DH895xcc",
}
+ DEVICE_TYPE_TO_KEYWORD = {
+ u"scapy": None
+ }
+
PERF_TYPE_TO_KEYWORD = {
u"mrr": u"Traffic should pass with maximum rate",
u"ndrpdr": u"Find NDR and PDR intervals using optimized search",
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index abcd7b8b99..7003d3905d 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -480,6 +480,75 @@ def write_iperf3_files(in_filename, in_prolog, kwargs_list):
add_iperf3_testcases(testcase, file_out, kwargs_list)
+def write_device_files(in_filename, in_prolog, kwargs_list):
+ """Using given filename and prolog, write all generated suites.
+
+ :param in_filename: Template filename to derive real filenames from.
+ :param in_prolog: Template content to derive real content from.
+ :param kwargs_list: List of kwargs for add_default_testcase.
+ :type in_filename: str
+ :type in_prolog: str
+ :type kwargs_list: list of dict
+ """
+ for suite_type in Constants.DEVICE_TYPE_TO_KEYWORD:
+ tmp_filename = replace_defensively(
+ in_filename, u"scapy", suite_type, 1,
+ u"File name should contain suite type once.", in_filename
+ )
+ _, suite_id, _ = get_iface_and_suite_ids(tmp_filename)
+ testcase = Testcase.default(suite_id)
+ for nic_name in Constants.NIC_NAME_TO_CODE:
+ tmp2_filename = replace_defensively(
+ tmp_filename, u"10ge2p1x710",
+ Constants.NIC_NAME_TO_CODE[nic_name], 1,
+ u"File name should contain NIC code once.", in_filename
+ )
+ tmp2_prolog = replace_defensively(
+ in_prolog, u"Intel-X710", nic_name, 2,
+ u"NIC name should appear twice (tag and variable).",
+ in_filename
+ )
+ iface, old_suite_id, _ = get_iface_and_suite_ids(
+ tmp2_filename
+ )
+ for driver in Constants.NIC_NAME_TO_DRIVER[nic_name]:
+ out_filename = replace_defensively(
+ tmp2_filename, old_suite_id,
+ Constants.NIC_DRIVER_TO_SUITE_PREFIX[driver] + old_suite_id,
+ 1, u"Error adding driver prefix.", in_filename
+ )
+ out_prolog = replace_defensively(
+ tmp2_prolog, u"vfio-pci", driver, 1,
+ u"Driver name should appear once.", in_filename
+ )
+ out_prolog = replace_defensively(
+ out_prolog, Constants.NIC_DRIVER_TO_TAG[u"vfio-pci"],
+ Constants.NIC_DRIVER_TO_TAG[driver], 1,
+ u"Driver tag should appear once.", in_filename
+ )
+ out_prolog = replace_defensively(
+ out_prolog, Constants.NIC_DRIVER_TO_PLUGINS[u"vfio-pci"],
+ Constants.NIC_DRIVER_TO_PLUGINS[driver], 1,
+ u"Driver plugin should appear once.", in_filename
+ )
+ out_prolog = replace_defensively(
+ out_prolog, Constants.NIC_DRIVER_TO_VFS[u"vfio-pci"],
+ Constants.NIC_DRIVER_TO_VFS[driver], 1,
+ u"NIC VFs argument should appear once.", in_filename
+ )
+ iface, suite_id, suite_tag = get_iface_and_suite_ids(
+ out_filename
+ )
+ check_suite_tag(suite_tag, out_prolog)
+ # TODO: Reorder loops so suite_id is finalized sooner.
+ testcase = Testcase.default(suite_id)
+ with open(out_filename, u"wt") as file_out:
+ file_out.write(out_prolog)
+ add_default_testcases(
+ testcase, iface, suite_id, file_out, kwargs_list
+ )
+
+
class Regenerator:
"""Class containing file generating methods."""
@@ -564,6 +633,10 @@ class Regenerator:
{u"frame_size": 2048, u"phy_cores": 2}
]
+ device_kwargs_list = [
+ {u"frame_size": min_frame_size, u"phy_cores": 0}
+ ]
+
for in_filename in glob(pattern):
if not self.quiet:
print(
@@ -604,6 +677,8 @@ class Regenerator:
write_tcp_files(in_filename, in_prolog, hoststack_kwargs_list)
elif in_filename.endswith(u"-iperf3-mrr.robot"):
write_iperf3_files(in_filename, in_prolog, iperf3_kwargs_list)
+ elif in_filename.endswith(u"-scapy.robot"):
+ write_device_files(in_filename, in_prolog, device_kwargs_list)
else:
raise RuntimeError(
f"Error in {in_filename}: non-primary suite type found."