diff --git a/gns3server/compute/dynamips/nodes/ethernet_switch.py b/gns3server/compute/dynamips/nodes/ethernet_switch.py index 6e17246f..bf4f7f7c 100644 --- a/gns3server/compute/dynamips/nodes/ethernet_switch.py +++ b/gns3server/compute/dynamips/nodes/ethernet_switch.py @@ -99,10 +99,6 @@ class EthernetSwitch(Device): else: self._ports = ports - @property - def console(self): - return self._console - def __json__(self): ethernet_switch_info = {"name": self.name, diff --git a/tests/compute/dynamips/test_ethernet_switch.py b/tests/compute/dynamips/test_ethernet_switch.py index 9e6dbcb3..1520a4be 100644 --- a/tests/compute/dynamips/test_ethernet_switch.py +++ b/tests/compute/dynamips/test_ethernet_switch.py @@ -17,15 +17,21 @@ from tests.utils import AsyncioMagicMock from gns3server.compute.dynamips.nodes.ethernet_switch import EthernetSwitchConsole +from gns3server.compute.nios.nio_udp import NIOUDP def test_arp_command(async_run): node = AsyncioMagicMock() node.name = "Test" - node._hypervisor.send = AsyncioMagicMock(return_value=["0050.7966.6801 1 nio1", "0050.7966.6802 1 nio2"]) + node.nios = {} + node.nios[0] = NIOUDP(55, "127.0.0.1", 56) + node.nios[0].name = "Ethernet0" + node.nios[1] = NIOUDP(55, "127.0.0.1", 56) + node.nios[1].name = "Ethernet1" + node._hypervisor.send = AsyncioMagicMock(return_value=["0050.7966.6801 1 Ethernet0", "0050.7966.6802 1 Ethernet1"]) console = EthernetSwitchConsole(node) assert async_run(console.arp()) == \ - "Mac VLAN\n" \ - "00:50:79:66:68:01 1\n" \ - "00:50:79:66:68:02 1\n" + "Port Mac VLAN\n" \ + "Ethernet0 00:50:79:66:68:01 1\n" \ + "Ethernet1 00:50:79:66:68:02 1\n" node._hypervisor.send.assert_called_with("ethsw show_mac_addr_table Test")