arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-17 22:08:35 +00:00
Code Issues Releases Wiki Activity

Fix some more problems with interface short names. Fixes https://github.com/GNS3/gns3-gui/issues/2562

Browse Source
This commit is contained in:
grossmj 2018-08-13 15:45:24 +07:00
parent e5d38811ca
commit 23e83b730b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,9 @@ class Port:
if self._short_name:
return self._short_name
elif '/' in self._name:
return self.short_name_type + "{}/{}".format(self._interface_number, self._port_number)
return self._name.replace(self.long_name_type(), self.short_name_type)
elif self._name.startswith("{}{}".format(self.long_name_type(), self._interface_number)):
return self.short_name_type + "{}".format(self._interface_number)
return self._name
@short_name.setter

9
tests/controller/test_node_port_name.py
View File

@ -54,7 +54,7 @@ def test_list_ports(node):
assert node.__json__()["ports"] == [
{
"name": "Ethernet0",
"short_name": "e0/0",
"short_name": "e0",
"data_link_types": {"Ethernet": "DLT_EN10MB"},
"port_number": 0,
"adapter_number": 0,
@ -143,7 +143,7 @@ def test_list_ports_adapters(node):
assert node.__json__()["ports"] == [
{
"name": "Ethernet0",
"short_name": "e0/0",
"short_name": "e0",
"data_link_types": {"Ethernet": "DLT_EN10MB"},
"port_number": 0,
"adapter_number": 0,
@ -151,7 +151,7 @@ def test_list_ports_adapters(node):
},
{
"name": "Ethernet1",
"short_name": "e1/0",
"short_name": "e1",
"data_link_types": {"Ethernet": "DLT_EN10MB"},
"port_number": 0,
"adapter_number": 1,
@ -596,7 +596,8 @@ def test_list_ports_dynamips(project, compute):
def test_short_name():
# If no customization of port name format return the default short name
assert EthernetPort("Ethernet0", 0, 0, 0).short_name == "e0/0"
assert EthernetPort("Ethernet0", 0, 0, 0).short_name == "e0"
assert EthernetPort("Ethernet0", 0, 0, 0, short_name="mgmt").short_name == "mgmt"
assert EthernetPort("Ethernet0/0", 0, 0, 0).short_name == "e0/0"
# If port name format has change we use the port name as the short name (1.X behavior)
assert EthernetPort("eth0", 0, 0, 0).short_name == "eth0"