NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-19 07:53:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #393 from GNS3/avoid_losing_config

Browse Source 
Improve dynamips startup_config dump
This commit is contained in:
Jeremy Grossmann 2016-01-17 09:45:00 -08:00
commit 0a4a01fed0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/modules/dynamips/__init__.py
View File

@ -602,6 +602,10 @@ class Dynamips(BaseManager):
elif startup_config_content: elif startup_config_content:
startup_config_path = self._create_config(vm, default_startup_config_path, startup_config_content) startup_config_path = self._create_config(vm, default_startup_config_path, startup_config_content)
yield from vm.set_configs(startup_config_path) yield from vm.set_configs(startup_config_path)
# An empty startup config crash dynamips
else:
startup_config_path = self._create_config(vm, default_startup_config_path, "!\n")
yield from vm.set_configs(startup_config_path)
private_config_path = settings.get("private_config") private_config_path = settings.get("private_config")
private_config_content = settings.get("private_config_content") private_config_content = settings.get("private_config_content")

2
gns3server/modules/dynamips/nodes/router.py
View File

@ -281,6 +281,7 @@ class Router(BaseVM):
yield from self._hypervisor.send('vm stop "{name}"'.format(name=self._name)) yield from self._hypervisor.send('vm stop "{name}"'.format(name=self._name))
self.status = "stopped" self.status = "stopped"
log.info('Router "{name}" [{id}] has been stopped'.format(name=self._name, id=self._id)) log.info('Router "{name}" [{id}] has been stopped'.format(name=self._name, id=self._id))
yield from self.save_configs()
@asyncio.coroutine @asyncio.coroutine
def reload(self): def reload(self):
@ -352,7 +353,6 @@ class Router(BaseVM):
if self._hypervisor and not self._hypervisor.devices: if self._hypervisor and not self._hypervisor.devices:
try: try:
yield from self.stop() yield from self.stop()
yield from self.save_configs()
yield from self._hypervisor.send('vm delete "{}"'.format(self._name)) yield from self._hypervisor.send('vm delete "{}"'.format(self._name))
except DynamipsError: except DynamipsError:
pass pass