3 files changed, 62 insertions, 5 deletions
diff --git a/src/migration-scripts/snmp/0-to-1 b/src/migration-scripts/snmp/0-to-1
index a836f7011..b1e61b958 100755
--- a/src/migration-scripts/snmp/0-to-1
+++ b/src/migration-scripts/snmp/0-to-1
@@ -17,7 +17,7 @@
 import sys
 from vyos.configtree import ConfigTree
 
-if (len(sys.argv) < 1):
+if len(sys.argv) < 2:
     print("Must specify file name!")
     sys.exit(1)
 
@@ -33,18 +33,18 @@ if not config.exists(config_base):
     # Nothing to do
     sys.exit(0)
 else:
-    # we no longer support a per trap target engine ID (https://phabricator.vyos.net/T818)
+    # we no longer support a per trap target engine ID (https://vyos.dev/T818)
     if config.exists(config_base + ['v3', 'trap-target']):
         for target in config.list_nodes(config_base + ['v3', 'trap-target']):
             config.delete(config_base + ['v3', 'trap-target', target, 'engineid'])
 
-    # we no longer support a per user engine ID (https://phabricator.vyos.net/T818)
+    # we no longer support a per user engine ID (https://vyos.dev/T818)
     if config.exists(config_base + ['v3', 'user']):
         for user in config.list_nodes(config_base + ['v3', 'user']):
             config.delete(config_base + ['v3', 'user', user, 'engineid'])
 
     # we drop TSM support as there seem to be no users and this code is untested
-    # https://phabricator.vyos.net/T1769
+    # https://vyos.dev/T1769
     if config.exists(config_base + ['v3', 'tsm']):
         config.delete(config_base + ['v3', 'tsm'])
 
diff --git a/src/migration-scripts/snmp/1-to-2 b/src/migration-scripts/snmp/1-to-2
index 466a624e6..e02cd1aa1 100755
--- a/src/migration-scripts/snmp/1-to-2
+++ b/src/migration-scripts/snmp/1-to-2
@@ -43,7 +43,7 @@ def migrate_keys(config, path):
             config.set(config_path_priv, value=tmp)
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/snmp/2-to-3 b/src/migration-scripts/snmp/2-to-3
new file mode 100755
index 000000000..30911aa27
--- /dev/null
+++ b/src/migration-scripts/snmp/2-to-3
@@ -0,0 +1,57 @@
+#!/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/>.
+
+# T4857: Implement FRR SNMP recomendations
+#  cli changes from:
+#  set service snmp oid-enable route-table
+#  To
+#  set service snmp oid-enable ip-forward
+
+import re
+
+from sys import argv
+from sys import exit
+
+from vyos.configtree import ConfigTree
+from vyos.ifconfig import Section
+
+if len(argv) < 2:
+    print("Must specify file name!")
+    exit(1)
+
+file_name = argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+base = ['service snmp']
+config = ConfigTree(config_file)
+
+if not config.exists(base):
+    # Nothing to do
+    exit(0)
+
+if config.exists(base + ['oid-enable']):
+    config.delete(base + ['oid-enable'])
+    config.set(base + ['oid-enable'], 'ip-forward')
+
+
+try:
+    with open(file_name, 'w') as f:
+        f.write(config.to_string())
+except OSError as e:
+    print("Failed to save the modified config: {}".format(e))
+    exit(1)