Refactor tests and upgrade dev package requirements

tests/api/routes/compute/test_cloud_nodes.py

@@ -28,154 +28,193 @@ from gns3server.compute.project import Project
 pytestmark = pytest.mark.asyncio
 
 
-@pytest_asyncio.fixture(scope="function")
-async def vm(app: FastAPI, compute_client: AsyncClient, compute_project: Project, on_gns3vm) -> dict:
+class TestCloudNodesRoutes:
 
-    with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud._start_ubridge"):
-        response = await compute_client.post(app.url_path_for("compute:create_cloud", project_id=compute_project.id),
-                                     json={"name": "Cloud 1"})
-    assert response.status_code == status.HTTP_201_CREATED
-    return response.json()
+    @pytest_asyncio.fixture
+    async def vm(self, app: FastAPI, compute_client: AsyncClient, compute_project: Project, on_gns3vm) -> dict:
+
+        with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud._start_ubridge"):
+            response = await compute_client.post(app.url_path_for("compute:create_cloud", project_id=compute_project.id),
+                                         json={"name": "Cloud 1"})
+        assert response.status_code == status.HTTP_201_CREATED
+        return response.json()
 
 
-async def test_cloud_create(app: FastAPI, compute_client: AsyncClient, compute_project: Project) -> None:
+    async def test_cloud_create(
+            self, app: FastAPI,
+            compute_client: AsyncClient,
+            compute_project: Project
+    ) -> None:
 
-    with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud._start_ubridge"):
-        response = await compute_client.post(app.url_path_for("compute:create_cloud", project_id=compute_project.id),
-                                     json={"name": "Cloud 1"})
-    assert response.status_code == 201
-    assert response.json()["name"] == "Cloud 1"
-    assert response.json()["project_id"] == compute_project.id
+        with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud._start_ubridge"):
+            response = await compute_client.post(app.url_path_for("compute:create_cloud", project_id=compute_project.id),
+                                         json={"name": "Cloud 1"})
+        assert response.status_code == 201
+        assert response.json()["name"] == "Cloud 1"
+        assert response.json()["project_id"] == compute_project.id
 
 
-async def test_get_cloud(app: FastAPI, compute_client: AsyncClient, compute_project: Project, vm: dict) -> None:
+    async def test_get_cloud(
+            self, app: FastAPI,
+            compute_client: AsyncClient,
+            compute_project: Project,
+            vm: dict
+    ) -> None:
 
