1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 03:08:14 +00:00

Fix add existing IOS not working

Fix https://github.com/GNS3/gns3-gui/issues/775
This commit is contained in:
Julien Duponchelle 2015-11-05 16:28:11 +01:00
parent 7e7c8a5450
commit 7ee12edb5c
3 changed files with 7 additions and 4 deletions

View File

@ -733,5 +733,5 @@ class Dynamips(BaseManager):
continue
# 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':
images.append({"filename": filename})
images.append({"filename": filename, "path": path})
return images

View File

@ -26,13 +26,16 @@ VM_LIST_IMAGES_SCHEMA = {
"properties": {
"filename": {
"description": "Image filename",
"type": "string"
"type": "string",
"minLength": 1
},
"path": {
"description": "Image path",
"type": "string"
"type": "string",
"minLength": 1
}
},
"required": ["filename", "path"],
"additionalProperties": False
}
],

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):
response = server.get("/dynamips/vms")
assert response.status == 200
assert response.json == [{"filename": "7200.bin"}]
assert response.json == [{"filename": "7200.bin", "path": str(tmpdir / "7200.bin")}]
def test_upload_vm(server, tmpdir):