Merge 2.1 into 2.2 branch

gns3server/handlers/api/compute/iou_handler.py

@@ -65,6 +65,8 @@ class IOUHandler:
 
         for name, value in request.json.items():
             if hasattr(vm, name) and getattr(vm, name) != value:
+                if name == "application_id":
+                    continue  # we must ignore this to avoid overwriting the application_id allocated by the IOU manager
                 if name == "startup_config_content" and (vm.startup_config_content and len(vm.startup_config_content) > 0):
                     continue
                 if name == "private_config_content" and (vm.private_config_content and len(vm.private_config_content) > 0):
@@ -116,6 +118,8 @@ class IOUHandler:
 
         for name, value in request.json.items():
             if hasattr(vm, name) and getattr(vm, name) != value:
+                if name == "application_id":
+                    continue  # we must ignore this to avoid overwriting the application_id allocated by the IOU manager
                 setattr(vm, name, value)
 
         if vm.use_default_iou_values:

gns3server/handlers/api/compute/project_handler.py

@@ -19,12 +19,12 @@ import aiohttp
 import asyncio
 import json
 import os
-import psutil
 import tempfile
 
 from gns3server.web.route import Route
 from gns3server.compute.project_manager import ProjectManager
 from gns3server.compute import MODULES
+from gns3server.utils.ping_stats import PingStats
 
 from gns3server.schemas.project import (
     PROJECT_OBJECT_SCHEMA,
@@ -186,11 +186,7 @@ class ProjectHandler:
 
         :returns: hash
         """
-        stats = {}
-        # Non blocking call in order to get cpu usage. First call will return 0
-        stats["cpu_usage_percent"] = psutil.cpu_percent(interval=None)
-        stats["memory_usage_percent"] = psutil.virtual_memory().percent
-        return {"action": "ping", "event": stats}
+        return {"action": "ping", "event": PingStats.get()}
 
     @Route.get(
         r"/projects/{project_id}/files",

gns3server/handlers/api/controller/symbol_handler.py

@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import aiohttp
 from gns3server.web.route import Route
 from gns3server.controller import Controller
 
@@ -62,12 +63,15 @@ class SymbolHandler:
     def upload(request, response):
         controller = Controller.instance()
         path = os.path.join(controller.symbols.symbols_path(), os.path.basename(request.match_info["symbol_id"]))
-        with open(path, 'wb+') as f:
-            while True:
-                packet = yield from request.content.read(512)
-                if not packet:
-                    break
-                f.write(packet)
+        try:
+            with open(path, 'wb') as f:
+                while True:
+                    packet = yield from request.content.read(512)
+                    if not packet:
+                        break
+                    f.write(packet)
+        except OSError as e:
+            raise aiohttp.web.HTTPConflict(text="Could not write symbol file '{}': {}".format(path, e))
         # Reset the symbol list
         controller.symbols.list()
         response.set_status(204)