Преглед на файлове

utils: include management_dispvm property when checking where VM is used

Fixes QubesOS/qubes-issues#4812
Marek Marczykowski-Górecki преди 5 години
родител
ревизия
2ad9b57961
променени са 2 файла, в които са добавени 7 реда и са изтрити 4 реда
  1. 4 2
      qubesadmin/tests/utils.py
  2. 3 2
      qubesadmin/utils.py

+ 4 - 2
qubesadmin/tests/utils.py

@@ -36,7 +36,8 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase):
             b'sys-firewall class=AppVM state=Running\n'
 
         self.global_properties = ['default_dispvm', 'default_netvm',
-                                  'default_template', 'clockvm', 'updatevm']
+                                  'default_template', 'clockvm', 'updatevm',
+                                  'management_dispvm']
 
         for prop in self.global_properties:
             self.app.expected_calls[
@@ -45,7 +46,8 @@ class TestVMUsage(qubesadmin.tests.QubesTestCase):
 
         self.vms = ['vm1', 'vm2', 'sys-net', 'sys-firewall',
                     'template1', 'template2']
-        self.vm_properties = ['template', 'netvm', 'default_dispvm']
+        self.vm_properties = ['template', 'netvm', 'default_dispvm',
+            'management_dispvm']
 
         for vm in self.vms:
             for prop in self.vm_properties:

+ 3 - 2
qubesadmin/utils.py

@@ -126,13 +126,14 @@ def vm_dependencies(app, reference_vm):
     result = []
 
     global_properties = ['default_dispvm', 'default_netvm',
-                         'default_template', 'clockvm', 'updatevm']
+                         'default_template', 'clockvm', 'updatevm',
+                         'management_dispvm']
 
     for prop in global_properties:
         if reference_vm == getattr(app, prop, None):
             result.append((None, prop))
 
-    vm_properties = ['template', 'netvm', 'default_dispvm']
+    vm_properties = ['template', 'netvm', 'default_dispvm', 'management_dispvm']
 
     for vm in app.domains:
         for prop in vm_properties: