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

Support to reset MAC addresses for Docker nodes and some adjustments for fast duplication.

Browse Source
This commit is contained in:
grossmj 2024-09-26 18:41:23 +07:00
parent 1332e940fd
commit 996dad2f5c
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/controller/export_project.py
View File

@ -200,7 +200,7 @@ async def _patch_project_file(project, path, zstream, include_images, keep_compu
if not keep_compute_ids: if not keep_compute_ids:
node["compute_id"] = "local" # To make project portable all node by default run on local node["compute_id"] = "local" # To make project portable all node by default run on local
if "properties" in node and node["node_type"] != "docker": if "properties" in node:
for prop, value in node["properties"].items(): for prop, value in node["properties"].items():
# reset the MAC address # reset the MAC address

18
gns3server/controller/project.py
View File

@ -1057,11 +1057,13 @@ class Project:
assert self._status != "closed" assert self._status != "closed"
try: try:
proj = await self._duplicate_fast(name, location, reset_mac_addresses) proj = await self._fast_duplication(name, location, reset_mac_addresses)
if proj: if proj:
if previous_status == "closed": if previous_status == "closed":
await self.close() await self.close()
return proj return proj
else:
log.info("Fast duplication failed, fallback to normal duplication")
except Exception as e: except Exception as e:
raise aiohttp.web.HTTPConflict(text="Cannot duplicate project: {}".format(str(e))) raise aiohttp.web.HTTPConflict(text="Cannot duplicate project: {}".format(str(e)))
@ -1251,13 +1253,11 @@ class Project:
def __repr__(self): def __repr__(self):
return "<gns3server.controller.Project {} {}>".format(self._name, self._id) return "<gns3server.controller.Project {} {}>".format(self._name, self._id)
async def _duplicate_fast(self, name=None, location=None, reset_mac_addresses=True): async def _fast_duplication(self, name=None, location=None, reset_mac_addresses=True):
# remote replication is not supported # remote replication is not supported with remote computes
if not sys.platform.startswith("linux") and not sys.platform.startswith("win"):
return None
for compute in self.computes: for compute in self.computes:
if compute.id != "local": if compute.id != "local":
log.warning("Duplicate fast not support remote compute: '{}'".format(compute.id)) log.warning("Fast duplication is not support with remote compute: '{}'".format(compute.id))
return None return None
# work dir # work dir
p_work = pathlib.Path(location or self.path).parent.absolute() p_work = pathlib.Path(location or self.path).parent.absolute()
@ -1266,7 +1266,7 @@ class Project:
new_project_path = p_work.joinpath(new_project_id) new_project_path = p_work.joinpath(new_project_id)
# copy dir # copy dir
await wait_run_in_executor(shutil.copytree, self.path, new_project_path.as_posix()) await wait_run_in_executor(shutil.copytree, self.path, new_project_path.as_posix())
log.info("[FAST] Copy project: {} to: '{}', cost={}s".format(self.path, new_project_path, time.time() - t0)) log.info("Project content copied from '{}' to '{}' in {}s".format(self.path, new_project_path, time.time() - t0))
topology = json.loads(new_project_path.joinpath('{}.gns3'.format(self.name)).read_bytes()) topology = json.loads(new_project_path.joinpath('{}.gns3'.format(self.name)).read_bytes())
project_name = name or topology["name"] project_name = name or topology["name"]
# If the project name is already used we generate a new one # If the project name is already used we generate a new one
@ -1285,7 +1285,7 @@ class Project:
_move_node_file(new_project_path, node["node_id"], new_node_id) _move_node_file(new_project_path, node["node_id"], new_node_id)
node["node_id"] = new_node_id node["node_id"] = new_node_id
if reset_mac_addresses: if reset_mac_addresses:
if "properties" in node and node["node_type"] != "docker": if "properties" in node:
for prop, value in node["properties"].items(): for prop, value in node["properties"].items():
# reset the MAC address # reset the MAC address
if prop in ("mac_addr", "mac_address"): if prop in ("mac_addr", "mac_address"):
@ -1307,5 +1307,5 @@ class Project:
os.remove(new_project_path.joinpath('{}.gns3'.format(self.name))) os.remove(new_project_path.joinpath('{}.gns3'.format(self.name)))
project = await self.controller.load_project(dot_gns3_path, load=False) project = await self.controller.load_project(dot_gns3_path, load=False)
log.info("[FAST] Project '{}' duplicated in {:.4f} seconds".format(project.name, time.time() - t0)) log.info("Project '{}' fast duplicated in {:.4f} seconds".format(project.name, time.time() - t0))
return project return project