Merge remote-tracking branch 'origin/master' into 2.1

gns3server/compute/qemu/qemu_vm.py

@@ -1305,14 +1305,6 @@ class QemuVM(BaseNode):
         else:
             return []
 
-    def _spice_options(self):
-
-        if self._console:
-            return ["-spice",
-                    "addr={},port={},disable-ticketing".format(self._manager.port_manager.console_host, self._console)]
-        else:
-            return []
-
     def _monitor_options(self):
 
         if self._monitor:
@@ -1592,8 +1584,6 @@ class QemuVM(BaseNode):
             command.extend(self._serial_options())
         elif self._console_type == "vnc":
             command.extend(self._vnc_options())
-        elif self._console_type == "spice":
-            command.extend(self._spice_options())
         else:
             raise QemuError("Console type {} is unknown".format(self._console_type))
         command.extend(self._monitor_options())

gns3server/handlers/api/controller/project_handler.py

@@ -391,7 +391,7 @@ class ProjectHandler:
         controller = Controller.instance()
         project = yield from controller.get_loaded_project(request.match_info["project_id"])
         path = request.match_info["path"]
-        path = os.path.normpath(path)
+        path = os.path.normpath(path).strip('/')
 
         # Raise error if user try to escape
         if path[0] == ".":

gns3server/schemas/node.py

@@ -144,7 +144,7 @@ NODE_OBJECT_SCHEMA = {
         },
         "console_type": {
             "description": "Console type",
-            "enum": ["vnc", "telnet", "http", "spice", None]
+            "enum": ["vnc", "telnet", "http", None]
         },
         "properties": {
             "description": "Properties specific to an emulator",

gns3server/schemas/qemu.py

@@ -63,7 +63,7 @@ QEMU_CREATE_SCHEMA = {
         },
         "console_type": {
             "description": "Console type",
-            "enum": ["telnet", "vnc", "spice"]
+            "enum": ["telnet", "vnc"]
         },
         "hda_disk_image": {
             "description": "QEMU hda disk image path",
@@ -244,7 +244,7 @@ QEMU_UPDATE_SCHEMA = {
         },
         "console_type": {
             "description": "Console type",
-            "enum": ["telnet", "vnc", "spice"]
+            "enum": ["telnet", "vnc"]
         },
         "linked_clone": {
             "description": "Whether the VM is a linked clone or not",
@@ -541,7 +541,7 @@ QEMU_OBJECT_SCHEMA = {
         },
         "console_type": {
             "description": "Console type",
-            "enum": ["telnet", "vnc", "spice"]
+            "enum": ["telnet", "vnc"]
         },
         "initrd": {
             "description": "QEMU initrd path",