Merge pull request #1454 from sever-sever/T4585

container: T4585: Rewrite show container

2 files changed, 77 insertions, 3 deletions

diff --git a/op-mode-definitions/container.xml.in b/op-mode-definitions/container.xml.in
index fa66402dc..90bbc6889 100644
--- a/op-mode-definitions/container.xml.in
+++ b/op-mode-definitions/container.xml.in
@@ -100,13 +100,13 @@
         <properties>
           <help>Show containers</help>
         </properties>
-        <command>sudo podman ps --all</command>
+        <command>sudo ${vyos_op_scripts_dir}/container.py show_container</command>
         <children>
           <leafNode name="image">
             <properties>
               <help>Show container image</help>
             </properties>
-            <command>sudo podman image ls</command>
+            <command>sudo ${vyos_op_scripts_dir}/container.py show_image</command>
           </leafNode>
           <tagNode name="log">
             <properties>
@@ -121,7 +121,7 @@
             <properties>
               <help>Show available container networks</help>
             </properties>
-            <command>sudo podman network ls</command>
+            <command>sudo ${vyos_op_scripts_dir}/container.py show_network</command>
           </leafNode>
         </children>
       </node>
diff --git a/src/op_mode/container.py b/src/op_mode/container.py
new file mode 100755
index 000000000..02d4a13b7
--- /dev/null
+++ b/src/op_mode/container.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2022 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import json
+import sys
+
+from sys import exit
+
+from vyos.util import cmd
+
+import vyos.opmode
+
+
+def _get_json_data(command: str) -> list:
+    """
+    Get container command format JSON
+    """
+    return cmd(f'{command} --format json')
+
+
+def _get_raw_data(command: str) -> list:
+    json_data = _get_json_data(command)
+    data = json.loads(json_data)
+    return data
+
+
+def show_container(raw: bool):
+    command = 'sudo podman ps --all'
+    container_data = _get_raw_data(command)
+    if raw:
+        return container_data
+    else:
+        return cmd(command)
+
+
+def show_image(raw: bool):
+    command = 'sudo podman image ls'
+    container_data = _get_raw_data('sudo podman image ls')
+    if raw:
+        return container_data
+    else:
+        return cmd(command)
+
+
+def show_network(raw: bool):
+    command = 'sudo podman network ls'
+    container_data = _get_raw_data(command)
+    if raw:
+        return container_data
+    else:
+        return cmd(command)
+
+
+if __name__ == '__main__':
+    try:
+        res = vyos.opmode.run(sys.modules[__name__])
+        if res:
+            print(res)
+    except ValueError as e:
+        print(e)
+        sys.exit(1)