Expose VM virt shells for consumption

truenas · Jan 15, 2025 · d83ffa0 · d83ffa0
1 parent 28b1247
commit d83ffa0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/middlewared/middlewared/apps/webshell_app.py b/src/middlewared/middlewared/apps/webshell_app.py
@@ -281,13 +281,10 @@ async def run(self, ws, origin, conndata):
                             "virt.instance.get_instance", options["virt_instance_id"]
                         )
                         if not options.get("command"):
-                            options["command"] = (
-                                await self.middleware.call(
-                                    "virt.instance.get_shell",
-                                    options["virt_instance_id"],
-                                )
-                                or "/bin/sh"
-                            )
+                            command = await self.middleware.call("virt.instance.get_shell", options["virt_instance_id"])
+                            if not command:
+                                command = "/bin/sh"
+                            options["command"] = command
                     except InstanceNotFound:
                         raise CallError("Provided instance id is not valid")
                 if options.get("app_name"):

diff --git a/src/middlewared/middlewared/plugins/virt/instance.py b/src/middlewared/middlewared/plugins/virt/instance.py
@@ -460,10 +460,11 @@ def get_shell(self, id):
 
         self.middleware.call_sync('virt.global.check_initialized')
         instance = self.middleware.call_sync('virt.instance.get_instance', id)
-        if instance['type'] != 'CONTAINER':
-            raise CallError('Only available for containers.')
         if instance['status'] != 'RUNNING':
-            raise CallError('Container must be running.')
+            raise CallError('Virt instance must be running.')
+        if instance['type'] != 'CONTAINER':
+            return None
+
         config = self.middleware.call_sync('virt.global.config')
         mount_info = self.middleware.call_sync(
             'filesystem.mount_info', [['mount_source', '=', f'{config["dataset"]}/containers/{id}']]