Stream pcap from compute to controller to client

tests/controller/test_compute.py

@@ -179,3 +179,11 @@ def test_json(compute):
         "user": "test",
         "connected": True
     }
+
+
+def test_streamFile(project, async_run, compute):
+    response = MagicMock()
+    response.status = 200
+    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
+        async_run(compute.streamFile(project, "test/titi"))
+    mock.assert_called_with("GET", "https://example.com:84/v2/compute/projects/{}/stream/test/titi".format(project.id), auth=None)

tests/controller/test_link.py

@@ -18,6 +18,7 @@
 import pytest
 from unittest.mock import MagicMock
 
+
 from gns3server.controller.link import Link
 from gns3server.controller.vm import VM
 from gns3server.controller.compute import Compute

tests/controller/test_udp_link.py

@@ -19,6 +19,7 @@ import pytest
 import asyncio
 import aiohttp
 from unittest.mock import MagicMock
+from tests.utils import asyncio_patch
 
 from gns3server.controller.project import Project
 from gns3server.controller.compute import Compute
@@ -160,3 +161,17 @@ def test_capture(async_run, project):
     assert link.capturing is False
 
     compute1.post.assert_any_call("/projects/{}/iou/vms/{}/adapters/3/ports/1/stop_capture".format(project.id, vm_iou.id))
+
+
+def test_read_pcap(project, async_run):
+    compute1 = MagicMock()
+
+    link = UDPLink(project)
+    async_run(link.addVM(compute1, 0, 4))
+    async_run(link.addVM(compute1, 3, 1))
+
+    capture = async_run(link.start_capture())
+    assert link._capture_vm is not None
+
+    async_run(link.read_pcap())
+    link._capture_vm["vm"].compute.streamFile.assert_called_with(project, "tmp/captures/" + link.capture_file_name())

tests/handlers/api/compute/test_file.py

@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2015 GNS3 Technologies Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-This test suite check /files endpoint
-"""
-
-import json
-import asyncio
-import aiohttp
-
-from gns3server.version import __version__
-
-
-def test_stream(http_compute, tmpdir, loop):
-    with open(str(tmpdir / "test"), 'w+') as f:
-        f.write("hello")
-
-    def go(future):
-        query = json.dumps({"location": str(tmpdir / "test")})
-        headers = {'content-type': 'application/json'}
-        response = yield from aiohttp.request("GET", http_compute.get_url("/files/stream"), data=query, headers=headers)
-        response.body = yield from response.content.read(5)
-        with open(str(tmpdir / "test"), 'a') as f:
-            f.write("world")
-        response.body += yield from response.content.read(5)
-        response.close()
-        future.set_result(response)
-
-    future = asyncio.Future()
-    asyncio.async(go(future))
-    response = loop.run_until_complete(future)
-    assert response.status == 200
-    assert response.body == b'helloworld'
-
-
-def test_stream_file_not_found(http_compute, tmpdir, loop):
-    def go(future):
-        query = json.dumps({"location": str(tmpdir / "test")})
-        headers = {'content-type': 'application/json'}
-        response = yield from aiohttp.request("GET", http_compute.get_url("/files/stream"), data=query, headers=headers)
-        response.close()
-        future.set_result(response)
-
-    future = asyncio.Future()
-    asyncio.async(go(future))
-    response = loop.run_until_complete(future)
-    assert response.status == 404

tests/handlers/api/compute/test_project.py

@@ -218,6 +218,25 @@ def test_get_file(http_compute, tmpdir):
     assert response.status == 403
 
 
+def test_stream_file(http_compute, tmpdir):
+
+    with patch("gns3server.config.Config.get_section_config", return_value={"project_directory": str(tmpdir)}):
+        project = ProjectManager.instance().create_project(project_id="01010203-0405-0607-0809-0a0b0c0d0e0b")
+
+    with open(os.path.join(project.path, "hello"), "w+") as f:
+        f.write("world")
+
+    response = http_compute.get("/projects/{project_id}/files/hello".format(project_id=project.id), raw=True)
+    assert response.status == 200
+    assert response.body == b"world"
+
+    response = http_compute.get("/projects/{project_id}/files/false".format(project_id=project.id), raw=True)
+    assert response.status == 404
+
+    response = http_compute.get("/projects/{project_id}/files/../hello".format(project_id=project.id), raw=True)
+    assert response.status == 403
+
+
 def test_export(http_compute, tmpdir, loop, project):
 
     os.makedirs(project.path, exist_ok=True)

tests/handlers/api/controller/test_link.py

@@ -95,6 +95,15 @@ def test_stop_capture(http_controller, tmpdir, project, compute, async_run):
     assert response.status == 204
 
 
+def test_pcap(http_controller, tmpdir, project, compute, async_run):
+    link = Link(project)
+    link
+    project._links = {link.id: link}
+    with asyncio_patch("gns3server.controller.link.Link.read_pcap", return_value=None) as mock:
+        response = http_controller.get("/projects/{}/links/{}/pcap".format(project.id, link.id), example=True)
+    assert mock.called
+
+
 def test_delete_link(http_controller, tmpdir, project, compute, async_run):
 
     link = Link(project)