NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-10-27 18:52:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue #1605 regarding Cisco slots causing configs to break

Browse Source
This commit is contained in:
UmmmAGoodName 2026-03-16 19:09:32 +01:00
parent 6ac4c27bc1
commit 95bd76a212
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/compute/base_manager.py
View File

@ -221,6 +221,9 @@ class BaseManager:
if not hasattr(destination_node, "working_dir"): if not hasattr(destination_node, "working_dir"):
return destination_node return destination_node
if hasattr(source_node, "status") and source_node.status != "stopped":
raise ComputeError("Cannot duplicate node data while the node is running")
destination_dir = destination_node.working_dir destination_dir = destination_node.working_dir
try: try:
shutil.rmtree(destination_dir) shutil.rmtree(destination_dir)

26
gns3server/compute/dynamips/__init__.py
View File

@ -478,36 +478,40 @@ class Dynamips(BaseManager):
adapter = ADAPTER_MATRIX[adapter_name]() adapter = ADAPTER_MATRIX[adapter_name]()
try: try:
if vm.slots[slot_id] and not isinstance(vm.slots[slot_id], type(adapter)): if vm.slots[slot_id] and not isinstance(vm.slots[slot_id], type(adapter)):
await vm.slot_remove_binding(slot_id) if vm.slots[slot_id].removable():
await vm.slot_remove_binding(slot_id)
else:
log.warning(f"Slot {slot_id} on router '{vm.name}' has a non-removable adapter, skipping replacement")
continue
if not isinstance(vm.slots[slot_id], type(adapter)): if not isinstance(vm.slots[slot_id], type(adapter)):
await vm.slot_add_binding(slot_id, adapter) await vm.slot_add_binding(slot_id, adapter)
except IndexError: except IndexError:
raise DynamipsError(f"Slot {slot_id} doesn't exist on this router") log.warning(f"Slot {slot_id} doesn't exist on router '{vm.name}', skipping")
elif name.startswith("slot") and (value is None or value == ""): elif name.startswith("slot") and (value is None or value == ""):
slot_id = int(name[-1]) slot_id = int(name[-1])
try: try:
if vm.slots[slot_id]: if vm.slots[slot_id] and vm.slots[slot_id].removable():
await vm.slot_remove_binding(slot_id) await vm.slot_remove_binding(slot_id)
except IndexError: except IndexError:
raise DynamipsError(f"Slot {slot_id} doesn't exist on this router") log.warning(f"Slot {slot_id} doesn't exist on router '{vm.name}', skipping")
elif name.startswith("wic") and value in WIC_MATRIX: elif name.startswith("wic") and value in WIC_MATRIX:
wic_slot_id = int(name[-1]) wic_slot_id = int(name[-1])
wic_name = value wic_name = value
wic = WIC_MATRIX[wic_name]() wic = WIC_MATRIX[wic_name]()
try: try:
if vm.slots[0].wics[wic_slot_id] and not isinstance(vm.slots[0].wics[wic_slot_id], type(wic)): if vm.slots[0] and vm.slots[0].wics[wic_slot_id] and not isinstance(vm.slots[0].wics[wic_slot_id], type(wic)):
await vm.uninstall_wic(wic_slot_id) await vm.uninstall_wic(wic_slot_id)
if not isinstance(vm.slots[0].wics[wic_slot_id], type(wic)): if vm.slots[0] and not isinstance(vm.slots[0].wics[wic_slot_id], type(wic)):
await vm.install_wic(wic_slot_id, wic) await vm.install_wic(wic_slot_id, wic)
except IndexError: except (IndexError, AttributeError):
raise DynamipsError(f"WIC slot {wic_slot_id} doesn't exist on this router") log.warning(f"WIC slot {wic_slot_id} doesn't exist on router '{vm.name}', skipping")
elif name.startswith("wic") and (value is None or value == ""): elif name.startswith("wic") and (value is None or value == ""):
wic_slot_id = int(name[-1]) wic_slot_id = int(name[-1])
try: try:
if vm.slots[0].wics and vm.slots[0].wics[wic_slot_id]: if vm.slots[0] and vm.slots[0].wics and vm.slots[0].wics[wic_slot_id]:
await vm.uninstall_wic(wic_slot_id) await vm.uninstall_wic(wic_slot_id)
except IndexError: except (IndexError, AttributeError):
raise DynamipsError(f"WIC slot {wic_slot_id} doesn't exist on this router") log.warning(f"WIC slot {wic_slot_id} doesn't exist on router '{vm.name}', skipping")
mmap_support = self.config.settings.Dynamips.mmap_support mmap_support = self.config.settings.Dynamips.mmap_support
if mmap_support is False: if mmap_support is False:

2
gns3server/controller/node.py
View File

@ -556,7 +556,7 @@ class Node:
# None properties are not be sent because it can mean the emulator doesn't support it # None properties are not be sent because it can mean the emulator doesn't support it
for key, value in list(data.items()): for key, value in list(data.items()):
if value is None or value == {} or key in self.CONTROLLER_ONLY_PROPERTIES: if value is None or value == {} or key in self.CONTROLLER_ONLY_PROPERTIES:
del value del data[key]
return data return data

3
gns3server/controller/project.py
View File

@ -1280,9 +1280,6 @@ class Project:
:returns: New node :returns: New node
""" """
if node.status != "stopped" and not node.is_always_running():
raise ControllerError("Cannot duplicate node data while the node is running")
data = copy.deepcopy(node.asdict(topology_dump=True)) data = copy.deepcopy(node.asdict(topology_dump=True))
# Some properties like internal ID should not be duplicated # Some properties like internal ID should not be duplicated
for unique_property in ( for unique_property in (