NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 14:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3server/controller/ports/port_factory.py
This commit is contained in:
grossmj committed 2018-08-13 22:06:44 +07:00
2 parents daa2de4541 23e83b730b
commit dac3ba19b7
3 files changed
+14 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/controller/ports/port.py
+5 -3
View File
@@ -84,9 +84,11 @@ 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 not self._name.startswith("{}{}".format(self.long_name_type(), self._interface_number)):
return self._name
return self.short_name_type + "{}/{}".format(self._interface_number, self._port_number)
elif '/' 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)):
return self.short_name_type + "{}".format(self._interface_number)
return self._name
@short_name.setter
def short_name(self, val):
gns3server/controller/ports/port_factory.py
+4 -2
View File
@@ -72,7 +72,7 @@ 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 = PortFactory(port_name, segment_number, adapter_number, port_number, "ethernet")
port = PortFactory(port_name, segment_number, adapter_number, port_number, "ethernet", short_name=port_name)
else:
try:
port_name = port_name_format.format(
@@ -208,7 +208,9 @@ class DynamipsPortFactory:
if port_class:
for port_number in range(0, cls.ADAPTER_MATRIX[properties[name]]["nb_ports"]):
name = "{}{}/{}".format(port_class.long_name_type(), adapter_number, port_number)
ports.append(port_class(name, adapter_number, adapter_number, port_number))
port = port_class(name, adapter_number, adapter_number, port_number)
port.short_name = "{}{}/{}".format(port.short_name_type, adapter_number, port_number)
ports.append(port)
adapter_number += 1
elif name.startswith("wic") and properties[name]:
port_class = cls.WIC_MATRIX[properties[name]]["port"]