Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sriov: fix ipxe rom file issue #6081

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

meinaLi
Copy link
Contributor

@meinaLi meinaLi commented Dec 20, 2024

Relying on ipxe build in tests when cannot obtain VF pxe rom file is an unstable testing method. Because this case is mainly to test the xml but not the pxe function. So we decided to use the fixed virtio rom file to test.
The error message:
This test needs rom file: /usr/share/ipxe/8086154c.rom.

Relying on ipxe build in tests when cannot obtain VF pxe rom file is an unstable testing method. Because this case is mainly to test the xml but not the pxe function. So we decided to use the fixed virtio rom file to test.

Signed-off-by: Meina Li <[email protected]>
@meinaLi
Copy link
Contributor Author

meinaLi commented Dec 20, 2024

# avocado run --vt-type libvirt --vt-omit-data-loss --vt-machine-type q35 sriov.plug_unplug.attach_detach_device_special_situations.hostdev_interface.boot_order
JOB ID     : efbf93c082fc02489922db31020f522e0ba92df0
JOB LOG    : /var/log/avocado/job-results/job-2024-12-19T21.52-efbf93c/job.log
 (1/1) type_specific.io-github-autotest-libvirt.sriov.plug_unplug.attach_detach_device_special_situations.hostdev_interface.boot_order: STARTED
 (1/1) type_specific.io-github-autotest-libvirt.sriov.plug_unplug.attach_detach_device_special_situations.hostdev_interface.boot_order: PASS (71.52 s)
RESULTS    : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0
JOB HTML   : /var/log/avocado/job-results/job-2024-12-19T21.52-efbf93c/results.html
JOB TIME   : 73.61 s

Comment on lines +261 to +262
# Directly use virtio rom file because it mainly test xml but not pxe function.
rom_file = "/usr/share/ipxe/1af41000.rom"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can use a more direct variable name instead of commenting here.

Suggested change
# Directly use virtio rom file because it mainly test xml but not pxe function.
rom_file = "/usr/share/ipxe/1af41000.rom"
virtio_rom_file = "/usr/share/ipxe/1af41000.rom"
if not os.path.exists(virtio_rom_file):
self.test.error(f"This test needs a rom file, but neither {virtio_rom_file} or {rom_file} exist!")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the end of this function, we nee to return rom_file to use in calling function. So virtio_rom_file is not suitable here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, of course you can return virtio_rom_file if it exists.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants