6 files changed, 94 insertions, 14 deletions
diff --git a/src/op_mode/bridge.py b/src/op_mode/bridge.py
index fe8dadd70..5a821a287 100755
--- a/src/op_mode/bridge.py
+++ b/src/op_mode/bridge.py
@@ -22,7 +22,7 @@ import typing
 from sys import exit
 from tabulate import tabulate
 
-from vyos.util import cmd
+from vyos.util import cmd, rc_cmd
 from vyos.util import dict_search
 
 import vyos.opmode
@@ -57,7 +57,11 @@ def _get_raw_data_fdb(bridge):
     """Get MAC-address for the bridge brX
     :returns list
     """
-    json_data = cmd(f'sudo bridge --json fdb show br {bridge}')
+    code, json_data = rc_cmd(f'sudo bridge --json fdb show br {bridge}')
+    # From iproute2 fdb.c, fdb_show() will only exit(-1) in case of
+    # non-existent bridge device; raise error.
+    if code == 255:
+        raise vyos.opmode.UnconfiguredSubsystem(f"no such bridge device {bridge}")
     data_dict = json.loads(json_data)
     return data_dict
 
diff --git a/src/op_mode/route.py b/src/op_mode/route.py
index e1eee5bbf..e1eee5bbf 100644..100755
--- a/src/op_mode/route.py
+++ b/src/op_mode/route.py
diff --git a/src/op_mode/show_nat66_statistics.py b/src/op_mode/show_nat66_statistics.py
index bc81692ae..cb10aed9f 100755
--- a/src/op_mode/show_nat66_statistics.py
+++ b/src/op_mode/show_nat66_statistics.py
@@ -44,7 +44,7 @@ group.add_argument("--destination", help="Show statistics for configured destina
 args = parser.parse_args()
 
 if args.source or args.destination:
-    tmp = cmd('sudo nft -j list table ip6 nat')
+    tmp = cmd('sudo nft -j list table ip6 vyos_nat')
     tmp = json.loads(tmp)
 
     source = r"nftables[?rule.chain=='POSTROUTING'].rule.{chain: chain, handle: handle, comment: comment, counter: expr[].counter | [0], interface: expr[].match.right | [0] }"
diff --git a/src/op_mode/show_nat_statistics.py b/src/op_mode/show_nat_statistics.py
index c568c8305..be41e083b 100755
--- a/src/op_mode/show_nat_statistics.py
+++ b/src/op_mode/show_nat_statistics.py
@@ -44,7 +44,7 @@ group.add_argument("--destination", help="Show statistics for configured destina
 args = parser.parse_args()
 
 if args.source or args.destination:
-    tmp = cmd('sudo nft -j list table ip nat')
+    tmp = cmd('sudo nft -j list table ip vyos_nat')
     tmp = json.loads(tmp)
 
     source = r"nftables[?rule.chain=='POSTROUTING'].rule.{chain: chain, handle: handle, comment: comment, counter: expr[].counter | [0], interface: expr[].match.right | [0] }"
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)
+
diff --git a/src/op_mode/show_uptime.py b/src/op_mode/uptime.py
index b70c60cf8..2ebe6783b 100755
--- a/src/op_mode/show_uptime.py
+++ b/src/op_mode/uptime.py
@@ -14,7 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-def get_uptime_seconds():
+import sys
+
+import vyos.opmode
+
+def _get_uptime_seconds():
   from re import search
   from vyos.util import read_file
 
@@ -23,7 +27,7 @@ def get_uptime_seconds():
 
   return int(float(seconds))
 
-def get_load_averages():
+def _get_load_averages():
     from re import search
     from vyos.util import cmd
     from vyos.cpu import get_core_count
@@ -40,19 +44,17 @@ def get_load_averages():
 
     return res
 
-def get_raw_data():
+def _get_raw_data():
     from vyos.util import seconds_to_human
 
     res = {}
-    res["uptime_seconds"] = get_uptime_seconds()
-    res["uptime"] = seconds_to_human(get_uptime_seconds())
-    res["load_average"] = get_load_averages()
+    res["uptime_seconds"] = _get_uptime_seconds()
+    res["uptime"] = seconds_to_human(_get_uptime_seconds())
+    res["load_average"] = _get_load_averages()
 
     return res
 
-def get_formatted_output():
-    data = get_raw_data()
-
+def _get_formatted_output(data):
     out = "Uptime: {}\n\n".format(data["uptime"])
     avgs = data["load_average"]
     out += "Load averages:\n"
@@ -62,5 +64,19 @@ def get_formatted_output():
 
     return out
 
+def show(raw: bool):
+    uptime_data = _get_raw_data()
+
+    if raw:
+        return uptime_data
+    else:
+        return _get_formatted_output(uptime_data)
+
 if __name__ == '__main__':
-    print(get_formatted_output())
+    try:
+        res = vyos.opmode.run(sys.modules[__name__])
+        if res:
+            print(res)
+    except (ValueError, vyos.opmode.Error) as e:
+        print(e)
+        sys.exit(1)