Success to add a dynamips with apiv2

tests/controller/test_project.py

@@ -19,6 +19,7 @@
 import pytest
 import aiohttp
 from unittest.mock import MagicMock
+from tests.utils import AsyncioMagicMock
 
 
 from gns3server.controller.project import Project
@@ -40,10 +41,15 @@ def test_json(tmpdir):
 def test_addVM(async_run):
     hypervisor = MagicMock()
     project = Project()
+
+    response = MagicMock()
+    response.json = {"console": 2048}
+    hypervisor.post = AsyncioMagicMock(return_value=response)
+
     vm = async_run(project.addVM(hypervisor, None, name="test", vm_type="vpcs", properties={"startup_config": "test.cfg"}))
+
     hypervisor.post.assert_called_with('/projects/{}/vpcs/vms'.format(project.id),
-                                       data={'console': None,
-                                             'vm_id': vm.id,
+                                       data={'vm_id': vm.id,
                                              'console_type': 'telnet',
                                              'startup_config': 'test.cfg',
                                              'name': 'test'})
@@ -52,6 +58,11 @@ def test_addVM(async_run):
 def test_getVM(async_run):
     hypervisor = MagicMock()
     project = Project()
+
+    response = MagicMock()
+    response.json = {"console": 2048}
+    hypervisor.post = AsyncioMagicMock(return_value=response)
+
     vm = async_run(project.addVM(hypervisor, None, name="test", vm_type="vpcs", properties={"startup_config": "test.cfg"}))
     assert project.getVM(vm.id) == vm
 
@@ -62,6 +73,11 @@ def test_getVM(async_run):
 def test_addLink(async_run):
     hypervisor = MagicMock()
     project = Project()
+
+    response = MagicMock()
+    response.json = {"console": 2048}
+    hypervisor.post = AsyncioMagicMock(return_value=response)
+
     vm1 = async_run(project.addVM(hypervisor, None, name="test1", vm_type="vpcs", properties={"startup_config": "test.cfg"}))
     vm2 = async_run(project.addVM(hypervisor, None, name="test2", vm_type="vpcs", properties={"startup_config": "test.cfg"}))
     link = async_run(project.addLink())
@@ -73,6 +89,11 @@ def test_addLink(async_run):
 def test_getLink(async_run):
     hypervisor = MagicMock()
     project = Project()
+
+    response = MagicMock()
+    response.json = {"console": 2048}
+    hypervisor.post = AsyncioMagicMock(return_value=response)
+
     link = async_run(project.addLink())
     assert project.getLink(link.id) == link
 

tests/controller/test_vm.py

@@ -17,16 +17,19 @@
 
 import pytest
 import uuid
+import asyncio
 from unittest.mock import MagicMock
 
 
+from tests.utils import AsyncioMagicMock
+
 from gns3server.controller.vm import VM
 from gns3server.controller.project import Project
 
 
 @pytest.fixture
 def hypervisor():
-    s = MagicMock()
+    s = AsyncioMagicMock()
     s.id = "http://test.com:42"
     return s
 
@@ -64,15 +67,44 @@ def test_init_without_uuid(project, hypervisor):
 
 
 def test_create(vm, hypervisor, project, async_run):
+    vm._console = 2048
+
+    response = MagicMock()
+    response.json = {"console": 2048}
+    hypervisor.post = AsyncioMagicMock(return_value=response)
+
     async_run(vm.create())
     data = {
-        "console": None,
+        "console": 2048,
         "console_type": "vnc",
         "vm_id": vm.id,
         "startup_script": "echo test",
         "name": "demo"
     }
     hypervisor.post.assert_called_with("/projects/{}/vpcs/vms".format(vm.project.id), data=data)
+    assert vm._console == 2048
+    assert vm._properties == {"startup_script": "echo test"}
+
+
+def test_create_without_console(vm, hypervisor, project, async_run):
+    """
+    None properties should be send. Because it can mean the emulator doesn"t support it
+    """
+
+    response = MagicMock()
+    response.json = {"console": 2048, "test_value": "success"}
+    hypervisor.post = AsyncioMagicMock(return_value=response)
+
+    async_run(vm.create())
+    data = {
+        "console_type": "vnc",
+        "vm_id": vm.id,
+        "startup_script": "echo test",
+        "name": "demo"
+    }
+    hypervisor.post.assert_called_with("/projects/{}/vpcs/vms".format(vm.project.id), data=data)
+    assert vm._console == 2048
+    assert vm._properties == {"test_value": "success", "startup_script": "echo test"}
 
 
 def test_post(vm, hypervisor, async_run):