Merge branch '2.0' into 2.1

gns3server/compute/docker/__init__.py

@@ -20,10 +20,10 @@ Docker server module.
 """
 
 import sys
+import json
 import asyncio
 import logging
 import aiohttp
-import json
 from gns3server.utils import parse_version
 from gns3server.utils.asyncio import locked_coroutine
 from gns3server.compute.base_manager import BaseManager
@@ -33,7 +33,7 @@ from gns3server.compute.docker.docker_error import DockerError, DockerHttp304Err
 log = logging.getLogger(__name__)
 
 
-DOCKER_MINIMUM_API_VERSION = "1.21"
+DOCKER_MINIMUM_API_VERSION = "1.25"
 
 
 class Docker(BaseManager):
@@ -113,7 +113,7 @@ class Docker(BaseManager):
         :returns: HTTP response
         """
         data = json.dumps(data)
-        url = "http://docker/" + path
+        url = "http://docker/v" + DOCKER_MINIMUM_API_VERSION + "/" + path
 
         if timeout is None:
             timeout = 60 * 60 * 24 * 31  # One month timeout
@@ -134,6 +134,8 @@ class Docker(BaseManager):
             )
         except (aiohttp.ClientResponseError, aiohttp.ClientOSError) as e:
             raise DockerError("Docker has returned an error: {}".format(str(e)))
+        except (asyncio.TimeoutError):
+            raise DockerError("Docker timeout " + method + " " + path)
         if response.status >= 300:
             body = yield from response.read()
             try:
@@ -187,7 +189,10 @@ class Docker(BaseManager):
         # The pull api will stream status via an HTTP JSON stream
         content = ""
         while True:
-            chunk = yield from response.content.read(1024)
+            try:
+                chunk = yield from response.content.read(1024)
+            except aiohttp.errors.ServerDisconnectedError:
+                break
             if not chunk:
                 break
             content += chunk.decode("utf-8")

gns3server/compute/docker/docker_vm.py

@@ -361,6 +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)
                         yield from self.stop()
 
                         # The container can crash soon after the start, this means we can not move the interface to the container namespace
@@ -517,6 +518,8 @@ class DockerVM(BaseNode):
         state = yield from self._get_container_state()
         if state == "running":
             return True
+        if self.status == "started":  # The container crashed we need to clean
+            yield from self.stop()
         return False
 
     @asyncio.coroutine

gns3server/compute/qemu/qemu_vm.py

@@ -1379,7 +1379,7 @@ class QemuVM(BaseNode):
                 # special case, sata controller doesn't exist in Qemu
                 options.extend(["-device", 'ahci,id=ahci{},bus=pci.{}'.format(disk_index, disk_index)])
                 options.extend(["-drive", 'file={},if=none,id=drive-sata-disk{},index={},media=disk'.format(disk, disk_index, disk_index)])
-                options.extend(["-device", 'ide-drive,drive=drive-sata-disk{},bus=ahci{}.0'.format(disk_index, disk_index)])
+                options.extend(["-device", 'ide-drive,drive=drive-sata-disk{},bus=ahci{}.0,id=drive-sata-disk{}'.format(disk_index, disk_index, disk_index)])
             else:
                 options.extend(["-drive", 'file={},if={},index={},media=disk'.format(disk, interface, disk_index)])
 

gns3server/compute/vmware/__init__.py

@@ -588,8 +588,9 @@ class VMware(BaseManager):
 
         for vm_settings in vm_entries.values():
             if "displayname" in vm_settings and "config" in vm_settings:
-                log.debug('Found VM named "{}" with VMX file "{}"'.format(vm_settings["displayname"], vm_settings["config"]))
-                vmware_vms.append({"vmname": vm_settings["displayname"], "vmx_path": vm_settings["config"]})
+                if os.path.exists(vm_settings["config"]):
+                    log.debug('Found VM named "{}" with VMX file "{}"'.format(vm_settings["displayname"], vm_settings["config"]))
+                    vmware_vms.append({"vmname": vm_settings["displayname"], "vmx_path": vm_settings["config"]})
         return vmware_vms
 
     def _get_vms_from_directory(self, directory):