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

Fix the docker aux port is lost after an update

Browse Source 
Fix https://github.com/GNS3/gns3-gui/issues/1155
This commit is contained in:
Julien Duponchelle 2016-04-05 16:33:40 +02:00
parent 36dbcfa7f6
commit 2651a48102
No known key found for this signature in database
GPG Key ID: F1E2485547D4595D
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/modules/docker/docker_vm.py
View File

@ -269,11 +269,13 @@ class DockerVM(BaseVM):
""" """
# We need to save the console and state and restore it # We need to save the console and state and restore it
console = self.console console = self.console
aux = self.aux
state = yield from self._get_container_state() state = yield from self._get_container_state()
yield from self.close() yield from self.close()
yield from self.create() yield from self.create()
self.console = console self.console = console
self.aux = aux
if state == "running": if state == "running":
yield from self.start() yield from self.start()

2
tests/modules/docker/test_docker_vm.py
View File

@ -451,6 +451,7 @@ def test_update(loop, vm):
} }
original_console = vm.console original_console = vm.console
original_aux = vm.aux
with asyncio_patch("gns3server.modules.docker.Docker.list_images", return_value=[{"image": "ubuntu"}]) as mock_list_images: with asyncio_patch("gns3server.modules.docker.Docker.list_images", return_value=[{"image": "ubuntu"}]) as mock_list_images:
with asyncio_patch("gns3server.modules.docker.DockerVM._get_container_state", return_value="stopped"): with asyncio_patch("gns3server.modules.docker.DockerVM._get_container_state", return_value="stopped"):
@ -481,6 +482,7 @@ def test_update(loop, vm):
"Cmd": ["/bin/sh"] "Cmd": ["/bin/sh"]
}) })
assert vm.console == original_console assert vm.console == original_console
assert vm.aux == original_aux
def test_update_running(loop, vm): def test_update_running(loop, vm):