arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-24 15:58:08 +00:00
Code Issues Releases Wiki Activity

Fix export of IOU configuration

Browse Source 
Fix https://github.com/GNS3/gns3-gui/issues/1745
This commit is contained in:
Julien Duponchelle 2017-01-10 15:50:35 +01:00
parent afd46ec010
commit df694ca9eb
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/compute/iou/iou_vm.py
View File

@ -97,7 +97,9 @@ class IOUVM(BaseNode):
""" """
Called when the NVRAM file has changed Called when the NVRAM file has changed
""" """
log.debug("NVRAM changed: {}".format(path))
self.save_configs() self.save_configs()
self.updated()
@asyncio.coroutine @asyncio.coroutine
def close(self): def close(self):
@ -206,6 +208,8 @@ class IOUVM(BaseNode):
"nvram": self._nvram, "nvram": self._nvram,
"l1_keepalives": self._l1_keepalives, "l1_keepalives": self._l1_keepalives,
"startup_config": self.relative_startup_config_file, "startup_config": self.relative_startup_config_file,
"startup_config_content": self.startup_config_content,
"private_config_content": self.private_config_content,
"private_config": self.relative_private_config_file, "private_config": self.relative_private_config_file,
"use_default_iou_values": self._use_default_iou_values, "use_default_iou_values": self._use_default_iou_values,
"command_line": self.command_line} "command_line": self.command_line}
@ -485,7 +489,7 @@ class IOUVM(BaseNode):
# check if there is enough RAM to run # check if there is enough RAM to run
self.check_available_ram(self.ram) self.check_available_ram(self.ram)
self._nvram_watcher = FileWatcher(self._nvram_file(), self._nvram_changed, delay=10) self._nvram_watcher = FileWatcher(self._nvram_file(), self._nvram_changed, delay=2)
# created a environment variable pointing to the iourc file. # created a environment variable pointing to the iourc file.
env = os.environ.copy() env = os.environ.copy()

2
gns3server/utils/file_watcher.py
View File

@ -56,7 +56,7 @@ class FileWatcher:
self._hashed = {} self._hashed = {}
for path in self._paths: for path in self._paths:
try: try:
# Alder32 is a fast bu insecure hash algorithm # Alder32 is a fast but insecure hash algorithm
self._hashed[path] = zlib.adler32(open(path, 'rb').read()) self._hashed[path] = zlib.adler32(open(path, 'rb').read())
except OSError: except OSError:
self._hashed[path] = None self._hashed[path] = None