NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-08-27 20:40:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: simplify port name assignment logic

Browse Source 
Refactor port name assignment to use `or` operator for fallback values, improving code readability and consistency. Changes applied in `node.py` and `port_factory.py` to handle custom adapter settings more cleanly.
This commit is contained in:
YueGuobin 2026-02-25 22:41:22 +08:00
parent f6777064db
commit cde4bdc114
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/controller/node.py
View File

@ -761,8 +761,7 @@ class Node:
if custom_adapter["adapter_number"] == adapter_number:
custom_adapter_settings = custom_adapter
break
port_name = f"eth{adapter_number}"
port_name = custom_adapter_settings.get("port_name", port_name)
port_name = custom_adapter_settings.get("port_name") or f"eth{adapter_number}"
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)

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", first_port_name)
port_name = custom_adapter_settings.get("port_name") or first_port_name
port = PortFactory(
port_name, segment_number, adapter_number, port_number, "ethernet", short_name=port_name
)
else:
try:
port_name = port_name_format.format(
default_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", port_name)
port_name = custom_adapter_settings.get("port_name") or default_port_name
port = PortFactory(port_name, segment_number, adapter_number, port_number, "ethernet")
interface_number += 1
if port_segment_size: