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

gns3server/compute/qemu/qemu_vm.py

@@ -1144,7 +1144,7 @@ class QemuVM(BaseNode):
                 yield from self.add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
                                                            self._local_udp_tunnels[adapter_number][1],
                                                            nio)
-            except IndexError:
+            except (IndexError, KeyError):
                 raise QemuError('Adapter {adapter_number} does not exist on QEMU VM "{name}"'.format(name=self._name,
                                                                                                      adapter_number=adapter_number))
 

gns3server/controller/node.py

@@ -325,7 +325,7 @@ class Node:
         if self._node_type == "docker":
             timeout = None
         else:
-            timeout = 120
+            timeout = 1200
         trial = 0
         while trial != 6:
             try: