A notification stream with process monitoring

tests/handlers/api/test_project.py

@@ -20,9 +20,13 @@ This test suite check /project endpoint
 """
 
 import uuid
+import asyncio
+import aiohttp
 from unittest.mock import patch
 from tests.utils import asyncio_patch
 
+from gns3server.handlers.api.project_handler import ProjectHandler
+
 
 def test_create_project_with_path(server, tmpdir):
     with patch("gns3server.modules.project.Project.is_local", return_value=True):
@@ -139,6 +143,38 @@ def test_close_project(server, project):
         assert mock.called
 
 
+def test_close_project_two_client_connected(server, project):
+
+    ProjectHandler._notifications_listening = 2
+
+    with asyncio_patch("gns3server.modules.project.Project.close", return_value=True) as mock:
+        response = server.post("/projects/{project_id}/close".format(project_id=project.id), example=True)
+        assert response.status == 204
+        assert not mock.called
+
+
 def test_close_project_invalid_uuid(server):
     response = server.post("/projects/{project_id}/close".format(project_id=uuid.uuid4()))
     assert response.status == 404
+
+
+def test_notification(server, project, loop):
+    @asyncio.coroutine
+    def go(future):
+        response = yield from aiohttp.request("GET", server.get_url("/projects/{project_id}/notifications".format(project_id=project.id), 1))
+        response.body = yield from response.content.read(19)
+        project.emit("vm.created", {"a": "b"})
+        response.body += yield from response.content.read(47)
+        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'{"action": "ping"}\n{"action": "vm.created", "event": {"a": "b"}}\n'
+
+
+def test_notification_invalid_id(server, project):
+    response = server.get("/projects/{project_id}/notifications".format(project_id=uuid.uuid4()))
+    assert response.status == 404

tests/handlers/api/test_vpcs.py

@@ -42,7 +42,8 @@ def test_vpcs_get(server, project, vm):
     assert response.route == "/projects/{project_id}/vpcs/vms/{vm_id}"
     assert response.json["name"] == "PC TEST 1"
     assert response.json["project_id"] == project.id
-    assert response.json["startup_script_path"] == None
+    assert response.json["startup_script_path"] is None
+    assert response.json["status"] == "stopped"
 
 
 def test_vpcs_create_startup_script(server, project):
@@ -95,6 +96,7 @@ def test_vpcs_delete_nio(server, vm):
 
 
 def test_vpcs_start(server, vm):
+
     with asyncio_patch("gns3server.modules.vpcs.vpcs_vm.VPCSVM.start", return_value=True) as mock:
         response = server.post("/projects/{project_id}/vpcs/vms/{vm_id}/start".format(project_id=vm["project_id"], vm_id=vm["vm_id"]), example=True)
         assert mock.called

tests/modules/vpcs/test_vpcs_vm.py

@@ -72,6 +72,7 @@ def test_vm_invalid_vpcs_path(project, manager, loop):
 def test_start(loop, vm):
     process = MagicMock()
     process.returncode = None
+    queue = vm.project.get_listen_queue()
 
     with asyncio_patch("gns3server.modules.vpcs.vpcs_vm.VPCSVM._check_requirements", return_value=True):
         with asyncio_patch("asyncio.create_subprocess_exec", return_value=process):
@@ -79,6 +80,9 @@ def test_start(loop, vm):
             vm.port_add_nio_binding(0, nio)
             loop.run_until_complete(asyncio.async(vm.start()))
             assert vm.is_running()
+    (action, event) = queue.get_nowait()
+    assert action == "vm.started"
+    assert event == vm
 
 
 def test_stop(loop, vm):
@@ -98,6 +102,8 @@ def test_stop(loop, vm):
             loop.run_until_complete(asyncio.async(vm.start()))
             assert vm.is_running()
 
+            queue = vm.project.get_listen_queue()
+
             with asyncio_patch("gns3server.utils.asyncio.wait_for_process_termination"):
                 loop.run_until_complete(asyncio.async(vm.stop()))
             assert vm.is_running() is False
@@ -107,6 +113,10 @@ def test_stop(loop, vm):
             else:
                 process.terminate.assert_called_with()
 
+            (action, event) = queue.get_nowait()
+            assert action == "vm.stopped"
+            assert event == vm
+
 
 def test_reload(loop, vm):
     process = MagicMock()