2 files changed, 33 insertions, 1 deletions
diff --git a/python/vyos/ifconfig/__init__.py b/python/vyos/ifconfig/__init__.py
index 1757adf26..a7cdeadd1 100644
--- a/python/vyos/ifconfig/__init__.py
+++ b/python/vyos/ifconfig/__init__.py
@@ -31,6 +31,7 @@ from vyos.ifconfig.macvlan import MACVLANIf
 from vyos.ifconfig.vxlan import VXLANIf
 from vyos.ifconfig.wireguard import WireGuardIf
 from vyos.ifconfig.vtun import VTunIf
+from vyos.ifconfig.vti import VTIIf
 from vyos.ifconfig.pppoe import PPPoEIf
 from vyos.ifconfig.tunnel import GREIf
 from vyos.ifconfig.tunnel import GRETapIf
diff --git a/python/vyos/ifconfig/section.py b/python/vyos/ifconfig/section.py
index 926c22e8a..173a90bb4 100644
--- a/python/vyos/ifconfig/section.py
+++ b/python/vyos/ifconfig/section.py
@@ -13,6 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
+import re
 import netifaces
 
 
@@ -103,12 +104,42 @@ class Section:
             yield ifname
 
     @classmethod
+    def _sort_interfaces(cls, generator):
+        """
+        return a list of the sorted interface by number, vlan, qinq
+        """
+        def key(ifname):
+            value = 0
+            parts = re.split(r'([^0-9]+)([0-9]+)[.]?([0-9]+)?[.]?([0-9]+)?', ifname)
+            length = len(parts)
+            name = parts[1] if length >= 3 else parts[0]
+            # the +1 makes sure eth0.0.0 after eth0.0
+            number = int(parts[2]) + 1 if length >= 4 and parts[2] is not None else 0
+            vlan = int(parts[3]) + 1 if length >= 5 and parts[3] is not None else 0
+            qinq = int(parts[4]) + 1 if length >= 6 and parts[4] is not None else 0
+
+            # so that "lo" (or short names) are handled (as "loa")
+            for n in (name + 'aaa')[:3]:
+                value *= 100
+                value += (ord(n) - ord('a'))
+            value += number
+            # vlan are 16 bits, so this can not overflow
+            value = (value << 16) + vlan
+            value = (value << 16) + qinq
+            return value
+
+        l = list(generator)
+        l.sort(key=key)
+        return l
+
+    @classmethod
     def interfaces(cls, section=''):
         """
         return a list of the name of the configured interface which are under a section
         if no section is provided, then it returns all configured interfaces
         """
-        return list(cls._intf_under_section(section))
+
+        return cls._sort_interfaces(cls._intf_under_section(section))
 
     @classmethod
     def _intf_with_feature(cls, feature=''):