Merge branch '2.0' into 2.1

gns3server/compute/docker/__init__.py

@@ -33,7 +33,9 @@ from gns3server.compute.docker.docker_error import DockerError, DockerHttp304Err
 log = logging.getLogger(__name__)
 
 
+# Be carefull to keep it consistent
 DOCKER_MINIMUM_API_VERSION = "1.25"
+DOCKER_MINIMUM_VERSION = "1.13"
 
 
 class Docker(BaseManager):
@@ -60,7 +62,7 @@ class Docker(BaseManager):
                 self._connected = False
                 raise DockerError("Can't connect to docker daemon")
             if parse_version(version["ApiVersion"]) < parse_version(DOCKER_MINIMUM_API_VERSION):
-                raise DockerError("Docker API version is {}. GNS3 requires a minimum API version of {}".format(version["ApiVersion"], DOCKER_MINIMUM_API_VERSION))
+                raise DockerError("Docker version is {}. GNS3 requires a minimum version of {}".format(version["Version"], DOCKER_MINIMUM_VERSION))
 
     def connector(self):
         if self._connector is None or self._connector.closed:
@@ -113,11 +115,13 @@ class Docker(BaseManager):
         :returns: HTTP response
         """
         data = json.dumps(data)
-        url = "http://docker/v" + DOCKER_MINIMUM_API_VERSION + "/" + path
-
         if timeout is None:
             timeout = 60 * 60 * 24 * 31  # One month timeout
 
+        if path == 'version':
+            url = "http://docker/v1.12/" + path         # API of docker v1.0
+        else:
+            url = "http://docker/v" + DOCKER_MINIMUM_API_VERSION + "/" + path
         try:
             if path != "version":  # version is use by check connection
                 yield from self._check_connection()

gns3server/compute/docker/docker_vm.py

@@ -213,7 +213,7 @@ class DockerVM(BaseNode):
 
         self._volumes = ["/etc/network"]
 
-        volumes = image_infos.get("ContainerConfig", {}).get("Volumes")
+        volumes = image_infos.get("Config", {}).get("Volumes")
         if volumes is None:
             return binds
         for volume in volumes.keys():
@@ -361,7 +361,7 @@ class DockerVM(BaseNode):
                     try:
                         yield from self._add_ubridge_connection(nio, adapter_number)
                     except UbridgeNamespaceError:
-                        log.error("Container {} failed to start", self.name)
+                        log.error("Container %s failed to start", self.name)
                         yield from self.stop()
 
                         # The container can crash soon after the start, this means we can not move the interface to the container namespace

gns3server/controller/compute.py

@@ -580,8 +580,10 @@ class Compute:
         Forward a call to the emulator on compute
         """
         try:
-            res = yield from self.http_query(method, "/{}/{}".format(type, path), data=data, timeout=None)
+            action = "/{}/{}".format(type, path)
+            res = yield from self.http_query(method, action, data=data, timeout=None)
         except aiohttp.ServerDisconnectedError:
+            log.error("Connection lost to %s during %s %s", self._id, method, action)
             raise aiohttp.web.HTTPGatewayTimeout()
         return res.json
 

gns3server/controller/gns3vm/__init__.py

@@ -250,7 +250,7 @@ class GNS3VM:
                                                             force=True)
                 except aiohttp.web.HTTPConflict:
                     pass
-                log.error("Can't start the GNS3 VM: {}", str(e))
+                log.error("Can't start the GNS3 VM: %s", str(e))
 
     @asyncio.coroutine
     def exit_vm(self):
@@ -287,7 +287,7 @@ class GNS3VM:
                 yield from engine.start()
             except Exception as e:
                 yield from self._controller.delete_compute("vm")
