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

new device API #274

Open
wants to merge 43 commits into
base: main
Choose a base branch
from
Open

Conversation

piotrbartman
Copy link
Member

@piotrbartman piotrbartman commented Feb 6, 2024

after QubesOS/qubes-core-admin/pull/579

Proposed device events:
sometimes event can be fired twice, we can ignore it
e.g. if device is plugged out and in in short time we can have doubled
detaching and attaching...

  • device-list-changed: device-added -> device-added{devclass}

  • device-list-changed: device-remove -> device-removed{devclass}

  • device-property-changed: property_name: TODO?

  • device-assignment-changed: created -> device-assign:{devclass}

  • device-assignment-changed: removed -> device-unassign:{devclass}

  • device-assignment-changed: attached -> device-attach:{devclass}

  • device-assignment-changed: detached -> device-detach:{devclass}

  • device-assignment-changed: property-set -> device-assignment-changed:{devclass}

QubesOS/qubes-issues#4626

qubesadmin/devices.py Outdated Show resolved Hide resolved
assignment.options = options
vm.devices[args.devclass].assign(assignment)
if vm.is_running() and not assignment.attached:
print("Assigned. Now you can manually attach device or restart domain.")
Copy link
Member

Choose a reason for hiding this comment

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

This (and other below) should respect -q (same below).

Copy link
Member Author

Choose a reason for hiding this comment

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

done

