Refactor tests and start work on database integration.

tests/api/routes/controller/test_nodes.py

@@ -18,28 +18,34 @@
 
 import pytest
 
+from fastapi import FastAPI, status
+from httpx import AsyncClient
+
 from unittest.mock import MagicMock
 from tests.utils import AsyncioMagicMock
 
 from gns3server.controller.node import Node
+from gns3server.controller.project import Project
+from gns3server.controller.compute import Compute
+
+pytestmark = pytest.mark.asyncio
 
 
 @pytest.fixture
-def node(project, compute):
+def node(project: Project, compute: Compute) -> Node:
 
     node = Node(project, compute, "test", node_type="vpcs")
     project._nodes[node.id] = node
     return node
 
 
-@pytest.mark.asyncio
-async def test_create_node(controller_api, project, compute):
+async def test_create_node(app: FastAPI, client: AsyncClient, project: Project, compute: Compute) -> None:
 
     response = MagicMock()
     response.json = {"console": 2048}
     compute.post = AsyncioMagicMock(return_value=response)
 
-    response = await controller_api.post("/projects/{}/nodes".format(project.id), {
+    response = await client.post(app.url_path_for("create_node", project_id=project.id), json={
         "name": "test",
         "node_type": "vpcs",
         "compute_id": "example.com",
@@ -48,19 +54,18 @@ async def test_create_node(controller_api, project, compute):
         }
     })
 
-    assert response.status_code == 201
-    assert response.json["name"] == "test"
-    assert "name" not in response.json["properties"]
+    assert response.status_code == status.HTTP_201_CREATED
+    assert response.json()["name"] == "test"
+    assert "name" not in response.json()["properties"]
 
 
-@pytest.mark.asyncio
-async def test_list_node(controller_api, project, compute):
+async def test_list_node(app: FastAPI, client: AsyncClient, project: Project, compute: Compute) -> None:
 
     response = MagicMock()
     response.json = {"console": 2048}
     compute.post = AsyncioMagicMock(return_value=response)
 
-    await controller_api.post("/projects/{}/nodes".format(project.id), {
+    await client.post(app.url_path_for("create_node", project_id=project.id), json={
         "name": "test",
         "node_type": "vpcs",
         "compute_id": "example.com",
@@ -69,19 +74,18 @@ async def test_list_node(controller_api, project, compute):
         }
     })
 
-    response = await controller_api.get("/projects/{}/nodes".format(project.id))
-    assert response.status_code == 200
-    assert response.json[0]["name"] == "test"
+    response = await client.get(app.url_path_for("get_nodes", project_id=project.id))
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json()[0]["name"] == "test"
 
 
-@pytest.mark.asyncio
-async def test_get_node(controller_api, project, compute):
+async def test_get_node(app: FastAPI, client: AsyncClient, project: Project, compute: Compute) -> None:
 
     response = MagicMock()
     response.json = {"console": 2048}
     compute.post = AsyncioMagicMock(return_value=response)
 
-    response = await controller_api.post("/projects/{}/nodes".format(project.id), {
+    response = await client.post(app.url_path_for("create_node", project_id=project.id), json={
         "name": "test",
         "node_type": "vpcs",
         "compute_id": "example.com",
@@ -90,19 +94,18 @@ async def test_get_node(controller_api, project, compute):
         }
     })
 
-    response = await controller_api.get("/projects/{}/nodes/{}".format(project.id, response.json["node_id"]))
-    assert response.status_code == 200
-    assert response.json["name"] == "test"
+    response = await client.get(app.url_path_for("get_node", project_id=project.id, node_id=response.json()["node_id"]))
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json()["name"] == "test"
 
 
-@pytest.mark.asyncio
-async def test_update_node(controller_api, project, compute, node):
+async def test_update_node(app: FastAPI, client: AsyncClient, project: Project, compute: Compute, node: Node) -> None:
 
     response = MagicMock()
     response.json = {"console": 2048}
     compute.put = AsyncioMagicMock(return_value=response)
 
-    response = await controller_api.put("/projects/{}/nodes/{}".format(project.id, node.id), {
+    response = await client.put(app.url_path_for("update_node", project_id=project.id, node_id=node.id), json={
         "name": "test",
         "node_type": "vpcs",
         "compute_id": "example.com",
@@ -112,156 +115,167 @@ async def test_update_node(controller_api, project, compute, node):
     })
 
     assert response.status_code == 200
-    assert response.json["name"] == "test"
-    assert "name" not in response.json["properties"]
+    assert response.json()["name"] == "test"
+    assert "name" not in response.json()["properties"]
 
 
-@pytest.mark.asyncio
-async def test_start_all_nodes(controller_api, project, compute):
+async def test_start_all_nodes(app: FastAPI, client: AsyncClient, project: Project, compute: Compute) -> None:
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{}/nodes/start".format(project.id))
-    assert response.status_code == 204
+    response = await client.post(app.url_path_for("start_all_nodes", project_id=project.id))
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio
-async def test_stop_all_nodes(controller_api, project, compute):
+async def test_stop_all_nodes(app: FastAPI, client: AsyncClient, project: Project, compute: Compute) -> None:
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{}/nodes/stop".format(project.id))
-    assert response.status_code == 204
+    response = await client.post(app.url_path_for("stop_all_nodes", project_id=project.id))
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio
-async def test_suspend_all_nodes(controller_api, project, compute):
+async def test_suspend_all_nodes(app: FastAPI, client: AsyncClient, project: Project, compute: Compute) -> None:
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{}/nodes/suspend".format(project.id))
-    assert response.status_code == 204
+    response = await client.post(app.url_path_for("suspend_all_nodes", project_id=project.id))
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio
-async def test_reload_all_nodes(controller_api, project, compute):
+async def test_reload_all_nodes(app: FastAPI, client: AsyncClient, project: Project, compute: Compute) -> None:
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{}/nodes/reload".format(project.id))
-    assert response.status_code == 204
+    response = await client.post(app.url_path_for("reload_all_nodes", project_id=project.id))
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio
-async def test_reset_console_all_nodes(controller_api, project, compute):
+async def test_reset_console_all_nodes(app: FastAPI, client: AsyncClient, project: Project, compute: Compute) -> None:
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{}/nodes/console/reset".format(project.id))
-    assert response.status_code == 204
+    response = await client.post(app.url_path_for("reset_console_all_nodes", project_id=project.id))
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio
-async def test_start_node(controller_api, project, node, compute):
+async def test_start_node(app: FastAPI, client: AsyncClient, project: Project, compute: Compute, node: Node) -> None:
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{}/nodes/{}/start".format(project.id, node.id))
-    assert response.status_code == 204
+    response = await client.post(app.url_path_for("start_node", project_id=project.id, node_id=node.id), json={})
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio
-async def test_stop_node(controller_api, project, node, compute):
+async def test_stop_node(app: FastAPI, client: AsyncClient, project: Project, compute: Compute, node: Node) -> None:
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{}/nodes/{}/stop".format(project.id, node.id))
-    assert response.status_code == 204
+    response = await client.post(app.url_path_for("stop_node", project_id=project.id, node_id=node.id))
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
-
-@pytest.mark.asyncio
-async def test_suspend_node(controller_api, project, node, compute):
+async def test_suspend_node(app: FastAPI, client: AsyncClient, project: Project, compute: Compute, node: Node) -> None:
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{}/nodes/{}/suspend".format(project.id, node.id))
-    assert response.status_code == 204
+    response = await client.post(app.url_path_for("suspend_node", project_id=project.id, node_id=node.id))
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio
-async def test_reload_node(controller_api, project, node, compute):
+async def test_reload_node(app: FastAPI, client: AsyncClient, project: Project, compute: Compute, node: Node):
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{}/nodes/{}/reload".format(project.id, node.id))
-    assert response.status_code == 204
+    response = await client.post(app.url_path_for("reload_node", project_id=project.id, node_id=node.id))
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio
-async def test_duplicate_node(controller_api, project, compute, node):
+async def test_duplicate_node(
+        app: FastAPI,
+        client: AsyncClient,
+        project: Project,
+        compute: Compute,
+        node: Node) -> None:
 
     response = MagicMock()
     response.json({"console": 2035})
     compute.post = AsyncioMagicMock(return_value=response)
 
-    response = await controller_api.post("/projects/{}/nodes/{}/duplicate".format(project.id, node.id),
-                                         {"x": 10,
-                                          "y": 5,
-                                          "z": 0})
-    assert response.status_code == 201, response.body.decode()
+    response = await client.post(app.url_path_for("duplicate_node", project_id=project.id, node_id=node.id),
+                                 json={"x": 10, "y": 5, "z": 0})
+    assert response.status_code == status.HTTP_201_CREATED
 
 
-@pytest.mark.asyncio
-async def test_delete_node(controller_api, project, node, compute):
+async def test_delete_node(app: FastAPI, client: AsyncClient, project: Project, compute: Compute, node: Node) -> None:
 
     compute.post = AsyncioMagicMock()
-    response = await controller_api.delete("/projects/{}/nodes/{}".format(project.id, node.id))
-    assert response.status_code == 204
+    response = await client.delete(app.url_path_for("delete_node", project_id=project.id, node_id=node.id))
+    assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio
-async def test_dynamips_idle_pc(controller_api, project, compute, node):
+async def test_dynamips_idle_pc(
+        app: FastAPI,
+        client: AsyncClient,
+        project: Project,
+        compute: Compute,
+        node: Node) -> None:
 
     response = MagicMock()
     response.json = {"idlepc": "0x60606f54"}
     compute.get = AsyncioMagicMock(return_value=response)
 
-    response = await controller_api.get("/projects/{}/nodes/{}/dynamips/auto_idlepc".format(project.id, node.id))
-    assert response.status_code == 200
-    assert response.json["idlepc"] == "0x60606f54"
+    response = await client.get(app.url_path_for("auto_idlepc", project_id=project.id, node_id=node.id))
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json()["idlepc"] == "0x60606f54"
 
 
-@pytest.mark.asyncio
-async def test_dynamips_idlepc_proposals(controller_api, project, compute, node):
+async def test_dynamips_idlepc_proposals(
+        app: FastAPI,
+        client: AsyncClient,
+        project: Project,
+        compute: Compute,
+        node: Node) -> None:
 
     response = MagicMock()
     response.json = ["0x60606f54", "0x33805a22"]
     compute.get = AsyncioMagicMock(return_value=response)
 
-    response = await controller_api.get("/projects/{}/nodes/{}/dynamips/idlepc_proposals".format(project.id, node.id))
-    assert response.status_code == 200
-    assert response.json == ["0x60606f54", "0x33805a22"]
+    response = await client.get(app.url_path_for("idlepc_proposals", project_id=project.id, node_id=node.id))
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json() == ["0x60606f54", "0x33805a22"]
 
 
-@pytest.mark.asyncio
-async def test_get_file(controller_api, project, node, compute):
+async def test_get_file(app: FastAPI, client: AsyncClient, project: Project, compute: Compute, node: Node) -> None:
 
     response = MagicMock()
     response.body = b"world"
     compute.http_query = AsyncioMagicMock(return_value=response)
 
-    response = await controller_api.get("/projects/{project_id}/nodes/{node_id}/files/hello".format(project_id=project.id, node_id=node.id))
-    assert response.status_code == 200
+    response = await client.get(app.url_path_for("get_file", project_id=project.id, node_id=node.id, file_path="hello"))
+    assert response.status_code == status.HTTP_200_OK
     assert response.content == b'world'
 
-    compute.http_query.assert_called_with("GET", "/projects/{project_id}/files/project-files/vpcs/{node_id}/hello".format(project_id=project.id, node_id=node.id), timeout=None, raw=True)
+    compute.http_query.assert_called_with(
+        "GET",
+        "/projects/{project_id}/files/project-files/vpcs/{node_id}/hello".format(
+            project_id=project.id,
+            node_id=node.id),
+        timeout=None,
+        raw=True)
 
-    response = await controller_api.get("/projects/{project_id}/nodes/{node_id}/files/../hello".format(project_id=project.id, node_id=node.id))
-    assert response.status_code == 404
+    response = await client.get(app.url_path_for(
+        "get_file",
+        project_id=project.id,
+        node_id=node.id,
+        file_path="../hello"))
+    assert response.status_code == status.HTTP_404_NOT_FOUND
 
 
-@pytest.mark.asyncio
-async def test_post_file(controller_api, project, node, compute):
+async def test_post_file(app: FastAPI, client: AsyncClient, project: Project, compute: Compute, node: Node) -> None:
 
     compute.http_query = AsyncioMagicMock()
-    response = await controller_api.post("/projects/{project_id}/nodes/{node_id}/files/hello".format(project_id=project.id, node_id=node.id), body=b"hello", raw=True)
-    assert response.status_code == 201
+    response = await client.post(app.url_path_for(
+        "post_file",
+        project_id=project.id,
+        node_id=node.id,
+        file_path="hello"), content=b"hello")
+    assert response.status_code == status.HTTP_201_CREATED
 
     compute.http_query.assert_called_with("POST", "/projects/{project_id}/files/project-files/vpcs/{node_id}/hello".format(project_id=project.id, node_id=node.id), data=b'hello', timeout=None, raw=True)
 
-    response = await controller_api.get("/projects/{project_id}/nodes/{node_id}/files/../hello".format(project_id=project.id, node_id=node.id))
-    assert response.status_code == 404
+    response = await client.get("/projects/{project_id}/nodes/{node_id}/files/../hello".format(project_id=project.id, node_id=node.id))
+    assert response.status_code == status.HTTP_404_NOT_FOUND
 
 
 # @pytest.mark.asyncio