4 files changed, 95 insertions, 3 deletions
diff --git a/src/op_mode/nat.py b/src/op_mode/nat.py
index 1339d5b92..a0496dedb 100755
--- a/src/op_mode/nat.py
+++ b/src/op_mode/nat.py
@@ -60,7 +60,7 @@ def _get_json_data(direction, family):
     if direction == 'destination':
         chain = 'PREROUTING'
     family = 'ip6' if family == 'inet6' else 'ip'
-    return cmd(f'sudo nft --json list chain {family} nat {chain}')
+    return cmd(f'sudo nft --json list chain {family} vyos_nat {chain}')
 
 
 def _get_raw_data_rules(direction, family):
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/system.py b/src/op_mode/system.py
new file mode 100755
index 000000000..11a3a8730
--- /dev/null
+++ b/src/op_mode/system.py
@@ -0,0 +1,92 @@
+#!/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 jmespath
+import json
+import sys
+import requests
+import typing
+
+from sys import exit
+
+from vyos.configquery import ConfigTreeQuery
+
+import vyos.opmode
+import vyos.version
+
+config = ConfigTreeQuery()
+base = ['system', 'update-check']
+
+
+def _compare_version_raw():
+    url = config.value(base + ['url'])
+    local_data = vyos.version.get_full_version_data()
+    remote_data = vyos.version.get_remote_version(url)
+    if not remote_data:
+        return {"error": True,
+                "reason": "Unable to get remote version"}
+    if local_data.get('version') and remote_data:
+        local_version = local_data.get('version')
+        remote_version = jmespath.search('[0].version', remote_data)
+        image_url = jmespath.search('[0].url', remote_data)
+        if local_data.get('version') != remote_version:
+            return {"error": False,
+                    "update_available": True,
+                    "local_version": local_version,
+                    "remote_version": remote_version,
+                    "url": image_url}
+        return {"update_available": False,
+                "local_version": local_version,
+                "remote_version": remote_version}
+
+
+def _formatted_compare_version(data):
+    local_version = data.get('local_version')
+    remote_version = data.get('remote_version')
+    url = data.get('url')
+    if {'update_available','local_version', 'remote_version', 'url'} <= set(data):
+        return f'Current version: {local_version}\n\nUpdate available: {remote_version}\nUpdate URL: {url}'
+    elif local_version == remote_version and remote_version is not None:
+        return f'No available updates for your system \n' \
+               f'current version: {local_version}\nremote version: {remote_version}'
+    else:
+        return 'Update not found'
+
+
+def _verify():
+    if not config.exists(base):
+        return False
+    return True
+
+
+def show_update(raw: bool):
+    if not _verify():
+        raise vyos.opmode.UnconfiguredSubsystem("system update-check not configured")
+    data = _compare_version_raw()
+    if raw:
+        return data
+    else:
+        return _formatted_compare_version(data)
+
+
+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)