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

backup: change 'hvm' property to 'virt_mode'

Browse Source 
QubesOS/qubes-issues#2912
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-17 20:40:08 +02:00
parent ced735b476
commit 96d4a2f066
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

@ -289,7 +289,7 @@ class Core2Qubes(qubesadmin.backup.BackupApp):
if value_is_default and value_is_default.lower() != \ if value_is_default and value_is_default.lower() != \
"true": "true":
vm.properties[attr] = value vm.properties[attr] = value
vm.properties['hvm'] = "HVm" in vm_class_name vm.properties['virt_mode'] = 'hvm' if "HVm" in vm_class_name else 'pv'
if vm_class_name in ('QubesNetVm', 'QubesProxyVm'): if vm_class_name in ('QubesNetVm', 'QubesProxyVm'):
vm.properties['provides_network'] = True vm.properties['provides_network'] = True
if vm_class_name == 'QubesNetVm': if vm_class_name == 'QubesNetVm':

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

@ -154,7 +154,7 @@ parsed_qubes_xml_r2 = {
'klass': 'TemplateVM', 'klass': 'TemplateVM',
'label': 'black', 'label': 'black',
'properties': { 'properties': {
'hvm': False, 'virt_mode': 'pv',
'maxmem': '1535', 'maxmem': '1535',
}, },
'devices': {}, 'devices': {},
@ -168,7 +168,7 @@ parsed_qubes_xml_r2 = {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'red', 'label': 'red',
'properties': { 'properties': {
'hvm': False, 'virt_mode': 'pv',
'maxmem': '1535', 'maxmem': '1535',
'memory': '200', 'memory': '200',
'netvm': None, 'netvm': None,
@ -193,7 +193,7 @@ parsed_qubes_xml_r2 = {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'green', 'label': 'green',
'properties': { 'properties': {
'hvm': False, 'virt_mode': 'pv',
'maxmem': '1535', 'maxmem': '1535',
'memory': '200', 'memory': '200',
'provides_network': True 'provides_network': True
@ -209,7 +209,7 @@ parsed_qubes_xml_r2 = {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'gray', 'label': 'gray',
'properties': { 'properties': {
'hvm': False, 'virt_mode': 'pv',
'maxmem': '1535', 'maxmem': '1535',
'vcpus': '1' 'vcpus': '1'
}, },
@ -224,7 +224,7 @@ parsed_qubes_xml_r2 = {
'banking': { 'banking': {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'green', 'label': 'green',
'properties': {'hvm': False, 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'services.meminfo-writer': True},
@ -235,7 +235,7 @@ parsed_qubes_xml_r2 = {
'personal': { 'personal': {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'yellow', 'label': 'yellow',
'properties': {'hvm': False, 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'services.meminfo-writer': True},
@ -247,7 +247,7 @@ parsed_qubes_xml_r2 = {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'red', 'label': 'red',
'properties': { 'properties': {
'hvm': False, 'virt_mode': 'pv',
'maxmem': '1535', 'maxmem': '1535',
'netvm': 'test-testproxy', 'netvm': 'test-testproxy',
'default_dispvm': 'disp-test-testproxy', 'default_dispvm': 'disp-test-testproxy',
@ -263,7 +263,7 @@ parsed_qubes_xml_r2 = {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'red', 'label': 'red',
'properties': { 'properties': {
'hvm': False, 'virt_mode': 'pv',
'maxmem': '1535', 'maxmem': '1535',
'memory': '200', 'memory': '200',
'provides_network': True}, 'provides_network': True},
@ -278,7 +278,7 @@ parsed_qubes_xml_r2 = {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'red', 'label': 'red',
'properties': { 'properties': {
'hvm': False, 'virt_mode': 'pv',
'maxmem': '1535', 'maxmem': '1535',
'memory': '200', 'memory': '200',
'provides_network': True}, 'provides_network': True},
@ -292,7 +292,7 @@ parsed_qubes_xml_r2 = {
'test-testhvm': { 'test-testhvm': {
'klass': 'StandaloneVM', 'klass': 'StandaloneVM',
'label': 'purple', 'label': 'purple',
'properties': {'hvm': True, 'memory': '512'}, 'properties': {'virt_mode': 'hvm', 'memory': '512'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': False}, 'features': {'services.meminfo-writer': False},
@ -304,7 +304,7 @@ parsed_qubes_xml_r2 = {
'test-work': { 'test-work': {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'green', 'label': 'green',
'properties': {'hvm': False, 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'services.meminfo-writer': True},
@ -315,7 +315,7 @@ parsed_qubes_xml_r2 = {
'test-template-clone': { 'test-template-clone': {
'klass': 'TemplateVM', 'klass': 'TemplateVM',
'label': 'green', 'label': 'green',
'properties': {'hvm': False, 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'services.meminfo-writer': True},
@ -326,7 +326,7 @@ parsed_qubes_xml_r2 = {
'test-custom-template-appvm': { 'test-custom-template-appvm': {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'yellow', 'label': 'yellow',
'properties': {'hvm': False, 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'services.meminfo-writer': True},
@ -337,7 +337,7 @@ parsed_qubes_xml_r2 = {
'test-standalonevm': { 'test-standalonevm': {
'klass': 'StandaloneVM', 'klass': 'StandaloneVM',
'label': 'blue', 'label': 'blue',
'properties': {'hvm': False, 'maxmem': '1535'}, 'properties': {'virt_mode': 'pv', 'maxmem': '1535'},
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),
'features': {'services.meminfo-writer': True}, 'features': {'services.meminfo-writer': True},
@ -349,7 +349,7 @@ parsed_qubes_xml_r2 = {
'test-net': { 'test-net': {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'red', 'label': 'red',
'properties': {'hvm': False, 'properties': {'virt_mode': 'pv',
'maxmem': '1535', 'maxmem': '1535',
'memory': '200', 'memory': '200',
'netvm': None, 'netvm': None,