-                log.error("Can't start the GNS3 VM: {}", str(e))
+                log.error("Can't start the GNS3 VM: {}".format(str(e)))
                 yield from compute.update(name="GNS3 VM ({})".format(engine.vmname))
                 raise e
             yield from compute.update(name="GNS3 VM ({})".format(engine.vmname),

gns3server/controller/import_project.py

@@ -24,7 +24,6 @@ import asyncio
 import zipfile
 import aiohttp
 
-from ..config import Config
 from .topology import load_topology
 
 
@@ -74,7 +73,7 @@ def import_project(controller, project_id, stream, location=None, name=None, kee
                 path = location
             else:
                 projects_path = controller.projects_directory()
-                path = os.path.join(projects_path, project_name)
+                path = os.path.join(projects_path, project_id)
             try:
                 os.makedirs(path, exist_ok=True)
             except UnicodeEncodeError as e:

gns3server/controller/project.py

@@ -699,7 +699,10 @@ class Project:
         self._loading = False
         # Should we start the nodes when project is open
         if self._auto_start:
-            yield from self.start_all()
+            # Start all in the background without waiting for completion
+            # we ignore errors because we want to let the user open
+            # their project and fix it
+            asyncio.async(self.start_all())
 
     @asyncio.coroutine
     def wait_loaded(self):

gns3server/controller/topology.py

@@ -321,6 +321,10 @@ def _convert_1_3_later(topo, topo_path):
 
         node["properties"] = {}
 
+        # Some old dynamips node don't have type
+        if "type" not in old_node:
+            old_node["type"] = old_node["properties"]["platform"].upper()
+
         if old_node["type"] == "VPCSDevice":
             node["node_type"] = "vpcs"
         elif old_node["type"] == "QemuVM":
@@ -348,7 +352,7 @@ def _convert_1_3_later(topo, topo_path):
             node["symbol"] = ":/symbols/ethernet_switch.svg"
             node["console_type"] = None
             node["properties"]["ports_mapping"] = []
-            for port in old_node["ports"]:
+            for port in old_node.get("ports", []):
                 node["properties"]["ports_mapping"].append({
                     "name": "Ethernet{}".format(port["port_number"] - 1),
                     "port_number": port["port_number"] - 1,
@@ -359,12 +363,12 @@ def _convert_1_3_later(topo, topo_path):
             node["node_type"] = "frame_relay_switch"
             node["symbol"] = ":/symbols/frame_relay_switch.svg"
             node["console_type"] = None
-        elif old_node["type"] in ["C1700", "C2600", "C2691", "C3600", "C3620", "C3640", "C3660", "C3725", "C3745", "C7200", "EtherSwitchRouter"]:
+        elif old_node["type"].upper() in ["C1700", "C2600", "C2691", "C3600", "C3620", "C3640", "C3660", "C3725", "C3745", "C7200", "EtherSwitchRouter"]:
             if node["symbol"] is None:
                 node["symbol"] = ":/symbols/router.svg"
             node["node_type"] = "dynamips"
             node["properties"]["dynamips_id"] = old_node.get("dynamips_id")
-            if "platform" not in node["properties"] and old_node["type"].startswith("C"):
+            if "platform" not in node["properties"] and old_node["type"].upper().startswith("C"):
                 node["properties"]["platform"] = old_node["type"].lower()
                 if node["properties"]["platform"].startswith("c36"):
                     node["properties"]["platform"] = "c3600"

gns3server/crash_report.py

@@ -57,7 +57,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "sync+https://9b1156a90ee943eba20e032cf007297d:024b75c7b11844a58df147a4fb059774@sentry.io/38482"
+    DSN = "sync+https://67b93949a78d4ef5978388cc4b8906f9:271ee1dd01db4a39b919097f452cb6c5@sentry.io/38482"
     if hasattr(sys, "frozen"):
         cacert = get_resource("cacert.pem")
         if cacert is not None and os.path.isfile(cacert):

gns3server/handlers/api/controller/project_handler.py

@@ -22,7 +22,6 @@ import tempfile
 
 from gns3server.web.route import Route
 from gns3server.controller import Controller
-from gns3server.controller.project import Project
 from gns3server.controller.import_project import import_project
 from gns3server.controller.export_project import export_project
 from gns3server.config import Config

gns3server/schemas/dynamips_vm.py

@@ -33,7 +33,7 @@ VM_CREATE_SCHEMA = {
         },
         "dynamips_id": {
             "description": "Dynamips ID",
-            "type": "integer"
+            "type": ["integer", "null"]
         },
         "name": {
             "description": "Dynamips VM instance name",

gns3server/web/web_server.py

@@ -43,6 +43,9 @@ import gns3server.handlers
 import logging
 log = logging.getLogger(__name__)
 
+if not aiohttp.__version__.startswith("2.0"):
+    raise RuntimeError("You need aiohttp 2.0 for running GNS3")
+
 
 class WebServer: