1 files changed, 17 insertions, 70 deletions

diff --git a/src/op_mode/vpn_ipsec.py b/src/op_mode/vpn_ipsec.py
index 68dc5bc45..ef89e605f 100755
--- a/src/op_mode/vpn_ipsec.py
+++ b/src/op_mode/vpn_ipsec.py
@@ -16,12 +16,12 @@
 
 import re
 import argparse
-from subprocess import TimeoutExpired
 
-from vyos.util import call
+from vyos.utils.process import call
 
 SWANCTL_CONF = '/etc/swanctl/swanctl.conf'
 
+
 def get_peer_connections(peer, tunnel, return_all = False):
     search = rf'^[\s]*(peer_{peer}_(tunnel_[\d]+|vti)).*'
     matches = []
@@ -34,73 +34,22 @@ def get_peer_connections(peer, tunnel, return_all = False):
                     matches.append(result[1])
     return matches
 
-def reset_peer(peer, tunnel):
-    if not peer:
-        print('Invalid peer, aborting')
-        return
-
-    conns = get_peer_connections(peer, tunnel, return_all = (not tunnel or tunnel == 'all'))
-
-    if not conns:
-        print('Tunnel(s) not found, aborting')
-        return
-
-    result = True
-    for conn in conns:
-        try:
-            call(f'sudo /usr/sbin/ipsec down {conn}{{*}}', timeout = 10)
-            call(f'sudo /usr/sbin/ipsec up {conn}', timeout = 10)
-        except TimeoutExpired as e:
-            print(f'Timed out while resetting {conn}')
-            result = False
-
-
-    print('Peer reset result: ' + ('success' if result else 'failed'))
-
-def get_profile_connection(profile, tunnel = None):
-    search = rf'(dmvpn-{profile}-[\w]+)' if tunnel == 'all' else rf'(dmvpn-{profile}-{tunnel})'
-    with open(SWANCTL_CONF, 'r') as f:
-        for line in f.readlines():
-            result = re.search(search, line)
-            if result:
-                return result[1]
-    return None
-
-def reset_profile(profile, tunnel):
-    if not profile:
-        print('Invalid profile, aborting')
-        return
-
-    if not tunnel:
-        print('Invalid tunnel, aborting')
-        return
-
-    conn = get_profile_connection(profile)
-
-    if not conn:
-        print('Profile not found, aborting')
-        return
-
-    call(f'sudo /usr/sbin/ipsec down {conn}')
-    result = call(f'sudo /usr/sbin/ipsec up {conn}')
-
-    print('Profile reset result: ' + ('success' if result == 0 else 'failed'))
 
 def debug_peer(peer, tunnel):
     peer = peer.replace(':', '-')
     if not peer or peer == "all":
         debug_commands = [
-            "sudo ipsec statusall",
-            "sudo swanctl -L",
-            "sudo swanctl -l",
-            "sudo swanctl -P",
-            "sudo ip x sa show",
-            "sudo ip x policy show",
-            "sudo ip tunnel show",
-            "sudo ip address",
-            "sudo ip rule show",
-            "sudo ip route | head -100",
-            "sudo ip route show table 220"
+            "ipsec statusall",
+            "swanctl -L",
+            "swanctl -l",
+            "swanctl -P",
+            "ip x sa show",
+            "ip x policy show",
+            "ip tunnel show",
+            "ip address",
+            "ip rule show",
+            "ip route | head -100",
+            "ip route show table 220"
         ]
         for debug_cmd in debug_commands:
             print(f'\n### {debug_cmd} ###')
@@ -117,7 +66,8 @@ def debug_peer(peer, tunnel):
         return
 
     for conn in conns:
-        call(f'sudo /usr/sbin/ipsec statusall | grep {conn}')
+        call(f'/usr/sbin/ipsec statusall | grep {conn}')
+
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
@@ -127,9 +77,6 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
 
-    if args.action == 'reset-peer':
-        reset_peer(args.name, args.tunnel)
-    elif args.action == "reset-profile":
-        reset_profile(args.name, args.tunnel)
-    elif args.action == "vpn-debug":
+
+    if args.action == "vpn-debug":
         debug_peer(args.name, args.tunnel)