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

backup: fix name of meminfo-writer feature

Browse Source 
It's 'service.meminfo-writer'.
This commit is contained in:
Marek Marczykowski-Górecki 2017-10-16 03:19:36 +02:00
parent cbdc2170b4
commit 001b42f7d8
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesadmin/backup/core2.py
View File

@ -31,7 +31,7 @@ import qubesadmin.backup
service_to_feature = { service_to_feature = {
'ntpd': 'service.ntpd', 'ntpd': 'service.ntpd',
'qubes-update-check': 'check-updates', 'qubes-update-check': 'check-updates',
'meminfo-writer': 'services.meminfo-writer', 'meminfo-writer': 'service.meminfo-writer',
} }
class Core2VM(qubesadmin.backup.BackupVM): class Core2VM(qubesadmin.backup.BackupVM):

30
qubesadmin/tests/backup/backupcompatibility.py
View File

@ -159,7 +159,7 @@ parsed_qubes_xml_r2 = {
}, },
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': None, 'template': None,
'backup_path': None, 'backup_path': None,
'included_in_backup': False, 'included_in_backup': False,
@ -183,7 +183,7 @@ parsed_qubes_xml_r2 = {
'tags': set(), 'tags': set(),
'features': { 'features': {
'service.ntpd': False, 'service.ntpd': False,
'services.meminfo-writer': False 'service.meminfo-writer': False
}, },
'template': 'fedora-20-x64', 'template': 'fedora-20-x64',
'backup_path': None, 'backup_path': None,
@ -200,7 +200,7 @@ parsed_qubes_xml_r2 = {
}, },
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': 'fedora-20-x64', 'template': 'fedora-20-x64',
'backup_path': None, 'backup_path': None,
'included_in_backup': False, 'included_in_backup': False,
@ -216,7 +216,7 @@ parsed_qubes_xml_r2 = {
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': { 'features': {
'internal': True, 'services.meminfo-writer': True}, 'internal': True, 'service.meminfo-writer': True},
'template': 'fedora-20-x64', 'template': 'fedora-20-x64',
'backup_path': None, 'backup_path': None,
'included_in_backup': False, 'included_in_backup': False,
@ -227,7 +227,7 @@ parsed_qubes_xml_r2 = {
'properties': {'virt_mode': 'pv', 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': 'fedora-20-x64', 'template': 'fedora-20-x64',
'backup_path': None, 'backup_path': None,
'included_in_backup': False, 'included_in_backup': False,
@ -238,7 +238,7 @@ parsed_qubes_xml_r2 = {
'properties': {'virt_mode': 'pv', 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': 'fedora-20-x64', 'template': 'fedora-20-x64',
'backup_path': None, 'backup_path': None,
'included_in_backup': False, 'included_in_backup': False,
@ -254,7 +254,7 @@ parsed_qubes_xml_r2 = {
}, },
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': 'fedora-20-x64', 'template': 'fedora-20-x64',
'backup_path': None, 'backup_path': None,
'included_in_backup': False, 'included_in_backup': False,
@ -269,7 +269,7 @@ parsed_qubes_xml_r2 = {
'provides_network': True}, 'provides_network': True},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': 'test-template-clone', 'template': 'test-template-clone',
'backup_path': None, 'backup_path': None,
'included_in_backup': False, 'included_in_backup': False,
@ -284,7 +284,7 @@ parsed_qubes_xml_r2 = {
'provides_network': True}, 'provides_network': True},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': 'fedora-20-x64', 'template': 'fedora-20-x64',
'backup_path': 'servicevms/test-testproxy', 'backup_path': 'servicevms/test-testproxy',
'included_in_backup': True, 'included_in_backup': True,
@ -295,7 +295,7 @@ parsed_qubes_xml_r2 = {
'properties': {'virt_mode': 'hvm', 'memory': '512'}, 'properties': {'virt_mode': 'hvm', 'memory': '512'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': False}, 'features': {'service.meminfo-writer': False},
'template': None, 'template': None,
'backup_path': 'appvms/test-testhvm', 'backup_path': 'appvms/test-testhvm',
'included_in_backup': True, 'included_in_backup': True,
@ -307,7 +307,7 @@ parsed_qubes_xml_r2 = {
'properties': {'virt_mode': 'pv', 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': 'fedora-20-x64', 'template': 'fedora-20-x64',
'backup_path': 'appvms/test-work', 'backup_path': 'appvms/test-work',
'included_in_backup': True, 'included_in_backup': True,
@ -318,7 +318,7 @@ parsed_qubes_xml_r2 = {
'properties': {'virt_mode': 'pv', 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': None, 'template': None,
'backup_path': 'vm-templates/test-template-clone', 'backup_path': 'vm-templates/test-template-clone',
'included_in_backup': True, 'included_in_backup': True,
@ -329,7 +329,7 @@ parsed_qubes_xml_r2 = {
'properties': {'virt_mode': 'pv', 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': 'test-template-clone', 'template': 'test-template-clone',
'backup_path': 'appvms/test-custom-template-appvm', 'backup_path': 'appvms/test-custom-template-appvm',
'included_in_backup': True, 'included_in_backup': True,
@ -340,7 +340,7 @@ parsed_qubes_xml_r2 = {
'properties': {'virt_mode': 'pv', 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'service.meminfo-writer': True},
'template': None, 'template': None,
'backup_path': 'appvms/test-standalonevm', 'backup_path': 'appvms/test-standalonevm',
'included_in_backup': True, 'included_in_backup': True,
@ -364,7 +364,7 @@ parsed_qubes_xml_r2 = {
'tags': set(), 'tags': set(),
'features': { 'features': {
'service.ntpd': False, 'service.ntpd': False,
'services.meminfo-writer': False 'service.meminfo-writer': False
}, },
'template': 'fedora-20-x64', 'template': 'fedora-20-x64',
'backup_path': 'servicevms/test-net', 'backup_path': 'servicevms/test-net',