ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-24 15:06:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 2.1 into 2.2 branch.

Browse Source
This commit is contained in:
grossmj 2018-12-21 15:24:34 +08:00
commit 468145319d
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/docker/docker_vm.py
View File

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

10
gns3server/compute/iou/iou_vm.py
View File

@ -529,6 +529,16 @@ class IOUVM(BaseNode):
if "IOURC" not in os.environ: if "IOURC" not in os.environ:
env["IOURC"] = iourc_path 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() command = await self._build_command()
try: try:
log.info("Starting IOU: {}".format(command)) log.info("Starting IOU: {}".format(command))

2
gns3server/handlers/api/compute/iou_handler.py
View File

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