UUID support for VMs.

Basic VirtualBox support (create, start and stop).
Some refactoring for BaseVM class.
Updated CURL command in tests.

tests/api/base.py

@@ -25,6 +25,7 @@ import pytest
 from aiohttp import web
 import aiohttp
 
+
 from gns3server.web.route import Route
 #TODO: get rid of *
 from gns3server.handlers import *
@@ -95,7 +96,7 @@ class Query:
         if path is None:
             return
         with open(self._example_file_path(method, path), 'w+') as f:
-            f.write("curl -i -x{} 'http://localhost:8000{}'".format(method, path))
+            f.write("curl -i -X {} 'http://localhost:8000{}'".format(method, path))
             if body:
                 f.write(" -d '{}'".format(re.sub(r"\n", "", json.dumps(json.loads(body), sort_keys=True))))
             f.write("\n\n")
@@ -116,7 +117,7 @@ class Query:
 
     def _example_file_path(self, method, path):
         path = re.sub('[^a-z0-9]', '', path)
-        return "docs/api/examples/{}_{}.txt".format(method.lower(), path)
+        return "docs/api/examples/{}_{}.txt".format(method.lower(), path)  # FIXME: cannot find path when running tests
 
 
 def _get_unused_port():

tests/api/test_virtualbox.py

@@ -0,0 +1,41 @@
+# -*- 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/>.
+
+from tests.utils import asyncio_patch
+
+
+@asyncio_patch("gns3server.modules.VirtualBox.create_vm", return_value="61d61bdd-aa7d-4912-817f-65a9eb54d3ab")
+def test_vbox_create(server):
+    response = server.post("/virtualbox", {"name": "VM1"}, example=False)
+    assert response.status == 200
+    assert response.route == "/virtualbox"
+    assert response.json["name"] == "VM1"
+    assert response.json["uuid"] == "61d61bdd-aa7d-4912-817f-65a9eb54d3ab"
+
+
+@asyncio_patch("gns3server.modules.VirtualBox.start_vm", return_value=True)
+def test_vbox_start(server):
+    response = server.post("/virtualbox/61d61bdd-aa7d-4912-817f-65a9eb54d3ab/start", {}, example=False)
+    assert response.status == 204
+    assert response.route == "/virtualbox/61d61bdd-aa7d-4912-817f-65a9eb54d3ab/start"
+
+
+@asyncio_patch("gns3server.modules.VirtualBox.stop_vm", return_value=True)
+def test_vbox_stop(server):
+    response = server.post("/virtualbox/61d61bdd-aa7d-4912-817f-65a9eb54d3ab/stop", {}, example=False)
+    assert response.status == 204
+    assert response.route == "/virtualbox/61d61bdd-aa7d-4912-817f-65a9eb54d3ab/stop"

tests/api/test_vpcs.py

@@ -15,55 +15,49 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from tests.api.base import server, loop
 from tests.utils import asyncio_patch
-from gns3server import modules
 from unittest.mock import patch
 
-@asyncio_patch('gns3server.modules.VPCS.create_vm', return_value=84)
+
+@asyncio_patch("gns3server.modules.VPCS.create_vm", return_value="61d61bdd-aa7d-4912-817f-65a9eb54d3ab")
 def test_vpcs_create(server):
-    response = server.post('/vpcs', {'name': 'PC TEST 1'}, example=False)
+    response = server.post("/vpcs", {"name": "PC TEST 1"}, example=False)
     assert response.status == 200
-    assert response.route == '/vpcs'
-    assert response.json['name'] == 'PC TEST 1'
-    assert response.json['id'] == 84
+    assert response.route == "/vpcs"
+    assert response.json["name"] == "PC TEST 1"
+    assert response.json["uuid"] == "61d61bdd-aa7d-4912-817f-65a9eb54d3ab"
 
 
+#FIXME
 def test_vpcs_nio_create_udp(server):
-    vm = server.post('/vpcs', {'name': 'PC TEST 1'})
-    response = server.post('/vpcs/{}/ports/0/nio'.format(vm.json["id"]), {
-            'type': 'nio_udp',
-            'lport': 4242,
-            'rport': 4343,
-            'rhost': '127.0.0.1'
-        },
-        example=True)
+    vm = server.post("/vpcs", {"name": "PC TEST 1"})
+    response = server.post("/vpcs/{}/ports/0/nio".format(vm.json["uuid"]), {"type": "nio_udp",
+                                                                            "lport": 4242,
+                                                                            "rport": 4343,
+                                                                            "rhost": "127.0.0.1"},
+                           example=True)
     assert response.status == 200
-    assert response.route == '/vpcs/{id:\d+}/ports/{port_id}/nio'
-    assert response.json['type'] == 'nio_udp'
+    assert response.route == "/vpcs/{uuid}/ports/{port_id}/nio"
+    assert response.json["type"] == "nio_udp"
+
 
 @patch("gns3server.modules.vpcs.vpcs_device.has_privileged_access", return_value=True)
 def test_vpcs_nio_create_tap(mock, server):
-    vm = server.post('/vpcs', {'name': 'PC TEST 1'})
-    response = server.post('/vpcs/{}/ports/0/nio'.format(vm.json["id"]), {
-            'type': 'nio_tap',
-            'tap_device': 'test',
-        })
+    vm = server.post("/vpcs", {"name": "PC TEST 1"})
+    response = server.post("/vpcs/{}/ports/0/nio".format(vm.json["uuid"]), {"type": "nio_tap",
+                                                                            "tap_device": "test"})
     assert response.status == 200
-    assert response.route == '/vpcs/{id:\d+}/ports/{port_id}/nio'
-    assert response.json['type'] == 'nio_tap'
+    assert response.route == "/vpcs/{uuid}/ports/{port_id}/nio"
+    assert response.json["type"] == "nio_tap"
 
+
+#FIXME
 def test_vpcs_delete_nio(server):
-    vm = server.post('/vpcs', {'name': 'PC TEST 1'})
-    response = server.post('/vpcs/{}/ports/0/nio'.format(vm.json["id"]), {
-            'type': 'nio_udp',
-            'lport': 4242,
-            'rport': 4343,
-            'rhost': '127.0.0.1'
-        },
-        )
-    response = server.delete('/vpcs/{}/ports/0/nio'.format(vm.json["id"]), example=True)
+    vm = server.post("/vpcs", {"name": "PC TEST 1"})
+    response = server.post("/vpcs/{}/ports/0/nio".format(vm.json["uuid"]), {"type": "nio_udp",
+                                                                            "lport": 4242,
+                                                                            "rport": 4343,
+                                                                            "rhost": "127.0.0.1"})
+    response = server.delete("/vpcs/{}/ports/0/nio".format(vm.json["uuid"]), example=True)
     assert response.status == 200
-    assert response.route == '/vpcs/{id:\d+}/ports/{port_id}/nio'
-
-
+    assert response.route == "/vpcs/{uuid}/ports/{port_id}/nio"