From d1eab2d4f5333aa58522c6b6c97010d050df7090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 16 Oct 2017 03:20:16 +0200
Subject: [PATCH] backup: update DispVM template property: template_for_dispvms

It was renamed from 'dispvm_allowed'.

QubesOS/qubes-issues#3047
---
 qubesadmin/backup/core2.py                     | 2 +-
 qubesadmin/tests/backup/backupcompatibility.py | 8 ++++----
 qubesadmin/tests/backup/v4-qubes.xml           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/qubesadmin/backup/core2.py b/qubesadmin/backup/core2.py
index 9fae4c0..60291a0 100644
--- a/qubesadmin/backup/core2.py
+++ b/qubesadmin/backup/core2.py
@@ -234,7 +234,7 @@ class Core2Qubes(qubesadmin.backup.BackupApp):
                 vm.name = dispvm_tpl_name
                 vm.label = 'red'
                 vm.properties['netvm'] = dispvm_netvm
-                vm.properties['dispvm_allowed'] = True
+                vm.properties['template_for_dispvms'] = True
                 vm.backup_content = True
                 vm.backup_path = None
                 self.domains[vm.name] = vm
diff --git a/qubesadmin/tests/backup/backupcompatibility.py b/qubesadmin/tests/backup/backupcompatibility.py
index 2c4ca25..eb6da52 100644
--- a/qubesadmin/tests/backup/backupcompatibility.py
+++ b/qubesadmin/tests/backup/backupcompatibility.py
@@ -375,7 +375,7 @@ parsed_qubes_xml_r2 = {
             'label': 'red',
             'properties': {
                 'netvm': None,
-                'dispvm_allowed': True,
+                'template_for_dispvms': True,
             },
             'devices': {},
             'features': {},
@@ -389,7 +389,7 @@ parsed_qubes_xml_r2 = {
             'label': 'red',
             'properties': {
                 'netvm': 'test-testproxy',
-                'dispvm_allowed': True,
+                'template_for_dispvms': True,
             },
             'devices': {},
             'features': {},
@@ -518,7 +518,7 @@ parsed_qubes_xml_v4 = {
             'klass': 'AppVM',
             'label': 'red',
             'properties': {
-                'dispvm_allowed': 'True',
+                'template_for_dispvms': 'True',
                 'vcpus': '1',
             },
             'devices': {},
@@ -534,7 +534,7 @@ parsed_qubes_xml_v4 = {
             'label': 'red',
             'properties': {
                 'vcpus': '1',
-                'dispvm_allowed': 'True',
+                'template_for_dispvms': 'True',
             },
             'devices': {},
             'tags': set(),
diff --git a/qubesadmin/tests/backup/v4-qubes.xml b/qubesadmin/tests/backup/v4-qubes.xml
index c273063..7459e7d 100644
--- a/qubesadmin/tests/backup/v4-qubes.xml
+++ b/qubesadmin/tests/backup/v4-qubes.xml
@@ -165,7 +165,7 @@
     </domain>
     <domain id="domain-12" class="AppVM">
       <properties>
-        <property name="dispvm_allowed">True</property>
+        <property name="template_for_dispvms">True</property>
         <property name="label">label-1</property>
         <property name="name">fedora-25-clone-dvm</property>
         <property name="qid">10</property>
@@ -190,7 +190,7 @@
     </domain>
     <domain id="domain-10" class="AppVM">
       <properties>
-        <property name="dispvm_allowed">True</property>
+        <property name="template_for_dispvms">True</property>
         <property name="label">label-1</property>
         <property name="name">fedora-25-dvm</property>
         <property name="qid">10</property>