diff --git a/test/scenarios-bootc/presubmits/cos9-src@multi-nic.sh b/test/scenarios-bootc/presubmits/cos9-src@multi-nic.sh index a27828191f8..4eb203517fd 100644 --- a/test/scenarios-bootc/presubmits/cos9-src@multi-nic.sh +++ b/test/scenarios-bootc/presubmits/cos9-src@multi-nic.sh @@ -15,9 +15,13 @@ scenario_run_tests() { local -r vmname=$(full_vm_name host1) local -r vm_ip1=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | head -1) local -r vm_ip2=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | tail -1) + local -r nic1_name=$(run_command_on_vm host1 nmcli -f name,type connection | awk '$2 == "ethernet" {print $1}' | sort | head -1) + local -r nic2_name=$(run_command_on_vm host1 nmcli -f name,type connection | awk '$2 == "ethernet" {print $1}' | sort | tail -1) run_tests host1 \ --variable "USHIFT_HOST_IP1:${vm_ip1}" \ --variable "USHIFT_HOST_IP2:${vm_ip2}" \ + --variable "NIC1_NAME:${nic1_name}" \ + --variable "NIC2_NAME:${nic2_name}" \ suites/network/multi-nic.robot } diff --git a/test/scenarios-bootc/presubmits/el94-src@multi-nic.sh b/test/scenarios-bootc/presubmits/el94-src@multi-nic.sh index 097da6b129f..8971eb06c66 100644 --- a/test/scenarios-bootc/presubmits/el94-src@multi-nic.sh +++ b/test/scenarios-bootc/presubmits/el94-src@multi-nic.sh @@ -15,9 +15,13 @@ scenario_run_tests() { local -r vmname=$(full_vm_name host1) local -r vm_ip1=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | head -1) local -r vm_ip2=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | tail -1) + local -r nic1_name=$(run_command_on_vm host1 nmcli -f name,type connection | awk '$2 == "ethernet" {print $1}' | sort | head -1) + local -r nic2_name=$(run_command_on_vm host1 nmcli -f name,type connection | awk '$2 == "ethernet" {print $1}' | sort | tail -1) run_tests host1 \ --variable "USHIFT_HOST_IP1:${vm_ip1}" \ --variable "USHIFT_HOST_IP2:${vm_ip2}" \ + --variable "NIC1_NAME:${nic1_name}" \ + --variable "NIC2_NAME:${nic2_name}" \ suites/network/multi-nic.robot } diff --git a/test/scenarios/presubmits/el94-src@multi-nic.sh b/test/scenarios/presubmits/el94-src@multi-nic.sh index 086e68f384d..d94a87457ff 100644 --- a/test/scenarios/presubmits/el94-src@multi-nic.sh +++ b/test/scenarios/presubmits/el94-src@multi-nic.sh @@ -16,9 +16,13 @@ scenario_run_tests() { local -r vmname=$(full_vm_name host1) local -r vm_ip1=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | head -1) local -r vm_ip2=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | tail -1) + local -r nic1_name=$(run_command_on_vm host1 nmcli -f name,type connection | awk '$2 == "ethernet" {print $1}' | sort | head -1) + local -r nic2_name=$(run_command_on_vm host1 nmcli -f name,type connection | awk '$2 == "ethernet" {print $1}' | sort | tail -1) run_tests host1 \ --variable "USHIFT_HOST_IP1:${vm_ip1}" \ --variable "USHIFT_HOST_IP2:${vm_ip2}" \ + --variable "NIC1_NAME:${nic1_name}" \ + --variable "NIC2_NAME:${nic2_name}" \ suites/network/multi-nic.robot } diff --git a/test/suites/network/multi-nic.robot b/test/suites/network/multi-nic.robot index ae626881759..1bbfdcaf7ea 100644 --- a/test/suites/network/multi-nic.robot +++ b/test/suites/network/multi-nic.robot @@ -21,7 +21,7 @@ ${USHIFT_HOST_IP2} ${EMPTY} ${NIC1_NAME} ${EMPTY} ${NIC2_NAME} ${EMPTY} ${NICS_COUNT} 2 -${NMCLI_CMD} nmcli -f name,type connection | awk '$2 == "ethernet" {print $1}' | sort +${NMCLI_CMD} nmcli connection | grep ethernet ${OSSL_CMD} openssl x509 -text -noout -in ${CERT_FILE} /var/lib/microshift/certs/kube-apiserver-external-signer/kube-external-serving/server.crt ${GREP_SUBJ_IPS} grep -A1 'Subject Alternative Name:' | tail -1 @@ -105,7 +105,7 @@ Verify Multiple NICs ... ${NMCLI_CMD} | wc -l ... return_stdout=True return_stderr=True return_rc=True Should Be Equal As Integers ${rc} 0 - Should Be Equal As Strings ${stdout} ${NICS_COUNT} + Should Be True '${stdout}'>='${NICS_COUNT}' Initialize Global Variables [Documentation] Initializes global variables. @@ -113,29 +113,15 @@ Initialize Global Variables Log Host: ${USHIFT_HOST_IP1} ${USHIFT_HOST_IP2} Should Not Be Empty ${USHIFT_HOST_IP1} USHIFT_HOST_IP1 variable is required Should Not Be Empty ${USHIFT_HOST_IP2} USHIFT_HOST_IP2 variable is required - Initialize Nmcli Variables - -Initialize Nmcli Variables - [Documentation] Initialize the variables on the host - - ${stdout} ${stderr} ${rc}= Execute Command - ... ${NMCLI_CMD} | head -1 - ... return_stdout=True return_stderr=True return_rc=True - Should Be Equal As Integers ${rc} 0 - Set Suite Variable \${NIC1_NAME} ${stdout} - - ${stdout} ${stderr} ${rc}= Execute Command - ... ${NMCLI_CMD} | tail -1 - ... return_stdout=True return_stderr=True return_rc=True - Should Be Equal As Integers ${rc} 0 - Set Suite Variable \${NIC2_NAME} ${stdout} + Should Not Be Empty ${NIC1_NAME} NIC1_NAME variable is required + Should Not Be Empty ${NIC2_NAME} NIC2_NAME variable is required Disable Interface [Documentation] Disable NIC given in ${conn_name}. Change is not persistent. On ... the next reboot the interface will have its original status again. [Arguments] ${conn_name} ${stderr} ${rc}= Execute Command - ... nmcli connection down ${conn_name} + ... nmcli connection down "${conn_name}" ... sudo=True return_stdout=False return_stderr=True return_rc=True Should Be Equal As Integers ${rc} 0