arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 00:38:10 +00:00
Code Issues Releases Wiki Activity

Fix short label diplay instead of custom interface labels

Browse Source 
Fix https://github.com/GNS3/gns3-gui/issues/1742, https://github.com/GNS3/gns3-gui/issues/1752
This commit is contained in:
Julien Duponchelle 2017-01-05 16:55:31 +01:00
parent 12f09829e7
commit c06d2e3118
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,9 @@ class Port:
@property @property
def short_name(self): def short_name(self):
# If port name format has change we use the port name as the short name (1.X behavior)
if not self._name.startswith(self.long_name_type()):
return self._name
return self.short_name_type + "{}/{}".format(self._interface_number, self._port_number) return self.short_name_type + "{}/{}".format(self._interface_number, self._port_number)
def __json__(self): def __json__(self):

25
tests/controller/test_port.py Normal file
View File

@ -0,0 +1,25 @@
#!/usr/bin/env python
#
# Copyright (C) 2016 GNS3 Technologies Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from gns3server.controller.ports.ethernet_port import EthernetPort
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"
# 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"