NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-02-12 03:03:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into unstable

Browse Source
This commit is contained in:
Julien Duponchelle 2015-09-22 14:40:13 +02:00
commit e7ea9e8047
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gns3server/modules/dynamips/nodes/router.py
View File

@ -338,8 +338,6 @@ class Router(BaseVM):
return return
log.debug('Router "{name}" [{id}] is closing'.format(name=self._name, id=self._id)) log.debug('Router "{name}" [{id}] is closing'.format(name=self._name, id=self._id))
if self._dynamips_id in self._dynamips_ids[self._project.id]:
self._dynamips_ids[self._project.id].remove(self._dynamips_id)
if self._console: if self._console:
self._manager.port_manager.release_tcp_port(self._console, self._project) self._manager.port_manager.release_tcp_port(self._console, self._project)
@ -1628,6 +1626,9 @@ class Router(BaseVM):
log.warn("Could not delete file {}: {}".format(file, e)) log.warn("Could not delete file {}: {}".format(file, e))
continue continue
if self._dynamips_id in self._dynamips_ids[self._project.id]:
self._dynamips_ids[self._project.id].remove(self._dynamips_id)
@asyncio.coroutine @asyncio.coroutine
def clean_delete(self): def clean_delete(self):
""" """