Merge branch '2.0' into 2.1

gns3server/controller/__init__.py

@@ -35,6 +35,7 @@ from ..version import __version__
 from .topology import load_topology
 from .gns3vm import GNS3VM
 from ..utils.get_resource import get_resource
+from .gns3vm.gns3_vm_error import GNS3VMError
 
 import logging
 log = logging.getLogger(__name__)
@@ -159,10 +160,13 @@ class Controller:
         for c in computes:
             try:
                 yield from self.add_compute(**c)
-            except aiohttp.web_exceptions.HTTPConflict:
+            except (aiohttp.web_exceptions.HTTPConflict):
                 pass  # Skip not available servers at loading
         yield from self.load_projects()
-        yield from self.gns3vm.auto_start_vm()
+        try:
+            yield from self.gns3vm.auto_start_vm()
+        except GNS3VMError as e:
+            log.warn(str(e))
         yield from self._project_auto_open()
 
     def _update_config(self):
@@ -215,9 +219,12 @@ class Controller:
                     "password": c.password,
                     "compute_id": c.id
                 })
-        os.makedirs(os.path.dirname(self._config_file), exist_ok=True)
-        with open(self._config_file, 'w+') as f:
-            json.dump(data, f, indent=4)
+        try:
+            os.makedirs(os.path.dirname(self._config_file), exist_ok=True)
+            with open(self._config_file, 'w+') as f:
+                json.dump(data, f, indent=4)
+        except OSError as e:
+            log.error("Can't write the configuration {}: {}".format(self._config_file, str(e)))
 
     @asyncio.coroutine
     def _load_controller_settings(self):

gns3server/controller/gns3vm/__init__.py

@@ -18,6 +18,7 @@
 import sys
 import copy
 import asyncio
+import aiohttp
 
 from ...utils.asyncio import locked_coroutine
 from .vmware_gns3_vm import VMwareGNS3VM
@@ -242,10 +243,13 @@ class GNS3VM:
                 yield from self.start()
             except GNS3VMError as e:
                 # User will receive the error later when they will try to use the node
-                yield from self._controller.add_compute(compute_id="vm",
-                                                        name="GNS3 VM ({})".format(self.current_engine().vmname),
-                                                        host=None,
-                                                        force=True)
+                try:
+                    yield from self._controller.add_compute(compute_id="vm",
+                                                            name="GNS3 VM ({})".format(self.current_engine().vmname),
+                                                            host=None,
+                                                            force=True)
+                except aiohttp.web.HTTPConflict:
+                    pass
                 log.error("Can't start the GNS3 VM: {}", str(e))
 
     @asyncio.coroutine

gns3server/controller/project.py

@@ -674,7 +674,7 @@ class Project:
             self.dump()
         # We catch all error to be able to rollback the .gns3 to the previous state
         except Exception as e:
-            for compute in self._project_created_on_compute:
+            for compute in list(self._project_created_on_compute):
                 try:
                     yield from compute.post("/projects/{}/close".format(self._id))
                 # We don't care if a compute is down at this step

gns3server/controller/topology.py

@@ -291,8 +291,11 @@ def _convert_1_3_later(topo, topo_path):
         except KeyError:
             node["compute_id"] = "local"
         node["console_type"] = old_node["properties"].get("console_type", "telnet")
-        node["name"] = old_node["label"]["text"]
-        node["label"] = _convert_label(old_node["label"])
+        if "label" in old_node:
+            node["name"] = old_node["label"]["text"]
+            node["label"] = _convert_label(old_node["label"])
+        else:
+            node["name"] = old_node["properties"]["name"]
         node["node_id"] = old_node.get("vm_id", str(uuid.uuid4()))
 
         node["symbol"] = old_node.get("symbol", None)