Backport auxiliary console support for Qemu, Docker and Dynamips nodes

gns3server/handlers/api/compute/docker_handler.py

@@ -48,21 +48,25 @@ class DockerHandler:
         output=DOCKER_OBJECT_SCHEMA)
     async def create(request, response):
         docker_manager = Docker.instance()
-        container = await docker_manager.create_node(request.json.pop("name"),
-                                                          request.match_info["project_id"],
-                                                          request.json.get("node_id"),
-                                                          image=request.json.pop("image"),
-                                                          start_command=request.json.get("start_command"),
-                                                          environment=request.json.get("environment"),
-                                                          adapters=request.json.get("adapters"),
-                                                          console=request.json.get("console"),
-                                                          console_type=request.json.get("console_type"),
-                                                          console_resolution=request.json.get("console_resolution", "1024x768"),
-                                                          console_http_port=request.json.get("console_http_port", 80),
-                                                          console_http_path=request.json.get("console_http_path", "/"),
-                                                          aux=request.json.get("aux"),
-                                                          extra_hosts=request.json.get("extra_hosts"),
-                                                          extra_volumes=request.json.get("extra_volumes"))
+        container = await docker_manager.create_node(
+            request.json.pop("name"),
+            request.match_info["project_id"],
+            request.json.get("node_id"),
+            image=request.json.pop("image"),
+            start_command=request.json.get("start_command"),
+            environment=request.json.get("environment"),
+            adapters=request.json.get("adapters"),
+            console=request.json.get("console"),
+            console_type=request.json.get("console_type"),
+            console_resolution=request.json.get("console_resolution", "1024x768"),
+            console_http_port=request.json.get("console_http_port", 80),
+            console_http_path=request.json.get("console_http_path", "/"),
+            aux=request.json.get("aux"),
+            aux_type=request.json.pop("aux_type", "none"),
+            extra_hosts=request.json.get("extra_hosts"),
+            extra_volumes=request.json.get("extra_volumes")
+        )
+
         for name, value in request.json.items():
             if name != "node_id":
                 if hasattr(container, name) and getattr(container, name) != value:
@@ -315,7 +319,7 @@ class DockerHandler:
         container = docker_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
 
         props = [
-            "name", "console", "aux", "console_type", "console_resolution",
+            "name", "console", "console_type", "aux", "aux_type", "console_resolution",
             "console_http_port", "console_http_path", "start_command",
             "environment", "adapters", "mac_address", "custom_adapters", "extra_hosts", "extra_volumes"
         ]

gns3server/handlers/api/compute/dynamips_vm_handler.py

@@ -69,16 +69,19 @@ class DynamipsVMHandler:
         default_chassis = None
         if platform in DEFAULT_CHASSIS:
             default_chassis = DEFAULT_CHASSIS[platform]
-        vm = await dynamips_manager.create_node(request.json.pop("name"),
-                                                request.match_info["project_id"],
-                                                request.json.get("node_id"),
-                                                dynamips_id=request.json.get("dynamips_id"),
-                                                platform=platform,
-                                                console=request.json.get("console"),
-                                                console_type=request.json.get("console_type", "telnet"),
-                                                aux=request.json.get("aux"),
-                                                chassis=request.json.pop("chassis", default_chassis),
-                                                node_type="dynamips")
+        vm = await dynamips_manager.create_node(
+            request.json.pop("name"),
+            request.match_info["project_id"],
+            request.json.get("node_id"),
+            dynamips_id=request.json.get("dynamips_id"),
+            platform=platform,
+            console=request.json.get("console"),
+            console_type=request.json.get("console_type", "telnet"),
+            aux=request.json.get("aux"),
+            aux_type=request.json.get("aux_type", "none"),
+            chassis=request.json.pop("chassis", default_chassis),
+            node_type="dynamips"
+        )
         await dynamips_manager.update_vm_settings(vm, request.json)
         response.set_status(201)
         response.json(vm)

gns3server/handlers/api/compute/qemu_handler.py

@@ -66,14 +66,18 @@ class QEMUHandler:
     async def create(request, response):
 
         qemu = Qemu.instance()
-        vm = await qemu.create_node(request.json.pop("name"),
-                                         request.match_info["project_id"],
-                                         request.json.pop("node_id", None),
-                                         linked_clone=request.json.get("linked_clone", True),
-                                         qemu_path=request.json.pop("qemu_path", None),
-                                         console=request.json.pop("console", None),
-                                         console_type=request.json.pop("console_type", "telnet"),
-                                         platform=request.json.pop("platform", None))
+        vm = await qemu.create_node(
+            request.json.pop("name"),
+            request.match_info["project_id"],
+            request.json.pop("node_id", None),
+            linked_clone=request.json.get("linked_clone", True),
+            qemu_path=request.json.pop("qemu_path", None),
+            console=request.json.pop("console", None),
+            console_type=request.json.pop("console_type", "telnet"),
+            aux=request.json.pop("aux", None),
+            aux_type=request.json.pop("aux_type", "none"),
+            platform=request.json.pop("platform", None)
+        )
 
         for name, value in request.json.items():
             if hasattr(vm, name) and getattr(vm, name) != value: