diff options
| -rwxr-xr-x | kud/deployment_infra/playbooks/install_iavf_drivers.sh | 2 | ||||
| -rw-r--r-- | kud/deployment_infra/playbooks/sriov_hardware_check.sh | 10 | ||||
| -rwxr-xr-x | kud/tests/topology-manager.sh | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/kud/deployment_infra/playbooks/install_iavf_drivers.sh b/kud/deployment_infra/playbooks/install_iavf_drivers.sh index 7a54e9f2..dd01b062 100755 --- a/kud/deployment_infra/playbooks/install_iavf_drivers.sh +++ b/kud/deployment_infra/playbooks/install_iavf_drivers.sh @@ -3,7 +3,7 @@ # Based on: # https://gerrit.akraino.org/r/#/c/icn/+/1359/1/deploy/kud-plugin-addons/device-plugins/sriov/driver/install_iavf_drivers.sh -nic_models=(XL710 X722) +nic_models=(X710 XL710 X722) nic_drivers=(i40e) device_checkers=(is_not_used is_driver_match is_model_match) diff --git a/kud/deployment_infra/playbooks/sriov_hardware_check.sh b/kud/deployment_infra/playbooks/sriov_hardware_check.sh index 662c28c8..980fef67 100644 --- a/kud/deployment_infra/playbooks/sriov_hardware_check.sh +++ b/kud/deployment_infra/playbooks/sriov_hardware_check.sh @@ -12,14 +12,8 @@ set -o pipefail source /etc/environment -ethernet_adpator_version=$( lspci | grep "Ethernet Controller XL710" | head -n 1 | cut -d " " -f 8 ) -if [ -z "$ethernet_adpator_version" ]; then - echo "False" - exit 0 -fi -SRIOV_ENABLED=${ethernet_adpator_version:-"false"} -#checking for the right hardware version of NIC on the machine -if [ "$ethernet_adpator_version" == "XL710" ]; then +adaptors="X710 XL710 X722" +if [[ $(lspci | grep -c "Ethernet .* \(${adaptors// /\\|}\)") != "0" ]]; then echo "True" else echo "False" diff --git a/kud/tests/topology-manager.sh b/kud/tests/topology-manager.sh index 7d434386..5c9f900d 100755 --- a/kud/tests/topology-manager.sh +++ b/kud/tests/topology-manager.sh @@ -15,7 +15,8 @@ set -o pipefail source _common.sh source _functions.sh -if [ -z "$( lspci | grep "Ethernet Controller XL710" | head -n 1 | cut -d " " -f 8 )" ]; then +adaptors="X710 XL710 X722" +if [[ $(lspci | grep -c "Ethernet .* \(${adaptors// /\\|}\)") == "0" ]]; then echo "Ethernet adaptor version is not set. Topology manager test case cannot run on this machine" exit 0 else |