Merge 2.1 into 2.2 branch

gns3server/compute/dynamips/__init__.py

@@ -547,7 +547,7 @@ class Dynamips(BaseManager):
                     content = content.replace('%h', vm.name)
                     f.write(content.encode("utf-8"))
         except OSError as e:
-            raise DynamipsError("Could not create config file {}: {}".format(path, e))
+            raise DynamipsError("Could not create config file '{}': {}".format(path, e))
 
         return os.path.join("configs", os.path.basename(path))
 

gns3server/compute/dynamips/dynamips_hypervisor.py

@@ -260,6 +260,8 @@ class DynamipsHypervisor:
             # Now retrieve the result
             data = []
             buf = ''
+            retries = 0
+            max_retries = 10
             while True:
                 try:
                     try:
@@ -276,8 +278,14 @@ class DynamipsHypervisor:
                         log.warning("Connection reset received while reading Dynamips response: {}".format(e))
                         continue
                     if not chunk:
-                        raise DynamipsError("No data returned from {host}:{port}, Dynamips process running: {run}"
-                                            .format(host=self._host, port=self._port, run=self.is_running()))
+                        if retries > max_retries:
+                            raise DynamipsError("No data returned from {host}:{port}, Dynamips process running: {run}"
+                                                .format(host=self._host, port=self._port, run=self.is_running()))
+                        else:
+                            retries += 1
+                            yield from asyncio.sleep(0.1)
+                            continue
+                    retries = 0
                     buf += chunk.decode("utf-8", errors="ignore")
                 except OSError as e:
                     raise DynamipsError("Could not read response for '{command}' from {host}:{port}: {error}, process running: {run}"

gns3server/compute/dynamips/nodes/router.py

@@ -283,12 +283,15 @@ class Router(BaseNode):
             if not self._ghost_flag:
                 self.check_available_ram(self.ram)
 
+            # config paths are relative to the working directory configured on Dynamips hypervisor
             startup_config_path = os.path.join("configs", "i{}_startup-config.cfg".format(self._dynamips_id))
             private_config_path = os.path.join("configs", "i{}_private-config.cfg".format(self._dynamips_id))
 
-            if not os.path.exists(private_config_path) or not os.path.getsize(private_config_path):
+            if not os.path.exists(os.path.join(self._working_directory, private_config_path)) or \
+               not os.path.getsize(os.path.join(self._working_directory, private_config_path)):
                 # an empty private-config can prevent a router to boot.
                 private_config_path = ''
+
             yield from self._hypervisor.send('vm set_config "{name}" "{startup}" "{private}"'.format(
                 name=self._name,
                 startup=startup_config_path,