diff --git a/gns3server/compute/docker/docker_vm.py b/gns3server/compute/docker/docker_vm.py index 350c6441..b73ea734 100644 --- a/gns3server/compute/docker/docker_vm.py +++ b/gns3server/compute/docker/docker_vm.py @@ -325,7 +325,7 @@ class DockerVM(BaseNode): aux = self.aux state = yield from self._get_container_state() - yield from self.close() + yield from self.reset() yield from self.create() self.console = console self.aux = aux @@ -421,7 +421,8 @@ class DockerVM(BaseNode): if shutil.which("Xvfb") is None or shutil.which("x11vnc") is None: raise DockerError("Please install Xvfb and x11vnc before using the VNC support") self._xvfb_process = yield from asyncio.create_subprocess_exec("Xvfb", "-nolisten", "tcp", ":{}".format(self._display), "-screen", "0", self._console_resolution + "x16") - self._x11vnc_process = yield from asyncio.create_subprocess_exec("x11vnc", "-forever", "-nopw", "-shared", "-geometry", self._console_resolution, "-display", "WAIT:{}".format(self._display), "-rfbport", str(self.console), "-noncache", "-listen", self._manager.port_manager.console_host) + # We pass a port for TCPV6 due to a crash in X11VNC if not here: https://github.com/GNS3/gns3-server/issues/569 + self._x11vnc_process = yield from asyncio.create_subprocess_exec("x11vnc", "-forever", "-nopw", "-shared", "-geometry", self._console_resolution, "-display", "WAIT:{}".format(self._display), "-rfbport", str(self.console), "-rfbportv6", str(self.console), "-noncache", "-listen", self._manager.port_manager.console_host) x11_socket = os.path.join("/tmp/.X11-unix/", "X{}".format(self._display)) yield from wait_for_file_creation(x11_socket) @@ -570,7 +571,10 @@ class DockerVM(BaseNode): if not (yield from super().close()): return False + yield from self.reset() + @asyncio.coroutine + def reset(self): try: if self.console_type == "vnc": if self._x11vnc_process: @@ -587,7 +591,9 @@ class DockerVM(BaseNode): state = yield from self._get_container_state() if state == "paused" or state == "running": yield from self.stop() - yield from self.manager.query("DELETE", "containers/{}".format(self._cid), params={"force": 1}) + # v – 1/True/true or 0/False/false, Remove the volumes associated to the container. Default false. + # force - 1/True/true or 0/False/false, Kill then remove the container. Default false. + yield from self.manager.query("DELETE", "containers/{}".format(self._cid), params={"force": 1, "v": 1}) log.info("Docker container '{name}' [{image}] removed".format( name=self._name, image=self._image)) diff --git a/gns3server/compute/iou/ioucon.py b/gns3server/compute/iou/ioucon.py index 7aeb0287..a0785d7c 100644 --- a/gns3server/compute/iou/ioucon.py +++ b/gns3server/compute/iou/ioucon.py @@ -550,6 +550,8 @@ def send_recv_loop(epoll, console, router, esc_char, stop_event): esc_state = True else: router.write(buf) + except ConnectionError as e: + pass finally: router.unregister(epoll) console.unregister(epoll) diff --git a/tests/compute/docker/test_docker_vm.py b/tests/compute/docker/test_docker_vm.py index b5cd2e55..49254269 100644 --- a/tests/compute/docker/test_docker_vm.py +++ b/tests/compute/docker/test_docker_vm.py @@ -520,7 +520,7 @@ def test_update(loop, vm): with asyncio_patch("gns3server.compute.docker.Docker.query", return_value=response) as mock_query: loop.run_until_complete(asyncio.async(vm.update())) - mock_query.assert_any_call("DELETE", "containers/e90e34656842", params={"force": 1}) + mock_query.assert_any_call("DELETE", "containers/e90e34656842", params={"force": 1, "v": 1}) mock_query.assert_any_call("POST", "containers/create", data={ "Tty": True, "OpenStdin": True, @@ -588,7 +588,7 @@ def test_update_running(loop, vm): with asyncio_patch("gns3server.compute.docker.Docker.query", return_value=response) as mock_query: loop.run_until_complete(asyncio.async(vm.update())) - mock_query.assert_any_call("DELETE", "containers/e90e34656842", params={"force": 1}) + mock_query.assert_any_call("DELETE", "containers/e90e34656842", params={"force": 1, "v": 1}) mock_query.assert_any_call("POST", "containers/create", data={ "Tty": True, "OpenStdin": True, @@ -624,7 +624,7 @@ def test_delete(loop, vm): with asyncio_patch("gns3server.compute.docker.DockerVM._get_container_state", return_value="stopped"): with asyncio_patch("gns3server.compute.docker.Docker.query") as mock_query: loop.run_until_complete(asyncio.async(vm.delete())) - mock_query.assert_called_with("DELETE", "containers/e90e34656842", params={"force": 1}) + mock_query.assert_called_with("DELETE", "containers/e90e34656842", params={"force": 1, "v": 1}) def test_close(loop, vm, port_manager): @@ -638,7 +638,7 @@ def test_close(loop, vm, port_manager): with asyncio_patch("gns3server.compute.docker.DockerVM._get_container_state", return_value="stopped"): with asyncio_patch("gns3server.compute.docker.Docker.query") as mock_query: loop.run_until_complete(asyncio.async(vm.close())) - mock_query.assert_called_with("DELETE", "containers/e90e34656842", params={"force": 1}) + mock_query.assert_called_with("DELETE", "containers/e90e34656842", params={"force": 1, "v": 1}) assert vm._closed is True assert "4242" not in port_manager.udp_ports @@ -653,7 +653,7 @@ def test_close_vnc(loop, vm, port_manager): with asyncio_patch("gns3server.compute.docker.DockerVM._get_container_state", return_value="stopped"): with asyncio_patch("gns3server.compute.docker.Docker.query") as mock_query: loop.run_until_complete(asyncio.async(vm.close())) - mock_query.assert_called_with("DELETE", "containers/e90e34656842", params={"force": 1}) + mock_query.assert_called_with("DELETE", "containers/e90e34656842", params={"force": 1, "v": 1}) assert vm._closed is True assert vm._xvfb_process.terminate.called @@ -891,7 +891,7 @@ def test_start_vnc(vm, loop): loop.run_until_complete(asyncio.async(vm._start_vnc())) assert vm._display is not None mock_exec.assert_any_call("Xvfb", "-nolisten", "tcp", ":{}".format(vm._display), "-screen", "0", "1280x1024x16") - mock_exec.assert_any_call("x11vnc", "-forever", "-nopw", "-shared", "-geometry", "1280x1024", "-display", "WAIT:{}".format(vm._display), "-rfbport", str(vm.console), "-noncache", "-listen", "127.0.0.1") + mock_exec.assert_any_call("x11vnc", "-forever", "-nopw", "-shared", "-geometry", "1280x1024", "-display", "WAIT:{}".format(vm._display), "-rfbport", str(vm.console), "-rfbportv6", str(vm.console), "-noncache", "-listen", "127.0.0.1") mock_wait.assert_called_with("/tmp/.X11-unix/X{}".format(vm._display))