arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-24 15:58:08 +00:00
Code Issues Releases Wiki Activity

Return relative path for dynamips images

Browse Source 
Fix https://github.com/GNS3/gns3-gui/issues/775
This commit is contained in:
Julien Duponchelle 2015-11-05 16:47:37 +01:00
parent 7ee12edb5c
commit 6fbc84c0dc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gns3server/modules/dynamips/__init__.py
View File

@ -733,5 +733,6 @@ class Dynamips(BaseManager):
continue continue
# valid IOS images must start with the ELF magic number, be 32-bit, big endian and have an ELF version of 1 # valid IOS images must start with the ELF magic number, be 32-bit, big endian and have an ELF version of 1
if elf_header_start == b'\x7fELF\x01\x02\x01': if elf_header_start == b'\x7fELF\x01\x02\x01':
path = os.path.relpath(path, image_dir)
images.append({"filename": filename, "path": path}) images.append({"filename": filename, "path": path})
return images return images

2
tests/handlers/api/test_dynamips.py
View File

@ -156,7 +156,7 @@ def test_vms(server, tmpdir, fake_dynamips, fake_file):
with patch("gns3server.modules.Dynamips.get_images_directory", return_value=str(tmpdir), example=True): with patch("gns3server.modules.Dynamips.get_images_directory", return_value=str(tmpdir), example=True):
response = server.get("/dynamips/vms") response = server.get("/dynamips/vms")
assert response.status == 200 assert response.status == 200
assert response.json == [{"filename": "7200.bin", "path": str(tmpdir / "7200.bin")}] assert response.json == [{"filename": "7200.bin", "path": "7200.bin"}]
def test_upload_vm(server, tmpdir): def test_upload_vm(server, tmpdir):