-    response = await compute_client.get(app.url_path_for("compute:get_cloud", project_id=vm["project_id"], node_id=vm["node_id"]))
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json()["name"] == "Cloud 1"
-    assert response.json()["project_id"] == compute_project.id
-    assert response.json()["status"] == "started"
-
-
-async def test_cloud_nio_create_udp(app: FastAPI, compute_client: AsyncClient, compute_project: Project, vm: dict) -> None:
-
-    params = {"type": "nio_udp",
-              "lport": 4242,
-              "rport": 4343,
-              "rhost": "127.0.0.1"}
-
-    url = app.url_path_for("compute:create_cloud_nio",
-                           project_id=vm["project_id"],
-                           node_id=vm["node_id"],
-                           adapter_number="0",
-                           port_number="0")
-    response = await compute_client.post(url, json=params)
-    assert response.status_code == status.HTTP_201_CREATED
-    assert response.json()["type"] == "nio_udp"
-
-
-async def test_cloud_nio_update_udp(app: FastAPI, compute_client: AsyncClient, compute_project: Project, vm: dict) -> None:
-
-    params = {"type": "nio_udp",
-              "lport": 4242,
-              "rport": 4343,
-              "rhost": "127.0.0.1"}
-
-    url = app.url_path_for("compute:create_cloud_nio",
-                           project_id=vm["project_id"],
-                           node_id=vm["node_id"],
-                           adapter_number="0",
-                           port_number="0")
-    await compute_client.post(url, json=params)
-
-    params["filters"] = {}
-    url = app.url_path_for("compute:create_cloud_nio",
-                           project_id=vm["project_id"],
-                           node_id=vm["node_id"],
-                           adapter_number="0",
-                           port_number="0")
-    response = await compute_client.put(url, json=params)
-    assert response.status_code == status.HTTP_201_CREATED
-    assert response.json()["type"] == "nio_udp"
-
-
-async def test_cloud_delete_nio(app: FastAPI, compute_client: AsyncClient, compute_project: Project, vm: dict) -> None:
-
-    params = {"type": "nio_udp",
-              "lport": 4242,
-              "rport": 4343,
-              "rhost": "127.0.0.1"}
-
-    url = app.url_path_for("compute:create_cloud_nio",
-                           project_id=vm["project_id"],
-                           node_id=vm["node_id"],
-                           adapter_number="0",
-                           port_number="0")
-    await compute_client.post(url, json=params)
-
-    url = app.url_path_for("compute:delete_cloud_nio",
-                           project_id=vm["project_id"],
-                           node_id=vm["node_id"],
-                           adapter_number="0",
-                           port_number="0")
-    with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud._start_ubridge"):
-        response = await compute_client.delete(url)
-    assert response.status_code == status.HTTP_204_NO_CONTENT
-
-
-async def test_cloud_delete(app: FastAPI, compute_client: AsyncClient, compute_project: Project, vm: dict) -> None:
-
-    response = await compute_client.delete(app.url_path_for("compute:delete_cloud", project_id=vm["project_id"], node_id=vm["node_id"]))
-    assert response.status_code == status.HTTP_204_NO_CONTENT
-
-
-async def test_cloud_update(app: FastAPI, compute_client: AsyncClient, vm: dict) -> None:
-
-    response = await compute_client.put(app.url_path_for("compute:update_cloud", project_id=vm["project_id"], node_id=vm["node_id"]),
-                                json={"name": "test"})
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json()["name"] == "test"
-
-
-async def test_cloud_start_capture(app: FastAPI, compute_client: AsyncClient, vm: dict) -> None:
-
-    params = {
-        "capture_file_name": "test.pcap",
-        "data_link_type": "DLT_EN10MB"
-    }
-
-    with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud.start_capture") as mock:
-        response = await compute_client.post(app.url_path_for("compute:start_cloud_capture",
-                                                      project_id=vm["project_id"],
-                                                      node_id=vm["node_id"],
-                                                      adapter_number="0",
-                                                      port_number="0"),
-                                     json=params)
+        response = await compute_client.get(app.url_path_for("compute:get_cloud", project_id=vm["project_id"], node_id=vm["node_id"]))
         assert response.status_code == status.HTTP_200_OK
-        assert mock.called
-        assert "test.pcap" in response.json()["pcap_file_path"]
+        assert response.json()["name"] == "Cloud 1"
+        assert response.json()["project_id"] == compute_project.id
+        assert response.json()["status"] == "started"
 
 
-async def test_cloud_stop_capture(app: FastAPI, compute_client: AsyncClient, vm: dict) -> None:
+    async def test_cloud_nio_create_udp(
+            self, app: FastAPI,
+            compute_client: AsyncClient,
+            compute_project: Project,
+            vm: dict
+    ) -> None:
 
-    with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud.stop_capture") as mock:
-        response = await compute_client.post(app.url_path_for("compute:stop_cloud_capture",
-                                                      project_id=vm["project_id"],
-                                                      node_id=vm["node_id"],
-                                                      adapter_number="0",
-                                                      port_number="0"))
+        params = {"type": "nio_udp",
+                  "lport": 4242,
+                  "rport": 4343,
+                  "rhost": "127.0.0.1"}
+
+        url = app.url_path_for("compute:create_cloud_nio",
+                               project_id=vm["project_id"],
+                               node_id=vm["node_id"],
+                               adapter_number="0",
+                               port_number="0")
+        response = await compute_client.post(url, json=params)
+        assert response.status_code == status.HTTP_201_CREATED
+        assert response.json()["type"] == "nio_udp"
+
+
+    async def test_cloud_nio_update_udp(
+            self, app: FastAPI,
+            compute_client: AsyncClient,
+            compute_project: Project,
+            vm: dict
+    ) -> None:
+
+        params = {"type": "nio_udp",
+                  "lport": 4242,
+                  "rport": 4343,
+                  "rhost": "127.0.0.1"}
+
+        url = app.url_path_for("compute:create_cloud_nio",
+                               project_id=vm["project_id"],
+                               node_id=vm["node_id"],
+                               adapter_number="0",
+                               port_number="0")
+        await compute_client.post(url, json=params)
+
+        params["filters"] = {}
+        url = app.url_path_for("compute:create_cloud_nio",
+                               project_id=vm["project_id"],
+                               node_id=vm["node_id"],
+                               adapter_number="0",
+                               port_number="0")
+        response = await compute_client.put(url, json=params)
+        assert response.status_code == status.HTTP_201_CREATED
+        assert response.json()["type"] == "nio_udp"
+
+
+    async def test_cloud_delete_nio(
+            self, app: FastAPI,
+            compute_client: AsyncClient,
+            compute_project: Project,
+            vm: dict
+    ) -> None:
+
+        params = {"type": "nio_udp",
+                  "lport": 4242,
+                  "rport": 4343,
+                  "rhost": "127.0.0.1"}
+
+        url = app.url_path_for("compute:create_cloud_nio",
+                               project_id=vm["project_id"],
+                               node_id=vm["node_id"],
+                               adapter_number="0",
+                               port_number="0")
+        await compute_client.post(url, json=params)
+
+        url = app.url_path_for("compute:delete_cloud_nio",
+                               project_id=vm["project_id"],
+                               node_id=vm["node_id"],
+                               adapter_number="0",
+                               port_number="0")
+        with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud._start_ubridge"):
+            response = await compute_client.delete(url)
         assert response.status_code == status.HTTP_204_NO_CONTENT
