arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-11 08:30:57 +00:00
Code Issues Releases Wiki Activity

Drop the old -files in the project

Browse Source
This commit is contained in:
Julien Duponchelle 2015-02-25 18:23:41 +01:00
parent 8434a286b6
commit f12d3f07f7
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gns3server/modules/base_manager.py
View File

@ -158,7 +158,7 @@ class BaseManager:
project = ProjectManager.instance().get_project(project_id)
# If it's not an UUID
# If it's not an UUID, old topology
if vm_id and (isinstance(vm_id, int) or len(vm_id) != 36):
legacy_id = int(vm_id)
vm_id = str(uuid4())
@ -173,7 +173,19 @@ class BaseManager:
try:
yield from wait_run_in_executor(shutil.move, vm_working_dir, new_vm_working_dir)
except OSError as e:
raise aiohttp.web.HTTPInternalServerError(text="Could not move VM working directory: {}".format(e))
raise aiohttp.web.HTTPInternalServerError(text="Could not move VM working directory: {} to {} {}".format(vm_working_dir, new_vm_working_dir, e))
if os.listdir(module_path) == []:
try:
os.rmdir(module_path)
except OSError as e:
raise aiohttp.web.HTTPInternalServerError(text="Could not delete {}: {}".format(module_path, e))
if os.listdir(project_files_dir) == []:
try:
os.rmdir(project_files_dir)
except OSError as e:
raise aiohttp.web.HTTPInternalServerError(text="Could not delete {}: {}".format(project_files_dir, e))
if not vm_id:
vm_id = str(uuid4())

29
tests/modules/test_manager.py
View File

@ -62,6 +62,35 @@ def test_create_vm_old_topology(loop, project, tmpdir, port_manager):
vm = loop.run_until_complete(vpcs.create_vm("PC 1", project.id, vm_id))
assert len(vm.id) == 36
assert os.path.exists(os.path.join(project_dir, "testold-files")) is False
vm_dir = os.path.join(project_dir, "project-files", "vpcs", vm.id)
with open(os.path.join(vm_dir, "startup.vpc")) as f:
assert f.read() == "1"
def test_create_vm_old_topology_with_garbage_in_project_dir(loop, project, tmpdir, port_manager):
with patch("gns3server.config.Config.get_section_config", return_value={"local": True}):
# Create an old topology directory
project_dir = str(tmpdir / "testold")
vm_dir = os.path.join(project_dir, "testold-files", "vpcs", "pc-1")
project.path = project_dir
os.makedirs(vm_dir, exist_ok=True)
with open(os.path.join(vm_dir, "startup.vpc"), "w+") as f:
f.write("1")
with open(os.path.join(os.path.join(project_dir, "testold-files"), "crash.log"), "w+") as f:
f.write("1")
VPCS._instance = None
vpcs = VPCS.instance()
vpcs.port_manager = port_manager
vm_id = 1
vm = loop.run_until_complete(vpcs.create_vm("PC 1", project.id, vm_id))
assert len(vm.id) == 36
assert os.path.exists(os.path.join(project_dir, "testold-files")) is True
vm_dir = os.path.join(project_dir, "project-files", "vpcs", vm.id)
with open(os.path.join(vm_dir, "startup.vpc")) as f:
assert f.read() == "1"