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

Merge pull request #2359 from GNS3/bugfix/2357

Browse Source 
Fix Docker VM hasn't access to all resources
This commit is contained in:
Jeremy Grossmann 2024-02-22 19:37:55 +08:00 committed by GitHub
commit 14a618766d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gns3server/controller/__init__.py
View File

@ -297,12 +297,12 @@ class Controller:
else: else:
for entry in importlib_resources.files('gns3server').joinpath(resource_name).iterdir(): for entry in importlib_resources.files('gns3server').joinpath(resource_name).iterdir():
full_path = os.path.join(dst_path, entry.name) full_path = os.path.join(dst_path, entry.name)
if not os.path.exists(full_path): if entry.is_file() and not os.path.exists(full_path):
if entry.is_file(): log.debug(f'Installing {resource_name} resource file "{entry.name}" to "{full_path}"')
log.debug(f'Installing {resource_name} resource file "{entry.name}" to "{full_path}"') shutil.copy(str(entry), os.path.join(dst_path, entry.name))
shutil.copy(str(entry), os.path.join(dst_path, entry.name)) elif entry.is_dir():
elif entry.is_dir(): os.makedirs(full_path, exist_ok=True)
os.makedirs(full_path, exist_ok=True) Controller.install_resource_files(full_path, os.path.join(resource_name, entry.name))
def _install_base_configs(self): def _install_base_configs(self):
""" """

27
tests/compute/docker/test_docker_vm.py
View File

@ -852,7 +852,7 @@ async def test_unpause(vm):
mock.assert_called_with("POST", "containers/e90e34656842/unpause") mock.assert_called_with("POST", "containers/e90e34656842/unpause")
async def test_start(vm, manager, free_console_port): async def test_start(vm, manager, free_console_port, tmpdir):
assert vm.status != "started" assert vm.status != "started"
vm.adapters = 1 vm.adapters = 1
@ -880,6 +880,31 @@ async def test_start(vm, manager, free_console_port):
assert vm.status == "started" assert vm.status == "started"
async def test_resources_installed(vm, manager, tmpdir):
assert vm.status != "started"
vm.adapters = 1
docker_resources_path = os.path.join(tmpdir, "docker", "resources")
os.makedirs(docker_resources_path, exist_ok=True)
manager.resources_path = MagicMock(return_value=docker_resources_path)
with asyncio_patch("gns3server.compute.docker.DockerVM._get_container_state", return_value="stopped"):
with asyncio_patch("gns3server.compute.docker.Docker.query"):
with asyncio_patch("gns3server.compute.docker.DockerVM._start_ubridge"):
with asyncio_patch("gns3server.compute.docker.DockerVM._get_namespace", return_value=42):
with asyncio_patch("gns3server.compute.docker.DockerVM._add_ubridge_connection"):
with asyncio_patch("gns3server.compute.docker.DockerVM._start_console"):
await vm.start()
assert vm.status == "started"
assert os.path.exists(os.path.join(docker_resources_path, "init.sh"))
assert os.path.exists(os.path.join(docker_resources_path, "run-cmd.sh"))
assert os.path.exists(os.path.join(docker_resources_path, "bin", "busybox"))
assert os.path.exists(os.path.join(docker_resources_path, "bin", "udhcpc"))
assert os.path.exists(os.path.join(docker_resources_path, "etc", "udhcpc", "default.script"))
async def test_start_namespace_failed(vm, manager, free_console_port): async def test_start_namespace_failed(vm, manager, free_console_port):
assert vm.status != "started" assert vm.status != "started"