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

Handle local base config path.

Browse Source
This commit is contained in:
grossmj 2014-05-08 14:20:12 -06:00
parent 29be7ac4e2
commit 13f469f9d6
4 changed files with 84 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gns3server/builtins/interfaces.py
View File

@ -47,6 +47,7 @@ def _get_windows_interfaces():
"description": adapter.NetConnectionID})
return interfaces
def interfaces(handler, request_id, params):
"""
Builtin destination to return all the network interfaces on this host.

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

@ -430,28 +430,62 @@ class Dynamips(IModule):
router.ghost_status = 2
router.ghost_file = ghost_instance
def save_base64config(self, config_base64, router, config_filename):
def create_config_from_file(self, local_base_config, router, destination_config_path):
"""
Saves a base64 encoded config (decoded) to a file.
Creates a config file from a local base config
:param config_base64: base64 encoded config
:param local_base_config: path the a local base config
:param router: router instance
:param config_filename: file name to save the config
:param destination_config_path: path to the destination config file
:returns: relative path to the config file
:returns: relative path to the created config file
"""
config = base64.decodestring(config_base64.encode("utf-8")).decode("utf-8")
config = "!\n" + config.replace("\r", "")
config = config.replace('%h', router.name)
config_dir = os.path.join(router.hypervisor.working_dir, "configs")
log.info("creating config file {} from {}".format(destination_config_path, local_base_config))
config_path = destination_config_path
config_dir = os.path.dirname(destination_config_path)
try:
os.makedirs(config_dir)
except FileExistsError:
pass
except OSError as e:
raise DynamipsError("Could not create configs directory: {}".format(e))
config_path = os.path.join(config_dir, config_filename)
try:
with open(local_base_config, "r") as f:
config = f.read()
with open(config_path, "w") as f:
config = "!\n" + config.replace("\r", "")
config = config.replace('%h', router.name)
f.write(config)
except OSError as e:
raise DynamipsError("Could not save the configuration from {} to {}: {}".format(local_base_config, config_path, e))
return "configs" + os.sep + os.path.basename(config_path)
def create_config_from_base64(self, config_base64, router, destination_config_path):
"""
Creates a config file from a base64 encoded config.
:param config_base64: base64 encoded config
:param router: router instance
:param destination_config_path: path to the destination config file
:returns: relative path to the created config file
"""
log.info("creating config file {} from base64".format(destination_config_path))
config = base64.decodestring(config_base64.encode("utf-8")).decode("utf-8")
config = "!\n" + config.replace("\r", "")
config = config.replace('%h', router.name)
config_dir = os.path.dirname(destination_config_path)
try:
os.makedirs(config_dir)
except FileExistsError:
pass
except OSError as e:
raise DynamipsError("Could not create configs directory: {}".format(e))
config_path = destination_config_path
try:
with open(config_path, "w") as f:
log.info("saving startup-config to {}".format(config_path))

27
gns3server/modules/dynamips/backends/vm.py
View File

@ -390,21 +390,34 @@ class VM(object):
response = {}
try:
startup_config_path = os.path.join(router.hypervisor.working_dir, "configs", "{}.cfg".format(router.name))
private_config_path = os.path.join(router.hypervisor.working_dir, "configs", "{}-private.cfg".format(router.name))
# a new startup-config has been pushed
if "startup_config_base64" in request:
config_filename = "{}.cfg".format(router.name)
# update the request with the new local startup-config path
request["startup_config"] = self.save_base64config(request["startup_config_base64"], router, config_filename)
if "startup_config" in request:
router.set_config(request["startup_config"])
response["startup_config"] = request["startup_config"]
request["startup_config"] = self.create_config_from_base64(request["startup_config_base64"], router, startup_config_path)
# a new private-config has been pushed
if "private_config_base64" in request:
config_filename = "{}-private.cfg".format(router.name)
# update the request with the new local private-config path
request["private_config"] = self.save_base64config(request["private_config_base64"], router, config_filename)
request["private_config"] = self.create_config_from_base64(request["private_config_base64"], router, private_config_path)
if "startup_config" in request:
if os.path.isfile(request["startup_config"]) and request["startup_config"] != startup_config_path:
# this is a local file set in the GUI
request["startup_config"] = self.create_config_from_file(request["startup_config"], router, startup_config_path)
router.set_config(request["startup_config"])
else:
router.set_config(request["startup_config"])
response["startup_config"] = request["startup_config"]
if "private_config" in request:
if os.path.isfile(request["private_config"]) and request["private_config"] != private_config_path:
# this is a local file set in the GUI
request["private_config"] = self.create_config_from_file(request["private_config"], router, private_config_path)
router.set_config(router.startup_config, request["private_config"])
else:
router.set_config(router.startup_config, request["private_config"])
response["private_config"] = request["private_config"]

20
gns3server/modules/iou/__init__.py
View File

@ -398,13 +398,13 @@ class IOU(IModule):
return
response = {}
config_path = os.path.join(iou_instance.working_dir, "startup-config")
try:
# a new startup-config has been pushed
if "startup_config_base64" in request:
# a new startup-config has been pushed
config = base64.decodestring(request["startup_config_base64"].encode("utf-8")).decode("utf-8")
config = "!\n" + config.replace("\r", "")
config = config.replace('%h', iou_instance.name)
config_path = os.path.join(iou_instance.working_dir, "startup-config")
try:
with open(config_path, "w") as f:
log.info("saving startup-config to {}".format(config_path))
@ -413,7 +413,21 @@ class IOU(IModule):
raise IOUError("Could not save the configuration {}: {}".format(config_path, e))
# update the request with the new local startup-config path
request["startup_config"] = os.path.basename(config_path)
elif "startup_config" in request:
if os.path.isfile(request["startup_config"]) and request["startup_config"] != config_path:
# this is a local file set in the GUI
try:
with open(request["startup_config"], "r") as f:
config = f.read()
with open(config_path, "w") as f:
config = "!\n" + config.replace("\r", "")
config = config.replace('%h', iou_instance.name)
f.write(config)
request["startup_config"] = os.path.basename(config_path)
except OSError as e:
raise IOUError("Could not save the configuration from {} to {}: {}".format(request["startup_config"], config_path, e))
else:
raise IOUError("Startup-config {} could not be found on this server".format(request["startup_config"]))
except IOUError as e:
self.send_custom_error(str(e))
return