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

Merge remote-tracking branch 'origin/release4.0'

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2018-12-04 16:03:33 +01:00
commit eee9964b11
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubes/app.py
View File

@ -692,6 +692,10 @@ class Qubes(qubes.PropertyHolder):
default=None,
doc='Default DispVM base for service calls', allow_none=True)
management_dispvm = qubes.VMProperty('management_dispvm', load_stage=3,
default=None,
doc='Default DispVM base for managing VMs', allow_none=True)
default_pool = qubes.property('default_pool', load_stage=3,
default=_default_pool,
setter=_setter_pool,

30
qubes/tests/vm/qubesvm.py
View File

@ -498,6 +498,36 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
'qubes-vm@{}.service'.format(vm.name)),
"systemd service not disabled by resetting autostart")
def test_290_management_dispvm(self):
vm = self.get_vm()
vm2 = self.get_vm('test2', qid=2)
self.app.management_dispvm = None
self.assertPropertyDefaultValue(vm, 'management_dispvm', None)
self.app.management_dispvm = vm
try:
self.assertPropertyDefaultValue(vm, 'management_dispvm', vm)
self.assertPropertyValue(vm, 'management_dispvm',
'test-inst-test2', vm2)
finally:
self.app.management_dispvm = None
def test_291_management_dispvm_template_based(self):
tpl = self.get_vm(name='tpl', cls=qubes.vm.templatevm.TemplateVM)
vm = self.get_vm(cls=qubes.vm.appvm.AppVM, template=tpl, qid=2)
vm2 = self.get_vm('test2', qid=3)
del vm.volumes
self.app.management_dispvm = None
try:
self.assertPropertyDefaultValue(vm, 'management_dispvm', None)
self.app.management_dispvm = vm
self.assertPropertyDefaultValue(vm, 'management_dispvm', vm)
tpl.management_dispvm = vm2
self.assertPropertyDefaultValue(vm, 'management_dispvm', vm2)
self.assertPropertyValue(vm, 'management_dispvm',
'test-inst-test2', vm2)
finally:
self.app.management_dispvm = None
@unittest.skip('TODO')
def test_320_seamless_gui_mode(self):
vm = self.get_vm()

7
qubes/vm/qubesvm.py
View File

@ -554,6 +554,13 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
default=(lambda self: self.app.default_dispvm),
doc='Default VM to be used as Disposable VM for service calls.')
management_dispvm = qubes.VMProperty('management_dispvm',
load_stage=4,
allow_none=True,
default=_default_with_template('management_dispvm',
(lambda self: self.app.management_dispvm)),
doc='Default DVM template for Disposable VM for managing this VM.')
updateable = qubes.property('updateable',
default=(lambda self: not hasattr(self, 'template')),
type=bool,

2
version
View File

@ -1 +1 @@
4.0.35
4.0.36