Use ubridge for dynamips routers

Ref #1109
This commit is contained in:
Julien Duponchelle committed 2017-07-10 20:38:28 +02:00
1 parent c6f28afb7c
commit 557924e91a
11 files changed
+62 -24

No files matched your search

@@ -122,8 +122,8 @@ class ATMSwitch(Device):
@asyncio.coroutine
def close(self):
for nio in self._nios.values():
if nio and isinstance(nio, NIOUDP):
self.manager.port_manager.release_udp_port(nio.lport, self._project)
if nio:
yield from nio.close()
if self._hypervisor:
try:
@@ -120,8 +120,8 @@ class EthernetHub(Bridge):
"""
for nio in self._nios:
if nio and isinstance(nio, NIOUDP):
self.manager.port_manager.release_udp_port(nio.lport, self._project)
if nio:
yield from nio.close()
try:
yield from Bridge.delete(self)
@@ -216,8 +216,8 @@ class EthernetSwitch(Device):
"""
for nio in self._nios.values():
if nio and isinstance(nio, NIOUDP):
self.manager.port_manager.release_udp_port(nio.lport, self._project)
if nio:
yield from nio.close()
self.manager.port_manager.release_tcp_port(self._console, self._project)
if self._hypervisor:
try:
@@ -121,8 +121,8 @@ class FrameRelaySwitch(Device):
@asyncio.coroutine
def close(self):
for nio in self._nios.values():
if nio and isinstance(nio, NIOUDP):
self.manager.port_manager.release_udp_port(nio.lport, self._project)
if nio:
yield from nio.close()
if self._hypervisor:
try:
+4 -2
View File
@@ -388,8 +388,10 @@ class Router(BaseNode):
for adapter in self._slots:
if adapter is not None:
for nio in adapter.ports.values():
if nio and isinstance(nio, NIOUDP):
self.manager.port_manager.release_udp_port(nio.lport, self._project)
if nio:
yield from nio.close()
yield from self._stop_ubridge()
if self in self._hypervisor.devices:
self._hypervisor.devices.remove(self)