-        assert mock.called
 
 
-# @pytest.mark.asyncio
-# async def test_cloud_pcap(compute_api, vm, compute_project):
-#
-#     from itertools import repeat
-#     stream = repeat(42, times=10)
-#
-#     with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud.get_nio"):
-#         with asyncio_patch("gns3server.compute.builtin.Builtin.stream_pcap_file", return_value=stream):
-#             response = await compute_api.get("/projects/{project_id}/cloud/nodes/{node_id}/adapters/0/ports/0/pcap".format(project_id=compute_project.id, node_id=vm["node_id"]))
-#             assert response.status_code == 200
-#
+    async def test_cloud_delete(
+            self, app: FastAPI,
+            compute_client: AsyncClient,
+            compute_project: Project,
+            vm: dict
+    ) -> None:
+
+        response = await compute_client.delete(app.url_path_for("compute:delete_cloud", project_id=vm["project_id"], node_id=vm["node_id"]))
+        assert response.status_code == status.HTTP_204_NO_CONTENT
+
+
+    async def test_cloud_update(
+            self, app: FastAPI,
+            compute_client: AsyncClient,
+            vm: dict
+    ) -> None:
+
+        response = await compute_client.put(app.url_path_for("compute:update_cloud", project_id=vm["project_id"], node_id=vm["node_id"]),
+                                    json={"name": "test"})
+        assert response.status_code == status.HTTP_200_OK
+        assert response.json()["name"] == "test"
+
+
+    async def test_cloud_start_capture(
+            self, app: FastAPI,
+            compute_client: AsyncClient,
+            vm: dict
+    ) -> None:
+
+        params = {
+            "capture_file_name": "test.pcap",
+            "data_link_type": "DLT_EN10MB"
+        }
+
+        with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud.start_capture") as mock:
+            response = await compute_client.post(app.url_path_for("compute:start_cloud_capture",
+                                                          project_id=vm["project_id"],
+                                                          node_id=vm["node_id"],
+                                                          adapter_number="0",
+                                                          port_number="0"),
+                                         json=params)
+            assert response.status_code == status.HTTP_200_OK
+            assert mock.called
+            assert "test.pcap" in response.json()["pcap_file_path"]
+
+
+    async def test_cloud_stop_capture(self, app: FastAPI, compute_client: AsyncClient, vm: dict) -> None:
+
+        with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud.stop_capture") as mock:
+            response = await compute_client.post(app.url_path_for("compute:stop_cloud_capture",
+                                                          project_id=vm["project_id"],
+                                                          node_id=vm["node_id"],
+                                                          adapter_number="0",
+                                                          port_number="0"))
+            assert response.status_code == status.HTTP_204_NO_CONTENT
+            assert mock.called
+
+
+    # @pytest.mark.asyncio
+    # async def test_cloud_pcap(self, compute_api, vm, compute_project):
+    #
+    #     from itertools import repeat
+    #     stream = repeat(42, times=10)
+    #
+    #     with asyncio_patch("gns3server.compute.builtin.nodes.cloud.Cloud.get_nio"):
+    #         with asyncio_patch("gns3server.compute.builtin.Builtin.stream_pcap_file", return_value=stream):
+    #             response = await compute_api.get("/projects/{project_id}/cloud/nodes/{node_id}/adapters/0/ports/0/pcap".format(project_id=compute_project.id, node_id=vm["node_id"]))
+    #             assert response.status_code == 200
+    #