Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support for AudioVM

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-11-17 18:23:15 +01:00
parent a1ddbb054f
commit 6d9e5bbf07
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubesadmin/tests/utils.py
View File

@ -36,8 +36,9 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase):
b'sys-firewall class=AppVM state=Running\n' b'sys-firewall class=AppVM state=Running\n'
self.global_properties = ['default_dispvm', 'default_netvm', self.global_properties = ['default_dispvm', 'default_netvm',
'default_guivm', 'default_template', 'default_guivm', 'default_audiovm',
'clockvm', 'updatevm', 'management_dispvm'] 'default_template', 'clockvm', 'updatevm',
'management_dispvm']
for prop in self.global_properties: for prop in self.global_properties:
self.app.expected_calls[ self.app.expected_calls[
@ -47,8 +48,8 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase):
self.vms = ['vm1', 'vm2', 'sys-net', 'sys-firewall', self.vms = ['vm1', 'vm2', 'sys-net', 'sys-firewall',
'template1', 'template2'] 'template1', 'template2']
self.vm_properties = ['template', 'netvm', 'guivm', 'default_dispvm', self.vm_properties = ['template', 'netvm', 'guivm', 'audiovm',
'management_dispvm'] 'default_dispvm', 'management_dispvm']
for vm in self.vms: for vm in self.vms:
for prop in self.vm_properties: for prop in self.vm_properties:

2
qubesadmin/tools/qvm_prefs.py
View File

@ -118,7 +118,7 @@ def process_actions(parser, args, target):
if args.value is not None: if args.value is not None:
if str(args.value).lower() == "none": if str(args.value).lower() == "none":
if args.property in ["default_dispvm", "netvm", "template", if args.property in ["default_dispvm", "netvm", "template",
"guivm"]: "guivm", "audiovm"]:
args.value = '' args.value = ''
try: try:
setattr(target, args.property, args.value) setattr(target, args.property, args.value)

6
qubesadmin/utils.py
View File

@ -128,14 +128,14 @@ def vm_dependencies(app, reference_vm):
result = [] result = []
global_properties = ['default_dispvm', 'default_netvm', 'default_guivm', global_properties = ['default_dispvm', 'default_netvm', 'default_guivm',
'default_template', 'clockvm', 'updatevm', 'default_audiovm', 'default_template', 'clockvm',
'management_dispvm'] 'updatevm', 'management_dispvm']
for prop in global_properties: for prop in global_properties:
if reference_vm == getattr(app, prop, None): if reference_vm == getattr(app, prop, None):
result.append((None, prop)) result.append((None, prop))
vm_properties = ['template', 'netvm', 'guivm', vm_properties = ['template', 'netvm', 'guivm', 'audiovm',
'default_dispvm', 'management_dispvm'] 'default_dispvm', 'management_dispvm']
for vm in app.domains: for vm in app.domains: