From cbb459aa51ef6e7fb0584bc2cd5a6a7621d7b4c2 Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 8 Sep 2023 12:04:23 +0000 Subject: feat(infra): Add 1n_spr Signed-off-by: pmikus Change-Id: I20e720302561f5f7d1f7a80a83548077a88025af --- resources/libraries/bash/function/common.sh | 10 +++++++--- resources/libraries/bash/function/device.sh | 10 +++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'resources/libraries') diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index b209958194..e0ae3f2fce 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -45,7 +45,7 @@ function activate_docker_topology () { device_image="$(< ${CSIT_DIR}/${IMAGE_VER_FILE})" case_text="${NODENESS}_${FLAVOR}" case "${case_text}" in - "1n_skx" | "1n_tx2") + "1n_skx" | "1n_tx2" | "1n_spr") # We execute reservation over csit-shim-dcr (ssh) which runs sourced # script's functions. Env variables are read from ssh output # back to localhost for further processing. @@ -316,7 +316,7 @@ function deactivate_docker_topology () { case_text="${NODENESS}_${FLAVOR}" case "${case_text}" in - "1n_skx" | "1n_tx2") + "1n_skx" | "1n_tx2" | "1n_spr") ssh="ssh root@172.17.0.1 -p 6022" env_vars=$(env | grep CSIT_ | tr '\n' ' ' ) || die # The "declare -f" output is long and boring. @@ -436,6 +436,10 @@ function get_test_code () { NODENESS="1n" FLAVOR="skx" ;; + *"1n-spr"*) + NODENESS="1n" + FLAVOR="spr" + ;; *"1n-tx2"*) NODENESS="1n" FLAVOR="tx2" @@ -1133,7 +1137,7 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - "1n_skx" | "1n_tx2") + "1n_skx" | "1n_tx2" | "1n_spr") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh index c9ebc46a13..b92a84ddce 100644 --- a/resources/libraries/bash/function/device.sh +++ b/resources/libraries/bash/function/device.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2023 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: @@ -320,6 +320,14 @@ function get_available_interfaces () { dut1_netdev=(enp145) ports_per_nic=2 ;; + "1n_spr") + # Add Intel Corporation E810 Virtual Function to the + # whitelist. + pci_id="0x1889" + tg_netdev=(ens2) + dut1_netdev=(ens4) + ports_per_nic=1 + ;; "1n_vbox") # Add Intel Corporation 82545EM Gigabit Ethernet Controller to the # whitelist. -- cgit 1.2.3-korg