3 files changed, 62 insertions, 1 deletions
diff --git a/data/op-mode-standardized.json b/data/op-mode-standardized.json
index e120336f3..2d6f6da41 100644
--- a/data/op-mode-standardized.json
+++ b/data/op-mode-standardized.json
@@ -9,6 +9,7 @@
 "openconnect.py",
 "route.py",
 "ipsec.py",
+"storage.py",
 "uptime.py",
 "version.py",
 "vrf.py"
diff --git a/op-mode-definitions/show-system.xml.in b/op-mode-definitions/show-system.xml.in
index 6962ad374..bd32992aa 100644
--- a/op-mode-definitions/show-system.xml.in
+++ b/op-mode-definitions/show-system.xml.in
@@ -162,7 +162,7 @@
             <properties>
               <help>Show filesystem usage</help>
             </properties>
-            <command>df -h -x squashfs</command>
+            <command>${vyos_op_scripts_dir}/storage.py show</command>
           </leafNode>
           <leafNode name="uptime">
             <properties>
diff --git a/src/op_mode/storage.py b/src/op_mode/storage.py
new file mode 100755
index 000000000..75964c493
--- /dev/null
+++ b/src/op_mode/storage.py
@@ -0,0 +1,60 @@
+#!/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 sys
+
+import vyos.opmode
+from vyos.util import cmd
+
+
+def _get_system_storage(only_persistent=False):
+    if not only_persistent:
+        cmd_str = 'df -h -x squashf'
+    else:
+        cmd_str = 'df -h -t ext4 --output=source,size,used,avail,pcent'
+
+    res = cmd(cmd_str)
+
+    return res
+
+def _get_raw_data():
+    out =  _get_system_storage(only_persistent=True)
+    lines = out.splitlines()
+    lists = [l.split() for l in lines]
+    res = {lists[0][i]: lists[1][i] for i in range(len(lists[0]))}
+
+    return res
+
+def _get_formatted_output():
+    return _get_system_storage()
+
+def show(raw: bool):
+    if raw:
+        return _get_raw_data()
+
+    return _get_formatted_output()
+
+
+if __name__ == '__main__':
+    try:
+        res = vyos.opmode.run(sys.modules[__name__])
+        if res:
+            print(res)
+    except (ValueError, vyos.opmode.Error) as e:
+        print(e)
+        sys.exit(1)
+