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

Name change of vm dependencies helper function

Browse Source 
As per @marmarek's request. Also docstrings.
This commit is contained in:
Marta Marczykowska-Górecka 2018-07-19 20:06:00 +02:00
parent f9564ffa2b
commit ca848ca7bd
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qubesadmin/tests/utils.py
View File

@ -60,25 +60,25 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase):
b'2\0QubesNoSuchPropertyError\0\0invalid property\0' b'2\0QubesNoSuchPropertyError\0\0invalid property\0'
def test_00_only_global(self): def test_00_only_global(self):
result = qubesadmin.utils.vm_usage(self.app, self.app.domains['vm2']) result = qubesadmin.utils.vm_dependencies(self.app, self.app.domains['vm2'])
self.assertListEqual(result, self.assertListEqual(result,
[(None, prop) for prop in self.global_properties], [(None, prop) for prop in self.global_properties],
"Incorrect global properties listed.") "Incorrect global properties listed.")
def test_01_only_vm(self): def test_01_only_vm(self):
result = qubesadmin.utils.vm_usage( result = qubesadmin.utils.vm_dependencies(
self.app, self.app.domains['template1']) self.app, self.app.domains['template1'])
self.assertCountEqual( self.assertSetEqual(
result, set(result),
[(vm, prop) for vm in self.vms for prop in self.vm_properties set([(vm, prop) for vm in self.vms for prop in self.vm_properties
if (not vm.startswith('template') if (not vm.startswith('template')
or not prop.startswith('template'))], or not prop.startswith('template'))]),
"Incorrect VM properties listed.") "Incorrect VM properties listed.")
def test_02_empty(self): def test_02_empty(self):
result = qubesadmin.utils.vm_usage(self.app, self.app.domains['vm1']) result = qubesadmin.utils.vm_dependencies(self.app, self.app.domains['vm1'])
self.assertListEqual(result, [], "Incorrect use found.") self.assertListEqual(result, [], "Incorrect use found.")
@ -86,7 +86,7 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase):
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'admin.property.Get', 'default_dispvm', None)] = b'' ('dom0', 'admin.property.Get', 'default_dispvm', None)] = b''
result = qubesadmin.utils.vm_usage(self.app, self.app.domains['vm1']) result = qubesadmin.utils.vm_dependencies(self.app, self.app.domains['vm1'])
self.assertListEqual(result, [], "Incorrect use found.") self.assertListEqual(result, [], "Incorrect use found.")
@ -99,7 +99,7 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase):
('vm1', 'admin.vm.property.Get', 'netvm', None)] = \ ('vm1', 'admin.vm.property.Get', 'netvm', None)] = \
b'0\x00default=False type=vm sys-net' b'0\x00default=False type=vm sys-net'
result = qubesadmin.utils.vm_usage(self.app, result = qubesadmin.utils.vm_dependencies(self.app,
self.app.domains['sys-net']) self.app.domains['sys-net'])
self.assertListEqual(result, [(self.app.domains['vm1'], 'netvm')]) self.assertListEqual(result, [(self.app.domains['vm1'], 'netvm')])

10
qubesadmin/utils.py
View File

@ -116,12 +116,12 @@ def updates_vms_status(qvm_collection):
return None return None
return status return status
# Helper function that returns a list of all the places a given VM is used in.
# Output is a list of tuples (property_holder, property_name), with None as
# property_holder for global properties
def vm_dependencies(app, reference_vm):
def vm_usage(app, reference_vm): '''Helper function that returns a list of all the places a given VM is used
in. Output is a list of tuples (property_holder, property_name), with None
as property_holder for global properties
'''
result = [] result = []