ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-22 06:07:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop Dynamips hypervisors used by devices before the project is closed.

Browse Source 
This is to avoid locked files by hypervisors preventing temporary project working directories to be deleted.
This commit is contained in:
grossmj 2015-03-01 19:20:33 -07:00
parent 3ef529fb0e
commit c48ca212bd
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/handlers/api/project_handler.py
View File

@ -121,6 +121,8 @@ class ProjectHandler:
pm = ProjectManager.instance() pm = ProjectManager.instance()
project = pm.get_project(request.match_info["project_id"]) project = pm.get_project(request.match_info["project_id"])
for module in MODULES:
yield from module.instance().project_closing(project)
yield from project.close() yield from project.close()
for module in MODULES: for module in MODULES:
yield from module.instance().project_closed(project) yield from module.instance().project_closed(project)

10
gns3server/modules/base_manager.py
View File

@ -234,6 +234,16 @@ class BaseManager:
vm.close() vm.close()
return vm return vm
@asyncio.coroutine
def project_closing(self, project):
"""
Called when a project is about to be closed.
:param project: Project instance
"""
pass
@asyncio.coroutine @asyncio.coroutine
def project_closed(self, project): def project_closed(self, project):
""" """

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

@ -136,9 +136,9 @@ class Dynamips(BaseManager):
continue continue
@asyncio.coroutine @asyncio.coroutine
def project_closed(self, project): def project_closing(self, project):
""" """
Called when a project is closed. Called when a project is about to be closed.
:param project: Project instance :param project: Project instance
""" """
@ -157,7 +157,15 @@ class Dynamips(BaseManager):
except Exception as e: except Exception as e:
log.error("Could not delete device {}".format(e), exc_info=1) log.error("Could not delete device {}".format(e), exc_info=1)
# delete useless files @asyncio.coroutine
def project_closed(self, project):
"""
Called when a project is closed.
:param project: Project instance
"""
# delete useless Dynamips files
project_dir = project.module_working_directory(self.module_name.lower()) project_dir = project.module_working_directory(self.module_name.lower())
files = glob.glob(os.path.join(project_dir, "*.ghost")) files = glob.glob(os.path.join(project_dir, "*.ghost"))
files += glob.glob(os.path.join(project_dir, "*_lock")) files += glob.glob(os.path.join(project_dir, "*_lock"))