From 23e83b730be32710210aca9ff5ad1b80aa298a25 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 13 Aug 2018 15:45:24 +0700
Subject: [PATCH] Fix some more problems with interface short names. Fixes
 https://github.com/GNS3/gns3-gui/issues/2562

---
 gns3server/controller/ports/port.py     | 4 +++-
 tests/controller/test_node_port_name.py | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gns3server/controller/ports/port.py b/gns3server/controller/ports/port.py
index 60825b0c..52b58530 100644
--- a/gns3server/controller/ports/port.py
+++ b/gns3server/controller/ports/port.py
@@ -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
diff --git a/tests/controller/test_node_port_name.py b/tests/controller/test_node_port_name.py
index 5da90dc8..55a7a6f2 100644
--- a/tests/controller/test_node_port_name.py
+++ b/tests/controller/test_node_port_name.py
@@ -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"