Merge branch 'current' into 2fa

1 files changed, 7 insertions, 1 deletions

diff --git a/src/op_mode/show_ipsec_sa.py b/src/op_mode/show_ipsec_sa.py
index e491267fd..c964caaeb 100755
--- a/src/op_mode/show_ipsec_sa.py
+++ b/src/op_mode/show_ipsec_sa.py
@@ -23,6 +23,12 @@ import hurry.filesize
 
 import vyos.util
 
+def convert(text):
+    return int(text) if text.isdigit() else text.lower()
+
+def alphanum_key(key):
+    return [convert(c) for c in re.split('([0-9]+)', str(key))]
+
 def format_output(conns, sas):
     sa_data = []
 
@@ -111,7 +117,7 @@ if __name__ == '__main__':
 
         headers = ["Connection", "State", "Uptime", "Bytes In/Out", "Packets In/Out", "Remote address", "Remote ID", "Proposal"]
         sa_data = format_output(conns, sas)
-        sa_data = sorted(sa_data, key=lambda peer: peer[0])
+        sa_data = sorted(sa_data, key=alphanum_key)
         output = tabulate.tabulate(sa_data, headers)
         print(output)
     except PermissionError: