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

backup: update DispVM template property: template_for_dispvms

Browse Source 
It was renamed from 'dispvm_allowed'.

QubesOS/qubes-issues#3047
This commit is contained in:
Marek Marczykowski-Górecki 2017-10-16 03:20:16 +02:00
parent 001b42f7d8
commit d1eab2d4f5
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesadmin/backup/core2.py
View File

@ -234,7 +234,7 @@ class Core2Qubes(qubesadmin.backup.BackupApp):
vm.name = dispvm_tpl_name vm.name = dispvm_tpl_name
vm.label = 'red' vm.label = 'red'
vm.properties['netvm'] = dispvm_netvm vm.properties['netvm'] = dispvm_netvm
vm.properties['dispvm_allowed'] = True vm.properties['template_for_dispvms'] = True
vm.backup_content = True vm.backup_content = True
vm.backup_path = None vm.backup_path = None
self.domains[vm.name] = vm self.domains[vm.name] = vm

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

@ -375,7 +375,7 @@ parsed_qubes_xml_r2 = {
'label': 'red', 'label': 'red',
'properties': { 'properties': {
'netvm': None, 'netvm': None,
'dispvm_allowed': True, 'template_for_dispvms': True,
}, },
'devices': {}, 'devices': {},
'features': {}, 'features': {},
@ -389,7 +389,7 @@ parsed_qubes_xml_r2 = {
'label': 'red', 'label': 'red',
'properties': { 'properties': {
'netvm': 'test-testproxy', 'netvm': 'test-testproxy',
'dispvm_allowed': True, 'template_for_dispvms': True,
}, },
'devices': {}, 'devices': {},
'features': {}, 'features': {},
@ -518,7 +518,7 @@ parsed_qubes_xml_v4 = {
'klass': 'AppVM', 'klass': 'AppVM',
'label': 'red', 'label': 'red',
'properties': { 'properties': {
'dispvm_allowed': 'True', 'template_for_dispvms': 'True',
'vcpus': '1', 'vcpus': '1',
}, },
'devices': {}, 'devices': {},
@ -534,7 +534,7 @@ parsed_qubes_xml_v4 = {
'label': 'red', 'label': 'red',
'properties': { 'properties': {
'vcpus': '1', 'vcpus': '1',
'dispvm_allowed': 'True', 'template_for_dispvms': 'True',
}, },
'devices': {}, 'devices': {},
'tags': set(), 'tags': set(),

4
qubesadmin/tests/backup/v4-qubes.xml
View File

@ -165,7 +165,7 @@
</domain> </domain>
<domain id="domain-12" class="AppVM"> <domain id="domain-12" class="AppVM">
<properties> <properties>
<property name="dispvm_allowed">True</property> <property name="template_for_dispvms">True</property>
<property name="label">label-1</property> <property name="label">label-1</property>
<property name="name">fedora-25-clone-dvm</property> <property name="name">fedora-25-clone-dvm</property>
<property name="qid">10</property> <property name="qid">10</property>
@ -190,7 +190,7 @@
</domain> </domain>
<domain id="domain-10" class="AppVM"> <domain id="domain-10" class="AppVM">
<properties> <properties>
<property name="dispvm_allowed">True</property> <property name="template_for_dispvms">True</property>
<property name="label">label-1</property> <property name="label">label-1</property>
<property name="name">fedora-25-dvm</property> <property name="name">fedora-25-dvm</property>
<property name="qid">10</property> <property name="qid">10</property>