Use admin utils wrapper for vm actions

Author: ben-grande

qui/updater/summary_page.py

@@ -296,55 +296,54 @@ def perform_restart(self):
 
         # clear err and perform shutdown/start
         self.err = ""
-        self.shutdown_domains(tmpls_to_shutdown)
-        self.restart_vms(to_restart)
-        self.shutdown_domains(to_shutdown)
+        try:
+            loop = asyncio.get_event_loop()
+        except RuntimeError:
+            # changes between GLib versions and python versions mean that the above
+            # can fail on some dom0/gui domain configurations
+            loop = asyncio.new_event_loop()
+        loop.run_until_complete(self.shutdown_domains(tmpls_to_shutdown))
+        loop.run_until_complete(self.restart_vms(to_restart))
+        loop.run_until_complete(self.shutdown_domains(to_shutdown))
 
         if self.status is RestartStatus.NONE:
             self.status = RestartStatus.OK
 
-    def shutdown_domains(self, to_shutdown):
+    async def shutdown_domains(self, to_shutdown):
         """
         Try to shut down vms and wait to finish.
         """
-        try:
-            loop = asyncio.get_event_loop()
-        except RuntimeError:
-            # changes between GLib versions and python versions mean that the above
-            # can fail on some dom0/gui domain configurations
-            loop = asyncio.new_event_loop()
-        tasks = [asyncio.to_thread(vm.shutdown, force=True, wait=True) for vm in to_shutdown]
-        results = loop.run_until_complete(
-            asyncio.gather(*tasks, return_exceptions=True)
+        failed = await qubesadmin.utils.shutdown(
+            domains=to_shutdown, force=True, wait=True, logger=self.log
         )
-        done = []
-        for vm, res in zip(to_shutdown, results):
-            if not isinstance(res, BaseException):
-                self.log.info("Shutdown %s", vm.name)
-                done.append(vm)
-                continue
-            self.err += vm.name + " cannot shutdown: " + str(res) + "\n"
-            self.log.error("Cannot shutdown %s because %s", vm.name, str(res))
-            self.status = RestartStatus.ERROR_TMPL_DOWN
+        unhandled, used, timedout = failed
+        if not unhandled and not used and not timedout:
+            return to_shutdown
+        self.status = RestartStatus.ERROR_TMPL_DOWN
+        all_failed = []
+        if unhandled:
+            for qube in unhandled:
+                all_failed.append(qube)
+                self.err += vm.name + " cannot shutdown: unknown reason\n"
+            for qube in used:
+                all_failed.append(qube)
+                self.err += vm.name + " cannot shutdown: in use\n"
+            for qube in timedout:
+                all_failed.append(qube)
+                self.err += vm.name + " cannot shutdown: timed out\n"
+        done = [qube for qube in to_shutdown if qube not in all_failed]
         return done
 
-    def restart_vms(self, to_restart):
+    async def restart_vms(self, to_restart):
         """
         Try to restart vms.
         """
-        shutdowns = self.shutdown_domains(to_restart)
+        shutdowns = await self.shutdown_domains(to_restart)
 
+        # TODO: ben: decide if this is better or worse than the above method
         # restart shutdown qubes
-        try:
-            loop = asyncio.get_event_loop()
-        except RuntimeError:
-            # changes between GLib versions and python versions mean that the above
-            # can fail on some dom0/gui domain configurations
-            loop = asyncio.new_event_loop()
         tasks = [asyncio.to_thread(vm.start) for vm in shutdowns]
-        results = loop.run_until_complete(
-            asyncio.gather(*tasks, return_exceptions=True)
-        )
+        results = await asyncio.gather(*tasks, return_exceptions=True)
         for vm, res in zip(shutdowns, results):
             if not isinstance(res, qubesadmin.exc.QubesVMError):
                 self.log.info("Restart %s", vm.name)

qui/updater/tests/test_summary_page.py

@@ -354,9 +354,7 @@ def set_deletable(self, deletable):
         mock_show_dialog.assert_has_calls(calls)
 
 
-@patch("qui.updater.summary_page.wait_for_domain_shutdown")
 def test_perform_restart(
-    _mock_wait_for_domain_shutdown,
     test_qapp,
     real_builder,
     mock_next_button,
@@ -389,7 +387,7 @@ def test_perform_restart(
         "vault",
     )
     expected_shutdown_calls = [
-        (tmpl, "admin.vm.Shutdown", "force", None) for tmpl in to_shutdown
+        (tmpl, "admin.vm.Shutdown", "force+wait", None) for tmpl in to_shutdown
     ]
     for call_ in expected_shutdown_calls:
         test_qapp.expected_calls[call_] = b"0\x00"