Merge 2.1 into 2.2 branch.

gns3server/compute/docker/docker_vm.py

@@ -558,7 +558,7 @@ class DockerVM(BaseNode):
             with open(os.path.join(self.working_dir, "vnc.log"), "w") as fd:
                 self._vnc_process = await asyncio.create_subprocess_exec("x11vnc",
                                                                          "-forever",
-                                                                         "-nopw"
+                                                                         "-nopw",
                                                                          "-shared",
                                                                          "-geometry", self._console_resolution,
                                                                          "-display", "WAIT:{}".format(self._display),

gns3server/compute/iou/iou_vm.py

@@ -529,6 +529,16 @@ class IOUVM(BaseNode):
 
             if "IOURC" not in os.environ:
                 env["IOURC"] = iourc_path
+
+            # create a symbolic link to the image to avoid IOU error "failed code signing checks"
+            # on newer images, see https://github.com/GNS3/gns3-server/issues/1484
+            try:
+                symlink = os.path.join(self.working_dir, os.path.basename(self.path))
+                if not os.path.islink(symlink):
+                    os.symlink(self.path, symlink)
+            except OSError as e:
+                raise IOUError("Could not create symbolic link: {}".format(e))
+
             command = await self._build_command()
             try:
                 log.info("Starting IOU: {}".format(command))

gns3server/handlers/api/compute/iou_handler.py

@@ -304,7 +304,7 @@ class IOUHandler:
             nio.filters = request.json["filters"]
         await vm.adapter_update_nio_binding(adapter_number, port_number, nio)
         response.set_status(201)
-        response.json(nio)
+        response.json(request.json)
 
     @Route.delete(
         r"/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio",