1 files changed, 21 insertions, 9 deletions
diff --git a/src/op_mode/container.py b/src/op_mode/container.py
index ce466ffc1..5a022d0c0 100755
--- a/src/op_mode/container.py
+++ b/src/op_mode/container.py
@@ -19,11 +19,10 @@ import sys
 
 from sys import exit
 
-from vyos.util import cmd
+from vyos.utils.process import cmd
 
 import vyos.opmode
 
-
 def _get_json_data(command: str) -> list:
     """
     Get container command format JSON
@@ -36,9 +35,22 @@ def _get_raw_data(command: str) -> list:
     data = json.loads(json_data)
     return data
 
+def add_image(name: str):
+    from vyos.utils.process import rc_cmd
+
+    rc, output = rc_cmd(f'podman image pull {name}')
+    if rc != 0:
+        raise vyos.opmode.InternalError(output)
+
+def delete_image(name: str):
+    from vyos.utils.process import rc_cmd
+
+    rc, output = rc_cmd(f'podman image rm --force {name}')
+    if rc != 0:
+        raise vyos.opmode.InternalError(output)
 
 def show_container(raw: bool):
-    command = 'sudo podman ps --all'
+    command = 'podman ps --all'
     container_data = _get_raw_data(command)
     if raw:
         return container_data
@@ -47,8 +59,8 @@ def show_container(raw: bool):
 
 
 def show_image(raw: bool):
-    command = 'sudo podman image ls'
-    container_data = _get_raw_data('sudo podman image ls')
+    command = 'podman image ls'
+    container_data = _get_raw_data('podman image ls')
     if raw:
         return container_data
     else:
@@ -56,7 +68,7 @@ def show_image(raw: bool):
 
 
 def show_network(raw: bool):
-    command = 'sudo podman network ls'
+    command = 'podman network ls'
     container_data = _get_raw_data(command)
     if raw:
         return container_data
@@ -65,13 +77,13 @@ def show_network(raw: bool):
 
 
 def restart(name: str):
-    from vyos.util import rc_cmd
+    from vyos.utils.process import rc_cmd
 
-    rc, output = rc_cmd(f'sudo podman restart {name}')
+    rc, output = rc_cmd(f'systemctl restart vyos-container-{name}.service')
     if rc != 0:
         print(output)
         return None
-    print(f'Container name "{name}" restarted!')
+    print(f'Container "{name}" restarted!')
     return output