Look for qemu images in ~/GNS3/images

This commit is contained in:
Julien Duponchelle committed 2015-03-07 11:56:51 +01:00
1 parent ee578d3c12
commit 1b68a54234
3 files changed
+31 -4

No files matched your search

+4 -4
View File
@@ -56,7 +56,7 @@ def test_qemu_create(server, project, base_params):
def test_qemu_create_with_params(server, project, base_params):
params = base_params
params["ram"] = 1024
params["hda_disk_image"] = "hda"
params["hda_disk_image"] = "/tmp/hda"
response = server.post("/projects/{project_id}/qemu/vms".format(project_id=project.id), params, example=True)
assert response.status == 201
@@ -64,7 +64,7 @@ def test_qemu_create_with_params(server, project, base_params):
assert response.json["name"] == "PC TEST 1"
assert response.json["project_id"] == project.id
assert response.json["ram"] == 1024
assert response.json["hda_disk_image"] == "hda"
assert response.json["hda_disk_image"] == "/tmp/hda"
def test_qemu_get(server, project, vm):
@@ -122,13 +122,13 @@ def test_qemu_update(server, vm, tmpdir, free_console_port, project):
"name": "test",
"console": free_console_port,
"ram": 1024,
"hdb_disk_image": "hdb"
"hdb_disk_image": "/tmp/hdb"
}
response = server.put("/projects/{project_id}/qemu/vms/{vm_id}".format(project_id=vm["project_id"], vm_id=vm["vm_id"]), params, example=True)
assert response.status == 200
assert response.json["name"] == "test"
assert response.json["console"] == free_console_port
assert response.json["hdb_disk_image"] == "hdb"
assert response.json["hdb_disk_image"] == "/tmp/hdb"
assert response.json["ram"] == 1024
+18
View File
@@ -284,3 +284,21 @@ def test_build_command_without_display(vm, loop, fake_qemu_binary):
with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()) as process:
cmd = loop.run_until_complete(asyncio.async(vm._build_command()))
assert "-nographic" in cmd
def test_hda_disk_image(vm, tmpdir):
with patch("gns3server.config.Config.get_section_config", return_value={"images_path": str(tmpdir)}):
vm.hda_disk_image = "/tmp/test"
assert vm.hda_disk_image == "/tmp/test"
vm.hda_disk_image = "test"
assert vm.hda_disk_image == str(tmpdir / "test")
def test_hdb_disk_image(vm, tmpdir):
with patch("gns3server.config.Config.get_section_config", return_value={"images_path": str(tmpdir)}):
vm.hdb_disk_image = "/tmp/test"
assert vm.hdb_disk_image == "/tmp/test"
vm.hdb_disk_image = "test"
assert vm.hdb_disk_image == str(tmpdir / "test")