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

api/admin: include 'revisions_to_keep' and 'is_outdated' in volume info

Browse Source 
Since Volume.is_outdated() is a method, not a property, add a function
for handling serialization. And at the same time, fix None serialization
(applicable to 'source' property).

QubesOS/qubes-issues#3256
This commit is contained in:
Marek Marczykowski-Górecki 2018-03-18 21:45:43 +01:00
parent e2b70306e5
commit 2a962c54db
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/api/admin.py
View File

@ -336,9 +336,16 @@ class QubesAdminAPI(qubes.api.AbstractQubesAPI):
# properties defined in API # properties defined in API
volume_properties = [ volume_properties = [
'pool', 'vid', 'size', 'usage', 'rw', 'source', 'pool', 'vid', 'size', 'usage', 'rw', 'source',
'save_on_stop', 'snap_on_start'] 'save_on_stop', 'snap_on_start', 'revisions_to_keep', 'is_outdated']
return ''.join('{}={}\n'.format(key, getattr(volume, key)) for key in
volume_properties) def _serialize(value):
if callable(value):
value = value()
if value is None:
value = ''
return str(value)
return ''.join('{}={}\n'.format(key, _serialize(getattr(volume, key)))
for key in volume_properties)
@qubes.api.method('admin.vm.volume.ListSnapshots', no_payload=True, @qubes.api.method('admin.vm.volume.ListSnapshots', no_payload=True,
scope='local', read=True) scope='local', read=True)

2
qubes/tests/api_admin.py
View File

@ -40,7 +40,7 @@ import qubes.storage
# properties defined in API # properties defined in API
volume_properties = [ volume_properties = [
'pool', 'vid', 'size', 'usage', 'rw', 'source', 'pool', 'vid', 'size', 'usage', 'rw', 'source',
'save_on_stop', 'snap_on_start'] 'save_on_stop', 'snap_on_start', 'revisions_to_keep', 'is_outdated']
class AdminAPITestCase(qubes.tests.QubesTestCase): class AdminAPITestCase(qubes.tests.QubesTestCase):