Allow images to be stored in subdirs and used by templates.

tests/api/routes/controller/test_images.py

@@ -134,7 +134,7 @@ class TestImageRoutes:
         image_checksum.update(image_data)
 
         response = await client.post(
-            app.url_path_for("upload_image", image_name=image_name),
+            app.url_path_for("upload_image", image_path=image_name),
             params={"image_type": image_type},
             content=image_data)
 
@@ -155,7 +155,7 @@ class TestImageRoutes:
     async def test_image_get(self, app: FastAPI, client: AsyncClient, qcow2_image: str) -> None:
 
         image_name = os.path.basename(qcow2_image)
-        response = await client.get(app.url_path_for("get_image", image_name=image_name))
+        response = await client.get(app.url_path_for("get_image", image_path=image_name))
         assert response.status_code == status.HTTP_200_OK
         assert response.json()["filename"] == image_name
 
@@ -165,21 +165,21 @@ class TestImageRoutes:
         with open(qcow2_image, "rb") as f:
             image_data = f.read()
         response = await client.post(
-            app.url_path_for("upload_image", image_name=image_name),
+            app.url_path_for("upload_image", image_path=image_name),
             params={"image_type": "qemu"},
             content=image_data)
         assert response.status_code == status.HTTP_400_BAD_REQUEST
 
-    async def test_image_delete(self, app: FastAPI, client: AsyncClient, images_dir: str, qcow2_image: str) -> None:
+    async def test_image_delete(self, app: FastAPI, client: AsyncClient, qcow2_image: str) -> None:
 
         image_name = os.path.basename(qcow2_image)
-        response = await client.delete(app.url_path_for("delete_image", image_name=image_name))
+        response = await client.delete(app.url_path_for("delete_image", image_path=image_name))
         assert response.status_code == status.HTTP_204_NO_CONTENT
 
     async def test_not_found_image(self, app: FastAPI, client: AsyncClient, qcow2_image: str) -> None:
 
         image_name = os.path.basename(qcow2_image)
-        response = await client.get(app.url_path_for("get_image", image_name=image_name))
+        response = await client.get(app.url_path_for("get_image", image_path=image_name))
         assert response.status_code == status.HTTP_404_NOT_FOUND
 
     async def test_image_deleted_on_disk(self, app: FastAPI, client: AsyncClient, images_dir: str, qcow2_image: str) -> None:
@@ -188,15 +188,66 @@ class TestImageRoutes:
         with open(qcow2_image, "rb") as f:
             image_data = f.read()
         response = await client.post(
-            app.url_path_for("upload_image", image_name=image_name),
+            app.url_path_for("upload_image", image_path=image_name),
             params={"image_type": "qemu"},
             content=image_data)
         assert response.status_code == status.HTTP_201_CREATED
 
-        response = await client.delete(app.url_path_for("delete_image", image_name=image_name))
+        response = await client.delete(app.url_path_for("delete_image", image_path=image_name))
         assert response.status_code == status.HTTP_204_NO_CONTENT
         assert not os.path.exists(os.path.join(images_dir, "QEMU", image_name))
 
+    @pytest.mark.parametrize(
+        "subdir, expected_result",
+        (
+            ("subdir", status.HTTP_201_CREATED),
+            ("subdir", status.HTTP_400_BAD_REQUEST),
+            ("subdir2", status.HTTP_201_CREATED),
+        ),
+    )
+    async def test_upload_image_subdir(
+            self,
+            app: FastAPI,
+            client: AsyncClient,
+            images_dir: str,
+            qcow2_image: str,
+            subdir: str,
+            expected_result: int
+    ) -> None:
+
+        image_name = os.path.basename(qcow2_image)
+        with open(qcow2_image, "rb") as f:
+            image_data = f.read()
+        image_path = os.path.join(subdir, image_name)
+        response = await client.post(
+            app.url_path_for("upload_image", image_path=image_path),
+            params={"image_type": "qemu"},
+            content=image_data)
+        assert response.status_code == expected_result
+
+    async def test_image_delete_multiple_match(
+            self,
+            app: FastAPI,
+            client: AsyncClient,
+            qcow2_image: str
+    ) -> None:
+
+        image_name = os.path.basename(qcow2_image)
+        response = await client.delete(app.url_path_for("delete_image", image_path=image_name))
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+
+    async def test_image_delete_with_subdir(
+            self,
+            app: FastAPI,
+            client: AsyncClient,
+            qcow2_image: str
+    ) -> None:
+
+        image_name = os.path.basename(qcow2_image)
+        image_path = os.path.join("subdir", image_name)
+        response = await client.delete(app.url_path_for("delete_image", image_path=image_path))
+        assert response.status_code == status.HTTP_204_NO_CONTENT
+
     async def test_prune_images(self, app: FastAPI, client: AsyncClient, db_session: AsyncSession) -> None:
 
         response = await client.post(app.url_path_for("prune_images"))

tests/api/routes/controller/test_templates.py

@@ -1191,6 +1191,37 @@ class TestImageAssociationWithTemplate:
         db_template = await templates_repo.get_template(uuid.UUID(template_id))
         assert len(db_template.images) == 0
 
+    async def test_template_create_with_image_in_subdir(
+            self,
+            app: FastAPI,
+            client: AsyncClient,
+            db_session: AsyncSession,
+            tmpdir: str,
+    ) -> None:
+
+        params = {"name": "Qemu template",
+                  "compute_id": "local",
+                  "platform": "i386",
+                  "hda_disk_image": "subdir/image.qcow2",
+                  "ram": 512,
+                  "template_type": "qemu"}
+
+        path = os.path.join(tmpdir, "subdir", "image.qcow2")
+        os.makedirs(os.path.dirname(path))
+        with open(path, "wb+") as f:
+            f.write(b'\x42\x42\x42\x42')
+        images_repo = ImagesRepository(db_session)
+        await images_repo.add_image("image.qcow2", "qemu", 42, path, "e342eb86c1229b6c154367a5476969b5", "md5")
+
+        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"]
+
+        templates_repo = TemplatesRepository(db_session)
+        db_template = await templates_repo.get_template(template_id)
+        assert len(db_template.images) == 1
+        assert db_template.images[0].path.endswith("subdir/image.qcow2")
+
     async def test_template_create_with_non_existing_image(self, app: FastAPI, client: AsyncClient) -> None:
 
         params = {"name": "Qemu template",