vm.devices[args.devclass].get_assigned_devices()):
vm.devices[args.devclass].unassign(device_assignment)
if device_assignment.attached:
print("Unassigned. Now you can manually detach device "
Copy link
Member

Choose a reason for hiding this comment

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

This (besides -q) should also print which device.

Copy link
Member Author

Choose a reason for hiding this comment

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

done

Comment on lines -306 to -311
# Special treatment for '--list-device-classes' (alias --list-classes)
curr_action = sys.argv[1:]
if set(curr_action).intersection(
{'--list-device-classes', '--list-classes'}):
sys.exit(main(args=['', '--list-device-classes']))

Copy link
Member

Choose a reason for hiding this comment

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

What happened to this one (besides it being already slightly broken due to requiring a device class anyway)?

Copy link
Member Author

Choose a reason for hiding this comment

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

I slightly fix it and now device class is not required :D (see lines 408-411).

@qubesos-bot
Copy link

qubesos-bot commented Mar 29, 2024

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.2&build=2024052012-4.2&flavor=pull-requests

New failures, excluding unstable

Compared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.2&build=2024051522-4.2&flavor=update

  • system_tests_network

    • VmNetworking_fedora-39-xfce: test_010_simple_proxyvm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  • system_tests_pvgrub_salt_storage

    • TC_00_Dom0: test_020_qubes_pillar (failure)
      AssertionError: {'features': {}, 'type': 'app', 'template':[78 char...
  • system_tests_extra

    • TC_00_QVCTest_whonix-workstation-17: test_010_screenshare (failure)
      AssertionError: 15.756737090625162 not less than 2.0
  • system_tests_guivm_gui_interactive

    • guivm_manager: unnamed test (unknown)
    • guivm_manager: Failed (test died)
      # Test died: no candidate needle with tag(s) 'vm-settings-applicati...
  • system_tests_network_ipv6

  • system_tests_basic_vm_qrexec_gui_ext4

    • TC_30_Gui_daemon: test_000_clipboard (failure)
      self.assertEqual(test_string, test_o... AssertionError: 'test22' != ''

Failed tests

12 failures
  • system_tests_network

    • VmNetworking_fedora-39-xfce: test_010_simple_proxyvm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  • system_tests_pvgrub_salt_storage

    • [unstable] TC_41_HVMGrub_fedora-39-xfce: test_000_standalone_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

    • [unstable] TC_41_HVMGrub_fedora-39-xfce: test_010_template_based_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

    • TC_00_Dom0: test_020_qubes_pillar (failure)
      AssertionError: {'features': {}, 'type': 'app', 'template':[78 char...

  • system_tests_splitgpg

  • system_tests_extra

    • [unstable] TC_00_QVCTest_whonix-gateway-17: test_020_webcam (failure)
      AssertionError: 'qubes-video-companion webcam' exited early (0): b'...

    • TC_00_QVCTest_whonix-workstation-17: test_010_screenshare (failure)
      AssertionError: 15.756737090625162 not less than 2.0

    • [unstable] TC_00_QVCTest_whonix-workstation-17: test_020_webcam (failure)
      AssertionError: 'qubes-video-companion screenshare' failed (255): b...

  • system_tests_guivm_gui_interactive

    • guivm_manager: unnamed test (unknown)
    • guivm_manager: Failed (test died)
      # Test died: no candidate needle with tag(s) 'vm-settings-applicati...
  • system_tests_network_ipv6

  • system_tests_basic_vm_qrexec_gui_ext4

    • TC_30_Gui_daemon: test_000_clipboard (failure)
      self.assertEqual(test_string, test_o... AssertionError: 'test22' != ''

Fixed failures

Compared to: https://openqa.qubes-os.org/tests/99767#dependencies

1 fixed
  • system_tests_extra
    • TC_00_QVCTest_fedora-39-xfce: test_010_screenshare (failure)
      AssertionError: 9.245682312951294 not less than 2.0

Unstable tests

  • system_tests_basic_vm_qrexec_gui

    TC_20_AudioVM_Pulse_whonix-workstation-17/test_220_audio_play_pulseaudio (1/5 times with errors)
    • job 99696 AssertionError: too short audio, expected 10s, got 8.54371882086167...
    TC_20_AudioVM_PipeWire_debian-12-xfce/test_250_audio_playback_audiovm_pipewire (1/5 times with errors)
    • job 98601 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_whonix-workstation-17/test_252_audio_playback_audiovm_switch_hvm (1/5 times with errors)
    • job 99742 AssertionError: pacat for test-inst-vm1 (xid 82) running(False) in ...
  • system_tests_network

    VmNetworking_debian-12-xfce/test_010_simple_proxyvm (1/5 times with errors)
    • job 99274 subprocess.CalledProcessError: Command 'qubes.WaitForSession' retur...
  • system_tests_pvgrub_salt_storage

    TC_41_HVMGrub_debian-12-xfce/test_000_standalone_vm (2/5 times with errors)
    • job 99277 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    • job 99754 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    TC_41_HVMGrub_fedora-39-xfce/test_000_standalone_vm (4/5 times with errors)
    • job 98613 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    • job 99277 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    • job 99708 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    • job 99754 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    TC_41_HVMGrub_debian-12-xfce/test_010_template_based_vm (1/5 times with errors)
    • job 99277 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    TC_41_HVMGrub_fedora-39-xfce/test_010_template_based_vm (4/5 times with errors)
    • job 98613 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    • job 99277 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    • job 99708 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
    • job 99754 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  • system_tests_splitgpg

    TC_10_Thunderbird_fedora-39-xfce/test_020_send_receive_inline_with_attachment (1/5 times with errors)
    • job 99710 dogtail.tree.SearchError: child of [desktop frame | main]: "Thunder...
  • system_tests_extra

    TC_00_InputProxy_fedora-39-xfce/test_000_simple_mouse (1/5 times with errors)
    • job 99691 AssertionError: unexpectedly None : Device 'test-inst-input: Test i...
    TC_00_QVCTest_debian-12-xfce/test_010_screenshare (1/5 times with errors)
    • job 99737 AssertionError: 9.793200823132148 not less than 2.0
    TC_00_QVCTest_debian-12-xfce/test_020_webcam (2/5 times with errors)
    • job 99260 self.assertTrue(frame)... AssertionError: b'' is not true
    • job 99691 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
    TC_00_QVCTest_fedora-39-xfce/test_020_webcam (3/5 times with errors)
    • job 99260 self.assertEqual(len(img1), len(img2))... AssertionError: 2359296 != 0
    • job 99691 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
    • job 99737 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
    TC_00_QVCTest_whonix-gateway-17/test_020_webcam (2/5 times with errors)
    • job 99292 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
    • job 99691 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
    TC_00_QVCTest_whonix-workstation-17/test_020_webcam (2/5 times with errors)
    • job 98596 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
    • job 99292 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  • system_tests_qrexec

    TC_00_Qrexec_whonix-gateway-17/test_055_qrexec_dom0_service_abort (1/5 times with errors)
    • job 99755 AssertionError: Timeout, probably stdout wasn't closed
  • system_tests_network_updates

    TC_10_QvmTemplate_debian-12-xfce/test_000_template_list (1/5 times with errors)
    • job 99276 AssertionError: libvirt event impl drain timeout
    TC_10_QvmTemplate_fedora-39-xfce/test_000_template_list (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_10_QvmTemplate_whonix-gateway-17/test_000_template_list (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_11_QvmTemplateMgmtVM_debian-12-xfce/test_000_template_list (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_11_QvmTemplateMgmtVM_fedora-39-xfce/test_000_template_list (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_11_QvmTemplateMgmtVM_whonix-gateway-17/test_000_template_list (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_00_Dom0Upgrade_debian-12-xfce/test_001_update_check (1/5 times with errors)
    • job 99707 self.assertFalse(self.app.domains[... AssertionError: '1' is not false
    TC_00_Dom0Upgrade_fedora-39-xfce/test_001_update_check (1/5 times with errors)
    • job 99707 self.assertFalse(self.app.domains[... AssertionError: '1' is not false
    TC_00_Dom0Upgrade_whonix-gateway-17/test_001_update_check (2/5 times with errors)
    • job 99276 self.assertTrue(self.app.domains[0].... AssertionError: '' is not true
    • job 99707 self.assertFalse(self.app.domains[... AssertionError: '1' is not false
    TC_10_QvmTemplate_debian-12-xfce/test_010_template_install (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_10_QvmTemplate_fedora-39-xfce/test_010_template_install (2/5 times with errors)
    • job 97631 AssertionError: libvirt event impl drain timeout
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_10_QvmTemplate_whonix-gateway-17/test_010_template_install (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_11_QvmTemplateMgmtVM_debian-12-xfce/test_010_template_install (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_11_QvmTemplateMgmtVM_fedora-39-xfce/test_010_template_install (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    TC_11_QvmTemplateMgmtVM_whonix-gateway-17/test_010_template_install (1/5 times with errors)
    • job 99276 ^^^^^^^^^^^^^^^^^^^^^^... AssertionError
    VmUpdates_debian-12-xfce/test_130_no_network_qubes_vm_update (1/5 times with errors)
    • job 99276 AssertionError: qubes-vm-update return unexpected code: 5 in (1, 2)
    VmUpdates_fedora-39-xfce/test_130_no_network_qubes_vm_update (1/5 times with errors)
    • job 99276 AssertionError: qubes-vm-update return unexpected code: 5 in (1, 2)
  • system_tests_dispvm

    TC_20_DispVM_whonix-workstation-17/test_030_edit_file (1/5 times with errors)
    • job 99747 AssertionError: Timeout while waiting for disp[0-9]* window to show
    TC_20_DispVM_fedora-39-xfce/test_100_open_in_dispvm (3/5 times with errors)
    • job 98606 AssertionError: Timeout waiting for editor window
    • job 99270 AssertionError: './open-file test.txt' failed with ./open-file test...
    • job 99293 AssertionError: Timeout waiting for editor window
  • system_tests_basic_vm_qrexec_gui_btrfs

    TC_20_AudioVM_Pulse_whonix-workstation-17-pool/test_220_audio_play_pulseaudio (1/5 times with errors)
    • job 97621 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_whonix-workstation-17-pool/test_222_audio_rec_unmuted_pulseaudio (1/5 times with errors)
    • job 97621 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_debian-12-xfce-pool/test_223_audio_play_hvm (1/5 times with errors)
    • job 97621 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_fedora-39-xfce-pool/test_223_audio_play_hvm (1/5 times with errors)
    • job 97621 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_fedora-39-xfce-pool/test_225_audio_rec_unmuted_hvm (1/5 times with errors)
    • job 97621 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_whonix-workstation-17-pool/test_252_audio_playback_audiovm_switch_hvm (1/5 times with errors)
    • job 99743 AssertionError: pacat for test-inst-vm1 (xid 86) running(False) in ...
  • system_tests_basic_vm_qrexec_gui_xfs

    TC_20_NonAudio_fedora-39-xfce-pool/test_000_start_shutdown (1/5 times with errors)
    • job 99268 raise exceptions.TimeoutError() from exc... TimeoutError
    TC_20_AudioVM_Pulse_fedora-39-xfce-pool/test_220_audio_play_pulseaudio (1/5 times with errors)
    • job 99268 raise exceptions.TimeoutError() from exc... TimeoutError
    TC_20_AudioVM_Pulse_debian-12-xfce-pool/test_223_audio_play_hvm (1/5 times with errors)
    • job 99268 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_whonix-workstation-17-pool/test_252_audio_playback_audiovm_switch_hvm (1/5 times with errors)
    • job 99745 AssertionError: pacat for test-inst-vm1 (xid 86) running(False) in ...
  • system_tests_basic_vm_qrexec_gui@hw1

    TC_20_AudioVM_Pulse_whonix-workstation-17/test_220_audio_play_pulseaudio (1/5 times with errors)
    • job 99696 AssertionError: too short audio, expected 10s, got 8.54371882086167...
    TC_20_AudioVM_PipeWire_debian-12-xfce/test_250_audio_playback_audiovm_pipewire (1/5 times with errors)
    • job 98601 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_whonix-workstation-17/test_252_audio_playback_audiovm_switch_hvm (1/5 times with errors)
    • job 99742 AssertionError: pacat for test-inst-vm1 (xid 82) running(False) in ...
  • system_tests_usbproxy

    TC_20_USBProxy_core3_whonix-gateway-17/test_070_attach_not_installed_front (1/5 times with errors)
    • job 99730 qubesusbproxy.core3ext.QubesUSBException: Device attach failed: 202...
    TC_20_USBProxy_core3_whonix-workstation-17/test_070_attach_not_installed_front (1/5 times with errors)
    • job 98333 qubesusbproxy.core3ext.QubesUSBException: Device attach failed: 202...
    TC_20_USBProxy_core3_debian-12-xfce/test_090_attach_stubdom (1/5 times with errors)
    • job 98333 AssertionError: 1 != 0 : Device connection failed
    TC_20_USBProxy_core3_fedora-39-xfce/test_090_attach_stubdom (1/5 times with errors)
    • job 98333 AssertionError: 1 != 0 : Device connection failed
  • system_tests_basic_vm_qrexec_gui_zfs

    TC_20_AudioVM_Pulse_debian-12-xfce-pool/test_223_audio_play_hvm (2/5 times with errors)
    • job 98335 AssertionError: only silence detected, no useful audio data
    • job 99686 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_fedora-39-xfce-pool/test_223_audio_play_hvm (1/5 times with errors)
    • job 98335 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_fedora-39-xfce-pool/test_225_audio_rec_unmuted_hvm (1/5 times with errors)
    • job 98335 AssertionError: only silence detected, no useful audio data
    TC_20_AudioVM_Pulse_whonix-workstation-17-pool/test_252_audio_playback_audiovm_switch_hvm (1/5 times with errors)
    • job 99758 AssertionError: pacat for test-inst-vm1 (xid 86) running(False) in ...
  • system_tests_basic_vm_qrexec_gui_ext4

    TC_20_AudioVM_Pulse_whonix-workstation-17-pool/test_252_audio_playback_audiovm_switch_hvm (1/4 times with errors)
    • job 99744 AssertionError: pacat for test-inst-vm1 (xid 85) running(False) in ...

@piotrbartman piotrbartman marked this pull request as ready for review April 10, 2024 03:53
@marmarek
Copy link
Member

Starting a qube with CDROM seems to be broken: https://openqa.qubes-os.org/tests/96799#step/TC_00_Basic/4

@marmarek
Copy link
Member

And also, unit tests need an update (and also pylint is unhappy)

@marmarek
Copy link
Member

I keep device_protocol.py review in QubesOS/qubes-core-admin#579, other changes here looks okay (but I haven't tested the most recent version here yet).

@marmarek
Copy link
Member

marmarek commented May 1, 2024

qvm-start --cdrom still is not happy:

Traceback (most recent call last):
  File "/usr/lib64/python3.11/contextlib.py", line 81, in inner
    return func(*args, **kwds)
           ^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.11/site-packages/qubes/tests/integ/basic.py", line 105, in test_120_start_standalone_with_cdrom_dom0
    self.assertEqual(p.returncode, 0, stdout)
AssertionError: 1 != 0 : b'Can not remove an required assignment from a non halted qube.\n'

See also updated comment from the today's test run, most failures looks to be related to the devices API rework (but some are probably "just" tests to be updated).

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