feat(qemu): support two CD/DVD images and consistent ISO handling
This commit is contained in:
Jeremy Grossmann authored and GitHub committed 2026-10-19 04:42:18 +02:00
commit e57acfb7b1
22 files changed
+799 -53

No files matched your search

@@ -370,6 +370,36 @@ class TestQemuNodesRoutes:
assert response.json()["hdb_disk_image"] == "linux载.img"
assert response.json()["ram"] == 1024
async def test_cdrom_interfaces_update_and_read_back(
self, app: FastAPI, compute_client: AsyncClient, qemu_vm: dict
) -> None:
url = app.url_path_for("compute:update_qemu_node", project_id=qemu_vm["project_id"], node_id=qemu_vm["node_id"])
response = await compute_client.put(url, json={"cdrom_interface": "sata", "cdrom2_interface": "sata"})
assert response.status_code == status.HTTP_200_OK
assert response.json()["cdrom_interface"] == "sata"
assert response.json()["cdrom2_interface"] == "sata"
response = await compute_client.get(url)
assert response.status_code == status.HTTP_200_OK
assert response.json()["cdrom_interface"] == "sata"
assert response.json()["cdrom2_interface"] == "sata"
@pytest.mark.parametrize("name", ["cdrom_interface", "cdrom2_interface"])
async def test_cdrom_interface_rejection_does_not_partially_update(self, app, compute_client, qemu_vm, name):
url = app.url_path_for("compute:update_qemu_node", project_id=qemu_vm["project_id"], node_id=qemu_vm["node_id"])
original = (await compute_client.get(url)).json()
with patch("gns3server.compute.qemu.qemu_vm.QemuVM.is_running", return_value=True):
response = await compute_client.put(url, json={"ram": original["ram"] + 128, name: "sata"})
assert response.status_code == status.HTTP_409_CONFLICT
saved = (await compute_client.get(url)).json()
assert saved["ram"] == original["ram"]
assert saved[name] == original[name]
@pytest.mark.parametrize("name", ["cdrom_interface", "cdrom2_interface"])
async def test_cdrom_interface_rejects_null(self, app, compute_client, qemu_vm, name):
url = app.url_path_for("compute:update_qemu_node", project_id=qemu_vm["project_id"], node_id=qemu_vm["node_id"])
response = await compute_client.put(url, json={name: None})
assert response.status_code == status.HTTP_422_UNPROCESSABLE_CONTENT
async def test_qemu_nio_create_udp(self, app: FastAPI, compute_client: AsyncClient, qemu_vm: dict) -> None:
params = {"type": "nio_udp", "lport": 4242, "rport": 4343, "rhost": "127.0.0.1"}
@@ -476,3 +476,40 @@ class TestImageRoutes:
assert len(templates) == 1
assert templates[0].name == "Empty VM"
await templates_repo.delete_template(templates[0].template_id)
class TestIsoImages:
async def test_iso_uploads_can_be_used_together_in_a_template(self, app, client, config, images_dir):
config.settings.Server.allow_raw_images = False
references = []
for index, name in enumerate(("installer.ISO", "drivers.iso")):
content = bytes(16 * 2048) + b"\x01CD001\x01" + bytes([index]) * 2041
response = await client.post(
app.url_path_for("upload_image", image_path=name),
params={"subdirectory": "installers"} if index == 0 else {},
content=content,
)
assert response.status_code == status.HTTP_201_CREATED, response.text
assert response.json()["image_type"] == "qemu"
relative = "installers/" + name if index == 0 else name
assert response.json()["path"] == os.path.join(images_dir, "QEMU", relative)
assert response.json()["reference"] == relative
assert Qemu.instance().get_abs_image_path(relative) == response.json()["path"]
references.append(relative)
response = await client.post(
app.url_path_for("create_template"),
json={
"name": "Windows installer with drivers",
"template_type": "qemu",
"compute_id": "local",
"cdrom_image": references[0],
"cdrom2_image": references[1],
},
)
assert response.status_code == status.HTTP_201_CREATED, response.text
template_id = response.json()["template_id"]
response = await client.get(app.url_path_for("get_template", template_id=template_id))
assert response.status_code == status.HTTP_200_OK
assert response.json()["cdrom_image"] == references[0]
assert response.json()["cdrom2_image"] == references[1]
@@ -1112,6 +1112,28 @@ class TestDockerTemplate:
class TestQemuTemplate:
async def test_cdrom_interfaces_persist_on_template_update(self, app, client):
params = {
"name": "SATA installer",
"compute_id": "local",
"template_type": "qemu",
"cdrom_interface": "sata",
"cdrom2_interface": "sata",
}
response = await client.post(app.url_path_for("create_template"), json=params)
assert response.status_code == status.HTTP_201_CREATED
template_id = response.json()["template_id"]
url = app.url_path_for("get_template", template_id=template_id)
saved = (await client.get(url)).json()
assert saved["cdrom_interface"] == saved["cdrom2_interface"] == "sata"
response = await client.put(
app.url_path_for("update_template", template_id=template_id), json={"cdrom_interface": "ide"}
)
assert response.status_code == status.HTTP_200_OK
saved = (await client.get(url)).json()
assert saved["cdrom_interface"] == "ide"
assert saved["cdrom2_interface"] == "sata"
async def test_qemu_template_create(self, app: FastAPI, client: AsyncClient) -> None:
params = {