NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-30 21:03:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup the VirtualBox Media Manager after closing a project. Fixes #145.

Browse Source
This commit is contained in:
grossmj 2015-04-28 12:02:21 -06:00
parent a884af983f
commit cc03017739
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gns3server/modules/virtualbox/__init__.py
View File

@ -115,6 +115,45 @@ class VirtualBox(BaseManager):
return stdout_data.decode("utf-8", errors="ignore").splitlines() return stdout_data.decode("utf-8", errors="ignore").splitlines()
@asyncio.coroutine
def _find_inaccessible_hdd_files(self):
"""
Finds inaccessible disk files (to clean up the VirtualBox media manager)
"""
hdds = []
properties = yield from self.execute("list", ["hdds"])
flag_inaccessible = False
for prop in properties:
try:
name, value = prop.split(':', 1)
except ValueError:
continue
if name.strip() == "State" and value.strip() == "inaccessible":
flag_inaccessible = True
if flag_inaccessible and name.strip() == "Location":
hdds.append(value.strip())
flag_inaccessible = False
return reversed(hdds)
@asyncio.coroutine
def project_closed(self, project):
"""
Called when a project is closed.
:param project: Project instance
"""
yield from super().project_closed(project)
hdd_files_to_close = yield from self._find_inaccessible_hdd_files()
for hdd_file in hdd_files_to_close:
log.info("Closing VirtualBox VM disk file {}".format(os.path.basename(hdd_file)))
try:
yield from self.execute("closemedium", ["disk", hdd_file])
except VirtualBoxError as e:
log.warning("Could not close VirtualBox VM disk file {}: {error}".format(os.path.basename(hdd_file), e))
continue
@asyncio.coroutine @asyncio.coroutine
def get_list(self): def get_list(self):
""" """

8
gns3server/modules/virtualbox/virtualbox_vm.py
View File

@ -321,7 +321,6 @@ class VirtualBoxVM(BaseVM):
if self._linked_clone: if self._linked_clone:
hdd_table = [] hdd_table = []
hdd_files_to_close = []
if os.path.exists(self.working_dir): if os.path.exists(self.working_dir):
hdd_files = yield from self._get_all_hdd_files() hdd_files = yield from self._get_all_hdd_files()
vm_info = yield from self._get_vm_info() vm_info = yield from self._get_vm_info()
@ -332,7 +331,6 @@ class VirtualBoxVM(BaseVM):
port = match.group(2) port = match.group(2)
device = match.group(3) device = match.group(3)
if value in hdd_files: if value in hdd_files:
hdd_files_to_close.append(value)
log.info("VirtualBox VM '{name}' [{id}] detaching HDD {controller} {port} {device}".format(name=self.name, log.info("VirtualBox VM '{name}' [{id}] detaching HDD {controller} {port} {device}".format(name=self.name,
id=self.id, id=self.id,
controller=controller, controller=controller,
@ -353,12 +351,6 @@ class VirtualBoxVM(BaseVM):
log.info("VirtualBox VM '{name}' [{id}] unregistering".format(name=self.name, id=self.id)) log.info("VirtualBox VM '{name}' [{id}] unregistering".format(name=self.name, id=self.id))
yield from self.manager.execute("unregistervm", [self._name]) yield from self.manager.execute("unregistervm", [self._name])
for hdd_file in hdd_files_to_close:
log.info("VirtualBox VM '{name}' [{id}] closing disk {disk}".format(name=self.name,
id=self.id,
disk=os.path.basename(hdd_file)))
yield from self.manager.execute("closemedium", ["disk", hdd_file])
if hdd_table: if hdd_table:
try: try:
hdd_info_file = os.path.join(self.working_dir, self._vmname, "hdd_info.json") hdd_info_file = os.path.join(self.working_dir, self._vmname, "hdd_info.json")