From 674381f1be035bce8d8e19ab0b88e9b31e003a7d Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 25 Sep 2023 21:08:23 +1000
Subject: [PATCH] Fix tests

---
 gns3server/api/routes/controller/images.py |  8 ++++----
 tests/api/routes/controller/test_images.py | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/gns3server/api/routes/controller/images.py b/gns3server/api/routes/controller/images.py
index e27d4c53..afd592de 100644
--- a/gns3server/api/routes/controller/images.py
+++ b/gns3server/api/routes/controller/images.py
@@ -53,19 +53,19 @@ router = APIRouter()
 
 
 @router.post(
-    "/{image_path:path}",
+    "/qemu/{image_path:path}",
     response_model=schemas.Image,
     status_code=status.HTTP_201_CREATED,
     dependencies=[Depends(has_privilege("Image.Allocate"))]
 )
-async def create_image(
+async def create_qemu_image(
         image_path: str,
         image_data: schemas.QemuDiskImageCreate,
         images_repo: ImagesRepository = Depends(get_repository(ImagesRepository)),
 
 ) -> schemas.Image:
     """
-    Create a new blank image.
+    Create a new blank Qemu image.
 
     Required privilege: Image.Allocate
     """
@@ -83,7 +83,7 @@ async def create_image(
         raise ControllerForbiddenError(f"Cannot write disk image, '{disk_image_path}' is forbidden")
 
     if not image_dir:
-        # put the image in the default images directory
+        # put the image in the default images directory for Qemu
         directory = default_images_directory(image_type="qemu")
         os.makedirs(directory, exist_ok=True)
         disk_image_path = os.path.abspath(os.path.join(directory, disk_image_path))
diff --git a/tests/api/routes/controller/test_images.py b/tests/api/routes/controller/test_images.py
index 7aa09f22..015ea014 100644
--- a/tests/api/routes/controller/test_images.py
+++ b/tests/api/routes/controller/test_images.py
@@ -22,10 +22,12 @@ import hashlib
 from sqlalchemy.ext.asyncio import AsyncSession
 from fastapi import FastAPI, status
 from httpx import AsyncClient
+from tests.utils import AsyncioMagicMock
 
 from gns3server.controller import Controller
 from gns3server.db.repositories.images import ImagesRepository
 from gns3server.db.repositories.templates import TemplatesRepository
+from gns3server.compute.qemu import Qemu
 
 pytestmark = pytest.mark.asyncio
 
@@ -104,6 +106,17 @@ def empty_image(tmpdir) -> str:
 
 class TestImageRoutes:
 
+    async def test_create_image(self, app: FastAPI, client: AsyncClient, images_dir) -> None:
+
+        Qemu.instance().create_disk_image = AsyncioMagicMock()
+        path = os.path.join(os.path.join(images_dir, "QEMU", "new_image.qcow2"))
+        with open(path, "wb+") as f:
+            f.write(b'QFI\xfb\x00\x00\x00')
+        image_name = os.path.basename(path)
+        response = await client.post(
+            app.url_path_for("create_qemu_image", image_path=image_name), json={"format": "qcow2", "size": 30})
+        assert response.status_code == status.HTTP_201_CREATED
+
     @pytest.mark.parametrize(
         "image_type, fixture_name, valid_request",
         (
@@ -151,7 +164,7 @@ class TestImageRoutes:
 
         response = await client.get(app.url_path_for("get_images"))
         assert response.status_code == status.HTTP_200_OK
-        assert len(response.json()) == 4  # 4 valid images uploaded before
+        assert len(response.json()) == 5  # 4 valid images uploaded before + 1 created
 
     async def test_image_get(self, app: FastAPI, client: AsyncClient, qcow2_image: str) -> None: