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

Merge remote-tracking branch 'origin/master' into 2.2

Browse Source
This commit is contained in:
grossmj 2026-03-23 09:38:13 +08:00
commit 667833dda5
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,9 +84,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 '/' in self._name:
elif self._name and '/' in self._name:
return self._name.replace(self.long_name_type(), self.short_name_type())
elif self._name.startswith("{}{}".format(self.long_name_type(), self._interface_number)):
elif self._name and self._name.startswith("{}{}".format(self.long_name_type(), self._interface_number)):
return self.short_name_type() + "{}".format(self._interface_number)
return self._name

7
tests/controller/test_node_port_name.py
View File

@ -132,6 +132,13 @@ def test_list_ports_port_name_format(node):
assert node.__json__()["ports"][1]["name"] == "eth0/0"
def test_short_name_none():
"""
Test short_name does not raise exception when name is None
"""
assert EthernetPort(None, 0, 0, 0).short_name is None
def test_list_ports_adapters(node):
"""
List port using adapters properties