Return what is supported by a compute node

Ref https://github.com/GNS3/gns3-gui/issues/1448

tests/controller/test_compute.py

@@ -48,9 +48,6 @@ def test_host_ip(controller):
 def test_name():
     c = Compute("my_compute_id", protocol="https", host="example.com", port=84, controller=MagicMock(), name=None)
     assert c.name == "https://example.com:84"
-    with patch("gns3server.config.Config.get_section_config", return_value={"local": True}):
-        c = Compute("local", protocol="https", host="example.com", port=84, controller=MagicMock(), name=None)
-        assert c.name == socket.gethostname()
     c = Compute("world", protocol="https", host="example.com", port=84, controller=MagicMock(), name="hello")
     assert c.name == "hello"
     c = Compute("world", protocol="https", host="example.com", port=84, controller=MagicMock(), user="azertyuiopqsdfghjklkm")
@@ -88,10 +85,10 @@ def test_compute_httpQueryNotConnected(compute, controller, async_run):
     response.status = 200
     with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
         async_run(compute.post("/projects", {"a": "b"}))
-        mock.assert_any_call("GET", "https://example.com:84/v2/compute/version", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=False)
+        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=False)
         mock.assert_any_call("POST", "https://example.com:84/v2/compute/projects", data='{"a": "b"}', headers={'content-type': 'application/json'}, auth=None, chunked=False)
     assert compute._connected
-    assert compute.version == __version__
+    assert compute._capabilities["version"] == __version__
     controller.notification.emit.assert_called_with("compute.updated", compute.__json__())
 
 
@@ -103,7 +100,7 @@ def test_compute_httpQueryNotConnectedInvalidVersion(compute, async_run):
     with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
         with pytest.raises(aiohttp.web.HTTPConflict):
             async_run(compute.post("/projects", {"a": "b"}))
-        mock.assert_any_call("GET", "https://example.com:84/v2/compute/version", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=False)
+        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=False)
 
 
 def test_compute_httpQueryNotConnectedNonGNS3Server(compute, async_run):
@@ -114,7 +111,7 @@ def test_compute_httpQueryNotConnectedNonGNS3Server(compute, async_run):
     with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
         with pytest.raises(aiohttp.web.HTTPConflict):
             async_run(compute.post("/projects", {"a": "b"}))
-        mock.assert_any_call("GET", "https://example.com:84/v2/compute/version", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=False)
+        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=False)
 
 
 def test_compute_httpQueryNotConnectedNonGNS3Server2(compute, async_run):
@@ -125,7 +122,7 @@ def test_compute_httpQueryNotConnectedNonGNS3Server2(compute, async_run):
     with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
         with pytest.raises(aiohttp.web.HTTPConflict):
             async_run(compute.post("/projects", {"a": "b"}))
-        mock.assert_any_call("GET", "https://example.com:84/v2/compute/version", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=False)
+        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=False)
 
 
 def test_compute_httpQueryError(compute, async_run):
@@ -234,7 +231,11 @@ def test_json(compute):
         "user": "test",
         "cpu_usage_percent": None,
         "memory_usage_percent": None,
-        "connected": True
+        "connected": True,
+        "capabilities": {
+            "version": None,
+            "node_types": []
+        }
     }
     assert compute.__json__(topology_dump=True) == {
         "compute_id": "my_compute_id",

tests/controller/test_controller.py

@@ -71,7 +71,11 @@ def test_load(controller, controller_config_path, async_run):
         "user": "admin",
         "name": "http://admin@localhost:8000",
         "cpu_usage_percent": None,
-        "memory_usage_percent": None
+        "memory_usage_percent": None,
+        "capabilities": {
+            "version": None,
+            "node_types": []
+        }
     }
     assert controller.gns3vm.settings["vmname"] == "Test VM"
 
@@ -135,7 +139,7 @@ def test_isEnabled(controller):
     assert controller.is_enabled()
 
 
-def test_addCompute(controller, controller_config_path, async_run):
+def test_add_compute(controller, controller_config_path, async_run):
     controller._notification = MagicMock()
     c = async_run(controller.add_compute(compute_id="test1"))
     controller._notification.emit.assert_called_with("compute.created", c.__json__())

tests/handlers/api/compute/test_capabilities.py

