mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Merge branch '2.2' into 3.0
# Conflicts: # gns3server/appliances/infix.gns3a # gns3server/appliances/juniper-vJunos-router.gns3a # gns3server/controller/ports/port.py # gns3server/crash_report.py # gns3server/utils/asyncio/telnet_server.py # gns3server/version.py
This commit is contained in:
5 files changed
+19
-16
No files matched your search
@@ -83,7 +83,7 @@ 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(f"{self.long_name_type()}{self._interface_number}"):
|
||||
return self.short_name_type() + f"{self._interface_number}"
|
||||
|
||||
Reference in new issue
Block a user