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

Properly restore configs for Dynamips routers.

Browse Source
This commit is contained in:
grossmj 2015-03-08 14:13:19 -06:00
parent c3014632a4
commit b1eccc0ace
2 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,10 +458,8 @@ class Dynamips(BaseManager):
if hasattr(vm, name) and getattr(vm, name) != value: if hasattr(vm, name) and getattr(vm, name) != value:
if hasattr(vm, "set_{}".format(name)): if hasattr(vm, "set_{}".format(name)):
setter = getattr(vm, "set_{}".format(name)) setter = getattr(vm, "set_{}".format(name))
if asyncio.iscoroutinefunction(vm.close): yield from setter(value)
yield from setter(value)
else:
setter(value)
elif name.startswith("slot") and value in ADAPTER_MATRIX: elif name.startswith("slot") and value in ADAPTER_MATRIX:
slot_id = int(name[-1]) slot_id = int(name[-1])
adapter_name = value adapter_name = value
@ -496,29 +494,36 @@ class Dynamips(BaseManager):
yield from vm.set_sparsemem(False) yield from vm.set_sparsemem(False)
# update the configs if needed # update the configs if needed
yield from self.create_vm_configs(vm, settings.get("startup_config_content"), settings.get("private_config_content")) yield from self.create_vm_configs(vm, settings)
@asyncio.coroutine @asyncio.coroutine
def create_vm_configs(self, vm, startup_config_content, private_config_content): def create_vm_configs(self, vm, settings):
""" """
Creates VM configs from pushed content. Creates VM configs from pushed content.
:param vm: VM instance :param vm: VM instance
:param startup_config_content: content of the startup-config :param settings: VM settings
:param private_config_content: content of the private-config
""" """
module_workdir = vm.project.module_working_directory(self.module_name.lower()) module_workdir = vm.project.module_working_directory(self.module_name.lower())
default_startup_config_path = os.path.join(module_workdir, "configs", "i{}_startup-config.cfg".format(vm.dynamips_id)) default_startup_config_path = os.path.join(module_workdir, "configs", "i{}_startup-config.cfg".format(vm.dynamips_id))
default_private_config_path = os.path.join(module_workdir, "configs", "i{}_private-config.cfg".format(vm.dynamips_id)) default_private_config_path = os.path.join(module_workdir, "configs", "i{}_private-config.cfg".format(vm.dynamips_id))
startup_config_content = settings.get("startup_config_content")
if startup_config_content: if startup_config_content:
startup_config_path = self._create_config(vm, startup_config_content, default_startup_config_path) startup_config_path = self._create_config(vm, startup_config_content, default_startup_config_path)
yield from vm.set_config(startup_config_path) yield from vm.set_configs(startup_config_path)
else:
startup_config_path = settings.get("startup_config", "")
yield from vm.set_configs(startup_config_path)
private_config_content = settings.get("private_config_content")
if private_config_content: if private_config_content:
private_config_path = self._create_config(vm, private_config_content, default_private_config_path) private_config_path = self._create_config(vm, private_config_content, default_private_config_path)
yield from vm.set_config(vm.startup_config, private_config_path) yield from vm.set_configs(vm.startup_config, private_config_path)
else:
private_config_path = settings.get("private_config", "")
yield from vm.set_configs(vm.startup_config, private_config_path)
def _create_config(self, vm, content, path): def _create_config(self, vm, content, path):
""" """

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

@ -1396,16 +1396,6 @@ class Router(BaseVM):
return self._startup_config return self._startup_config
@startup_config.setter
def startup_config(self, startup_config):
"""
Sets the startup-config for this router.
:param startup_config: path to startup-config file
"""
self._startup_config = startup_config
@property @property
def private_config(self): def private_config(self):
""" """
@ -1416,16 +1406,6 @@ class Router(BaseVM):
return self._private_config return self._private_config
@private_config.setter
def private_config(self, private_config):
"""
Sets the private-config for this router.
:param private_config: path to private-config file
"""
self._private_config = private_config
@asyncio.coroutine @asyncio.coroutine
def set_name(self, new_name): def set_name(self, new_name):
""" """
@ -1466,7 +1446,7 @@ class Router(BaseVM):
self._name = new_name self._name = new_name
@asyncio.coroutine @asyncio.coroutine
def set_config(self, startup_config, private_config=''): def set_configs(self, startup_config, private_config=''):
""" """
Sets the config files that are pushed to startup-config and Sets the config files that are pushed to startup-config and
private-config in NVRAM when the instance is started. private-config in NVRAM when the instance is started.