NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-18 07:23:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Include the images directory when converting an old project.

Browse Source
This commit is contained in:
grossmj 2015-02-28 15:00:00 -07:00
parent 708f66b608
commit d762c43314
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gns3server/modules/base_manager.py
View File

@ -166,23 +166,37 @@ class BaseManager:
# move old project VM files to a new location # move old project VM files to a new location
log.info("Converting old project...") log.info("Converting old project...")
project_name = os.path.basename(project.path) project_name = os.path.basename(project.path)
project_files_dir = os.path.join(project.path, "{}-files".format(project_name)) legacy_project_files_path = os.path.join(project.path, "{}-files".format(project_name))
legacy_vm_dir = self.get_legacy_vm_workdir(legacy_id, name) legacy_vm_dir = self.get_legacy_vm_workdir(legacy_id, name)
vm_working_dir = os.path.join(project_files_dir, legacy_vm_dir) legacy_vm_working_path = os.path.join(legacy_project_files_path, legacy_vm_dir)
new_vm_working_dir = os.path.join(project.path, "project-files", self.module_name.lower(), vm_id) new_project_files_path = os.path.join(project.path, "project-files")
new_vm_working_path = os.path.join(new_project_files_path, self.module_name.lower(), vm_id)
try: try:
log.info('Moving "{}" to "{}"'.format(vm_working_dir, new_vm_working_dir)) log.info('Moving "{}" to "{}"'.format(legacy_vm_working_path, new_vm_working_path))
yield from wait_run_in_executor(shutil.move, vm_working_dir, new_vm_working_dir) yield from wait_run_in_executor(shutil.move, legacy_vm_working_path, new_vm_working_path)
except OSError as e: except OSError as e:
raise aiohttp.web.HTTPInternalServerError(text="Could not move VM working directory: {} to {} {}".format(vm_working_dir, new_vm_working_dir, e)) raise aiohttp.web.HTTPInternalServerError(text="Could not move VM working directory: {} to {} {}".format(legacy_vm_working_path,
new_vm_working_path,
e))
old_images_dir = os.path.join(legacy_project_files_path, "images")
new_images_dir = os.path.join(new_project_files_path, "images")
if os.path.isdir(old_images_dir):
try:
log.info('Moving "{}" to "{}"'.format(old_images_dir, new_images_dir))
yield from wait_run_in_executor(shutil.move, old_images_dir, new_images_dir)
except OSError as e:
raise aiohttp.web.HTTPInternalServerError(text="Could not move images directory: {} to {} {}".format(old_images_dir,
new_images_dir,
e))
try: try:
os.rmdir(os.path.dirname(vm_working_dir)) os.rmdir(os.path.dirname(legacy_vm_working_path))
except OSError: except OSError:
pass pass
try: try:
os.rmdir(project_files_dir) os.rmdir(legacy_project_files_path)
except OSError: except OSError:
pass pass

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

@ -180,7 +180,7 @@ class Dynamips(BaseManager):
:param project: Project instance :param project: Project instance
""" """
for vm in self._vms: for vm in self._vms.values():
if vm.project.id == project.id: if vm.project.id == project.id:
yield from vm.hypervisor.set_working_dir(project.module_working_directory(self.module_name.lower())) yield from vm.hypervisor.set_working_dir(project.module_working_directory(self.module_name.lower()))