Add total RAM, CPUs and disk size to servers summary as well as disk usage in percent. Fixes https://github.com/GNS3/gns3-server/issues/1532

tests/handlers/api/compute/test_capabilities.py

@@ -18,8 +18,10 @@
 
 import sys
 import pytest
+import psutil
 
 from gns3server.version import __version__
+from gns3server.utils.path import get_default_project_directory
 
 
 @pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
@@ -27,7 +29,13 @@ async def test_get(compute_api, windows_platform):
 
     response = await compute_api.get('/capabilities')
     assert response.status == 200
-    assert response.json == {'node_types': ['cloud', 'ethernet_hub', 'ethernet_switch', 'nat', 'vpcs', 'virtualbox', 'dynamips', 'frame_relay_switch', 'atm_switch', 'qemu', 'vmware', 'traceng', 'docker', 'iou'], 'version': __version__, 'platform': sys.platform}
+    assert response.json == {'node_types': ['cloud', 'ethernet_hub', 'ethernet_switch', 'nat', 'vpcs', 'virtualbox', 'dynamips', 'frame_relay_switch', 'atm_switch', 'qemu', 'vmware', 'traceng', 'docker', 'iou'],
+                             'version': __version__,
+                             'platform': sys.platform,
+                             'cpus': psutil.cpu_count(logical=True),
+                             'memory': psutil.virtual_memory().total,
+                             'disk_size': psutil.disk_usage(get_default_project_directory()).total,
+                             }
 
 
 @pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
@@ -35,4 +43,10 @@ async def test_get_on_gns3vm(compute_api, on_gns3vm):
 
     response = await compute_api.get('/capabilities')
     assert response.status == 200
-    assert response.json == {'node_types': ['cloud', 'ethernet_hub', 'ethernet_switch', 'nat', 'vpcs', 'virtualbox', 'dynamips', 'frame_relay_switch', 'atm_switch', 'qemu', 'vmware', 'traceng', 'docker', 'iou'], 'version': __version__, 'platform': sys.platform}
+    assert response.json == {'node_types': ['cloud', 'ethernet_hub', 'ethernet_switch', 'nat', 'vpcs', 'virtualbox', 'dynamips', 'frame_relay_switch', 'atm_switch', 'qemu', 'vmware', 'traceng', 'docker', 'iou'],
+                             'version': __version__,
+                             'platform': sys.platform,
+                             'cpus': psutil.cpu_count(logical=True),
+                             'memory': psutil.virtual_memory().total,
+                             'disk_size': psutil.disk_usage(get_default_project_directory()).total,
+                             }

tests/handlers/api/controller/test_compute.py

@@ -133,9 +133,13 @@ async def test_compute_list(controller_api):
                 'name': 'My super server',
                 'cpu_usage_percent': None,
                 'memory_usage_percent': None,
+                'disk_usage_percent': None,
                 'last_error': None,
                 'capabilities': {
                     'version': None,
+                    'cpus': None,
+                    'memory': None,
+                    'disk_size': None,
                     'node_types': []
                 }
             }