arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-12 11:28:55 +00:00
Code Issues Releases Wiki Activity

Fix import/export of dynamips configuration

Browse Source
This commit is contained in:
Julien Duponchelle 2017-02-03 14:44:32 +01:00
parent 63b888a57e
commit 96194cef67
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gns3server/handlers/api/controller/node_handler.py
View File

@ -344,10 +344,7 @@ class NodeHandler:
raise aiohttp.web.HTTPForbidden raise aiohttp.web.HTTPForbidden
node_type = node.node_type node_type = node.node_type
if node_type == "dynamips": path = "/project-files/{}/{}/{}".format(node_type, node.id, path)
path = "/project-files/{}/{}".format(node_type, path)
else:
path = "/project-files/{}/{}/{}".format(node_type, node.id, path)
res = yield from node.compute.http_query("GET", "/projects/{project_id}/files{path}".format(project_id=project.id, path=path), timeout=None, raw=True) res = yield from node.compute.http_query("GET", "/projects/{project_id}/files{path}".format(project_id=project.id, path=path), timeout=None, raw=True)
response.set_status(200) response.set_status(200)
@ -384,12 +381,9 @@ class NodeHandler:
raise aiohttp.web.HTTPForbidden raise aiohttp.web.HTTPForbidden
node_type = node.node_type node_type = node.node_type
if node_type == "dynamips": path = "/project-files/{}/{}/{}".format(node_type, node.id, path)
path = "/project-files/{}/{}".format(node_type, path)
else:
path = "/project-files/{}/{}/{}".format(node_type, node.id, path)
data = yield from request.content.read() data = yield from request.content.read()
res = yield from node.compute.http_query("POST", "/projects/{project_id}/files{path}".format(project_id=project.id, path=path), data=data, timeout=None, raw=True) yield from node.compute.http_query("POST", "/projects/{project_id}/files{path}".format(project_id=project.id, path=path), data=data, timeout=None, raw=True)
response.set_status(201) response.set_status(201)