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

Fix encoding error when saving dynamips configuration

Browse Source 
Fix #134
This commit is contained in:
Julien Duponchelle 2015-04-03 12:13:07 +02:00
parent b330b2c157
commit 1acc9398d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1500,9 +1500,9 @@ class Router(BaseVM):
config = base64.b64decode(startup_config_base64).decode(errors='replace') config = base64.b64decode(startup_config_base64).decode(errors='replace')
config = "!\n" + config.replace("\r", "") config = "!\n" + config.replace("\r", "")
config_path = os.path.join(module_workdir, self.startup_config) config_path = os.path.join(module_workdir, self.startup_config)
with open(config_path, "w") as f: with open(config_path, "wb") as f:
log.info("saving startup-config to {}".format(self.startup_config)) log.info("saving startup-config to {}".format(self.startup_config))
f.write(config) f.write(config.encode("utf-8"))
except (binascii.Error, OSError) as e: except (binascii.Error, OSError) as e:
raise DynamipsError("Could not save the startup configuration {}: {}".format(config_path, e)) raise DynamipsError("Could not save the startup configuration {}: {}".format(config_path, e))
@ -1511,9 +1511,9 @@ class Router(BaseVM):
config = base64.b64decode(private_config_base64).decode(errors='replace') config = base64.b64decode(private_config_base64).decode(errors='replace')
config = "!\n" + config.replace("\r", "") config = "!\n" + config.replace("\r", "")
config_path = os.path.join(module_workdir, self.private_config) config_path = os.path.join(module_workdir, self.private_config)
with open(config_path, "w") as f: with open(config_path, "wb") as f:
log.info("saving private-config to {}".format(self.private_config)) log.info("saving private-config to {}".format(self.private_config))
f.write(config) f.write(config.encode("utf-8"))
except (binascii.Error, OSError) as e: except (binascii.Error, OSError) as e:
raise DynamipsError("Could not save the private configuration {}: {}".format(config_path, e)) raise DynamipsError("Could not save the private configuration {}: {}".format(config_path, e))