Merge pull request #3171 from p3lim/T6161

op-mode: T6161: Show container details in JSON format
vyos · Mar 23, 2024 · 91cd3ea · 91cd3ea
2 parents 51ca65b + b5d10d1
commit 91cd3ea
Showing 1 changed file with 31 additions and 4 deletions.
diff --git a/op-mode-definitions/container.xml.in b/op-mode-definitions/container.xml.in
@@ -103,27 +103,54 @@
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/container.py show_container</command>
         <children>
-          <leafNode name="image">
+          <node name="json">
+            <properties>
+              <help>Show containers in JSON format</help>
+            </properties>
+            <!-- no admin check -->
+            <command>sudo ${vyos_op_scripts_dir}/container.py show_container --raw</command>
+          </node>
+          <node name="image">
             <properties>
               <help>Show container image</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/container.py show_image</command>
-          </leafNode>
+            <children>
+              <node name="json">
+                <properties>
+                  <help>Show container image in JSON format</help>
+                </properties>
+                <!-- no admin check -->
+                <command>sudo ${vyos_op_scripts_dir}/container.py show_image --raw</command>
+              </node>
+            </children>
+          </node>
           <tagNode name="log">
             <properties>
               <help>Show logs from a given container</help>
               <completionHelp>
                 <path>container name</path>
               </completionHelp>
             </properties>
+            <!-- no admin check -->
             <command>sudo podman logs --names "$4"</command>
           </tagNode>
-          <leafNode name="network">
+          <node name="network">
             <properties>
               <help>Show available container networks</help>
             </properties>
+            <!-- no admin check -->
             <command>sudo ${vyos_op_scripts_dir}/container.py show_network</command>
-          </leafNode>
+            <children>
+              <node name="json">
+                <properties>
+                  <help>Show available container networks in JSON format</help>
+                </properties>
+                <!-- no admin check -->
+                <command>sudo ${vyos_op_scripts_dir}/container.py show_network --raw</command>
+              </node>
+            </children>
+          </node>
         </children>
       </node>
       <node name="log">