Fix Serial interface not available for IOU

Fix https://github.com/GNS3/gns3-gui/issues/1512
This commit is contained in:
Julien Duponchelle committed 2016-09-15 11:49:41 +02:00
1 parent ba148df159
commit 5d12a91268
2 files changed
+25 -17

No files matched your search

+13 -5
View File
@@ -51,7 +51,7 @@ class StandardPortFactory:
"""
def __new__(cls, properties, port_by_adapter, first_port_name, port_name_format, port_segment_size):
ports = []
interface_number = segment_number = 0
adapter_number = interface_number = segment_number = 0
if "serial_adapters" in properties:
for adapter_number in range(0, properties["serial_adapters"]):
for port_number in range(0, port_by_adapter):
@@ -62,22 +62,30 @@ class StandardPortFactory:
else:
ethernet_adapters = properties.get("adapters", 1)
for adapter_number in range(0, ethernet_adapters):
if len(ports):
adapter_number += 1
for adapter_number in range(adapter_number, ethernet_adapters + adapter_number):
for port_number in range(0, port_by_adapter):
if first_port_name and adapter_number == 0:
port_name = first_port_name
port = PortFactory(port_name, segment_number, adapter_number, port_number, "ethernet")
else:
port_name = port_name_format.format(
interface_number,
segment_number,
adapter=adapter_number,
**cls._generate_replacement(interface_number, segment_number))
port = PortFactory(port_name, segment_number, adapter_number, port_number, "ethernet")
interface_number += 1
if port_segment_size and interface_number % port_segment_size == 0:
if port_segment_size:
if interface_number % port_segment_size == 0:
segment_number += 1
interface_number = 0
else:
segment_number += 1
interface_number = 0
ports.append(PortFactory(port_name, adapter_number, adapter_number, port_number, "ethernet"))
ports.append(port)
return ports
@staticmethod