Add option to wait for domain shutdown

By waiting for the full shutdown, it becomes possible to receive
appropriate exception, that would allow adapting the client to react
differently. A timeout can be interpreted and the method adjusted to
kill the domain.

Author: ben-grande

qubesadmin/tests/vm/actions.py

@@ -40,6 +40,27 @@ def test_001_shutdown(self):
         self.vm.shutdown()
         self.assertAllCalled()
 
+    def test_001_shutdown_force(self):
+        self.app.expected_calls[
+            ('test-vm', 'admin.vm.Shutdown', 'force', None)] = \
+            b'0\x00'
+        self.vm.shutdown(force=True)
+        self.assertAllCalled()
+
+    def test_001_shutdown_wait(self):
+        self.app.expected_calls[
+            ('test-vm', 'admin.vm.Shutdown', 'wait', None)] = \
+            b'0\x00'
+        self.vm.shutdown(wait=True)
+        self.assertAllCalled()
+
+    def test_001_shutdown_force_wait(self):
+        self.app.expected_calls[
+            ('test-vm', 'admin.vm.Shutdown', 'force+wait', None)] = \
+            b'0\x00'
+        self.vm.shutdown(force=True, wait=True)
+        self.assertAllCalled()
+
     def test_002_kill(self):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.Kill', None, None)] = \

qubesadmin/vm/__init__.py

@@ -113,17 +113,22 @@ def start(self):
         """
         self.qubesd_call(self._method_dest, "admin.vm.Start")
 
-    def shutdown(self, force=False):
+    def shutdown(self, force=False, wait=False):
         """
         Shutdown domain.
 
         :return:
         """
-        # TODO: wait parameter (using event?)
+        arg_list = []
         if force:
-            self.qubesd_call(self._method_dest, "admin.vm.Shutdown", "force")
-        else:
-            self.qubesd_call(self._method_dest, "admin.vm.Shutdown")
+            arg_list.append("force")
+        if wait:
+            arg_list.append("wait")
+        args = "+".join(arg_list)
+        params = [self._method_dest, "admin.vm.Shutdown"]
+        if args:
+            params.append(args)
+        self.qubesd_call(*params)
 
     def kill(self):
         """