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

Merge pull request #1351 from acaudwell/udp-ports-fix

Browse Source 
Don't release NIO UDP ports when updating docker container.
This commit is contained in:
Jeremy Grossmann 2018-06-11 22:36:17 +07:00 committed by GitHub
commit 72cc3961dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gns3server/compute/docker/docker_vm.py
View File

@ -386,7 +386,8 @@ class DockerVM(BaseNode):
aux = self.aux aux = self.aux
state = yield from self._get_container_state() state = yield from self._get_container_state()
yield from self.reset() # reset the docker container, but don't release the NIO UDP ports
yield from self.reset(False)
yield from self.create() yield from self.create()
self.console = console self.console = console
self.aux = aux self.aux = aux
@ -680,7 +681,8 @@ class DockerVM(BaseNode):
yield from self.reset() yield from self.reset()
@asyncio.coroutine @asyncio.coroutine
def reset(self): def reset(self, release_nio_udp_ports=True):
try: try:
state = yield from self._get_container_state() state = yield from self._get_container_state()
if state == "paused" or state == "running": if state == "paused" or state == "running":
@ -706,11 +708,12 @@ class DockerVM(BaseNode):
log.info("Docker container '{name}' [{image}] removed".format( log.info("Docker container '{name}' [{image}] removed".format(
name=self._name, image=self._image)) name=self._name, image=self._image))
for adapter in self._ethernet_adapters: if release_nio_udp_ports:
if adapter is not None: for adapter in self._ethernet_adapters:
for nio in adapter.ports.values(): if adapter is not None:
if nio and isinstance(nio, NIOUDP): for nio in adapter.ports.values():
self.manager.port_manager.release_udp_port(nio.lport, self._project) if nio and isinstance(nio, NIOUDP):
self.manager.port_manager.release_udp_port(nio.lport, self._project)
# Ignore runtime error because when closing the server # Ignore runtime error because when closing the server
except (DockerHttp404Error, RuntimeError) as e: except (DockerHttp404Error, RuntimeError) as e:
log.debug("Docker error when closing: {}".format(str(e))) log.debug("Docker error when closing: {}".format(str(e)))