NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-09-10 12:05:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert: restore original port name handling logic

Browse Source
This commit is contained in:
YueGuobin 2026-02-27 00:12:30 +08:00
parent fe73d0e935
commit a343ace637
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/controller/node.py
View File

@ -761,7 +761,8 @@ class Node:
if custom_adapter["adapter_number"] == adapter_number:
custom_adapter_settings = custom_adapter
break
port_name = custom_adapter_settings.get("port_name") or f"eth{adapter_number}"
port_name = f"eth{adapter_number}"
port_name = custom_adapter_settings.get("port_name", port_name)
mac_address = custom_adapter_settings.get("mac_address")
if not mac_address and "mac_address" in self._properties:
mac_address = int_to_macaddress(macaddress_to_int(self._properties["mac_address"]) + adapter_number)

4
gns3server/controller/ports/port.py
View File

@ -83,9 +83,9 @@ class Port:
# If port name format has changed we use the port name as the short name (1.X behavior)
if self._short_name:
return self._short_name
elif self._name and "/" in self._name:
elif "/" in self._name:
return self._name.replace(self.long_name_type(), self.short_name_type())
elif self._name and self._name.startswith(f"{self.long_name_type()}{self._interface_number}"):
elif self._name.startswith(f"{self.long_name_type()}{self._interface_number}"):
return self.short_name_type() + f"{self._interface_number}"
return self._name

6
gns3server/controller/ports/port_factory.py
View File

@ -75,13 +75,13 @@ class StandardPortFactory:
for port_number in range(0, port_by_adapter):
if first_port_name and adapter_number == 0:
port_name = custom_adapter_settings.get("port_name") or first_port_name
port_name = custom_adapter_settings.get("port_name", first_port_name)
port = PortFactory(
port_name, segment_number, adapter_number, port_number, "ethernet", short_name=port_name
)
else:
try:
default_port_name = port_name_format.format(
port_name = port_name_format.format(
interface_number,
segment_number,
adapter=adapter_number,
@ -90,7 +90,7 @@ class StandardPortFactory:
except (IndexError, ValueError, KeyError) as e:
raise ControllerError(f"Invalid port name format {port_name_format}: {str(e)}")
port_name = custom_adapter_settings.get("port_name") or default_port_name
port_name = custom_adapter_settings.get("port_name", port_name)
port = PortFactory(port_name, segment_number, adapter_number, port_number, "ethernet")
interface_number += 1
if port_segment_size: