From 5721dd3f30ba89b360d3cc07504cbda4783a8b78 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Fri, 12 May 2017 14:12:24 +0200 Subject: [PATCH] Fix port numbering for Wic slot 1 & 2 --- gns3server/controller/ports/port_factory.py | 12 +++++++++--- tests/controller/test_node_port_name.py | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gns3server/controller/ports/port_factory.py b/gns3server/controller/ports/port_factory.py index 4a1fdb93..39dac69c 100644 --- a/gns3server/controller/ports/port_factory.py +++ b/gns3server/controller/ports/port_factory.py @@ -181,7 +181,9 @@ class DynamipsPortFactory: ports = [] adapter_number = 0 - wic_port_number = 16 + wic_slot = 1 + wic_port_number = wic_slot * 16 + display_wic_port_number = 0 for name in sorted(properties.keys()): if name.startswith("slot") and properties[name]: port_class = cls.ADAPTER_MATRIX[properties[name]]["port"] @@ -194,9 +196,13 @@ class DynamipsPortFactory: port_class = cls.WIC_MATRIX[properties[name]]["port"] if port_class: for port_number in range(0, cls.WIC_MATRIX[properties[name]]["nb_ports"]): - name = "{}{}/{}".format(port_class.long_name_type(), 0, wic_port_number - 16) + name = "{}{}/{}".format(port_class.long_name_type(), 0, display_wic_port_number) port = port_class(name, 0, 0, wic_port_number) - port.short_name = "{}{}/{}".format(port.short_name_type, 0, wic_port_number - 16) + port.short_name = "{}{}/{}".format(port.short_name_type, 0, display_wic_port_number) ports.append(port) + display_wic_port_number += 1 wic_port_number += 1 + wic_slot += 1 + wic_port_number = wic_slot * 16 + return ports diff --git a/tests/controller/test_node_port_name.py b/tests/controller/test_node_port_name.py index 9ccf55db..5da90dc8 100644 --- a/tests/controller/test_node_port_name.py +++ b/tests/controller/test_node_port_name.py @@ -576,7 +576,7 @@ def test_list_ports_dynamips(project, compute): "Cisco HDLC": "DLT_C_HDLC", "Cisco PPP": "DLT_PPP_SERIAL", "Frame Relay": "DLT_FRELAY"}, - "port_number": 18, + "port_number": 32, "adapter_number": 0, "link_type": "serial" }, @@ -587,7 +587,7 @@ def test_list_ports_dynamips(project, compute): "Cisco HDLC": "DLT_C_HDLC", "Cisco PPP": "DLT_PPP_SERIAL", "Frame Relay": "DLT_FRELAY"}, - "port_number": 19, + "port_number": 33, "adapter_number": 0, "link_type": "serial" }