@@ -0,0 +1,31 @@
+# -*- 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 /version endpoint
+It's also used for unittest the HTTP implementation.
+"""
+
+from gns3server.config import Config
+
+from gns3server.version import __version__
+
+
+def test_get(http_compute):
+    response = http_compute.get('/capabilities', example=True)
+    assert response.status == 200
+    assert response.json == {'node_types': ['cloud', 'nat', 'ethernet_hub', 'ethernet_switch', 'vpcs', 'virtualbox', 'dynamips', 'frame_relay_switch', 'atm_switch', 'qemu', 'vmware', 'docker', 'iou'], 'version': __version__}

tests/handlers/api/controller/test_compute.py

@@ -23,7 +23,7 @@ def test_compute_create_without_id(http_controller, controller):
 
     params = {
         "protocol": "http",
-        "host": "example.com",
+        "host": "localhost",
         "port": 84,
         "user": "julien",
         "password": "secure"
@@ -36,7 +36,7 @@ def test_compute_create_without_id(http_controller, controller):
     assert "password" not in response.json
 
     assert len(controller.computes) == 1
-    assert controller.computes[response.json["compute_id"]].host == "example.com"
+    assert controller.computes[response.json["compute_id"]].host == "localhost"
 
 
 def test_compute_create_with_id(http_controller, controller):
@@ -44,7 +44,7 @@ def test_compute_create_with_id(http_controller, controller):
     params = {
         "compute_id": "my_compute_id",
         "protocol": "http",
-        "host": "example.com",
+        "host": "localhost",
         "port": 84,
         "user": "julien",
         "password": "secure"
@@ -56,7 +56,7 @@ def test_compute_create_with_id(http_controller, controller):
     assert "password" not in response.json
 
     assert len(controller.computes) == 1
-    assert controller.computes["my_compute_id"].host == "example.com"
+    assert controller.computes["my_compute_id"].host == "localhost"
 
 
 def test_compute_get(http_controller, controller):
@@ -64,7 +64,7 @@ def test_compute_get(http_controller, controller):
     params = {
         "compute_id": "my_compute_id",
         "protocol": "http",
-        "host": "example.com",
+        "host": "localhost",
         "port": 84,
         "user": "julien",
         "password": "secure"
@@ -82,7 +82,7 @@ def test_compute_update(http_controller, controller):
     params = {
         "compute_id": "my_compute_id",
         "protocol": "http",
-        "host": "example.com",
+        "host": "localhost",
         "port": 84,
         "user": "julien",
         "password": "secure"
@@ -106,7 +106,7 @@ def test_compute_list(http_controller, controller):
     params = {
         "compute_id": "my_compute_id",
         "protocol": "http",
-        "host": "example.com",
+        "host": "localhost",
         "port": 84,
         "user": "julien",
         "password": "secure",
@@ -124,13 +124,17 @@ def test_compute_list(http_controller, controller):
             assert compute == {
                 'compute_id': 'my_compute_id',
                 'connected': False,
-                'host': 'example.com',
+                'host': 'localhost',
                 'port': 84,
                 'protocol': 'http',
                 'user': 'julien',
                 'name': 'My super server',
                 'cpu_usage_percent': None,
-                'memory_usage_percent': None
+                'memory_usage_percent': None,
+                'capabilities': {
+                    'version': None,
+                    'node_types': []
+                }
             }
 
 
@@ -139,7 +143,7 @@ def test_compute_delete(http_controller, controller):
     params = {
         "compute_id": "my_compute_id",
         "protocol": "http",
-        "host": "example.com",
+        "host": "localhost",
         "port": 84,
         "user": "julien",
         "password": "secure"
@@ -162,7 +166,7 @@ def test_compute_list_images(http_controller, controller):
     params = {
         "compute_id": "my_compute",
         "protocol": "http",
-        "host": "example.com",
+        "host": "localhost",
         "port": 84,
         "user": "julien",
         "password": "secure"
@@ -181,7 +185,7 @@ def test_compute_list_vms(http_controller, controller):
     params = {
         "compute_id": "my_compute",
         "protocol": "http",
-        "host": "example.com",
+        "host": "localhost",
         "port": 84,
         "user": "julien",
         "password": "secure"
@@ -200,7 +204,7 @@ def test_compute_create_img(http_controller, controller):
     params = {
         "compute_id": "my_compute",
         "protocol": "http",
-        "host": "example.com",
+        "host": "localhost",
         "port": 84,
         "user": "julien",
         "password": "secure"