Merge branch 't3255-rpki' of github.com:c-po/vyos-1x into current

* 't3255-rpki' of github.com:c-po/vyos-1x:
  rpki: T3255: provide full protocol support in XML and Python
  op-mode: ssh: support generating client keypair
  smoketest: openvpn: remove print() when generating keys

1 files changed, 58 insertions, 0 deletions

diff --git a/src/migration-scripts/rpki/0-to-1 b/src/migration-scripts/rpki/0-to-1
new file mode 100755
index 000000000..9058af016
--- /dev/null
+++ b/src/migration-scripts/rpki/0-to-1
@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 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/>.
+
+from sys import exit
+from sys import argv
+from vyos.configtree import ConfigTree
+
+if (len(argv) < 1):
+    print("Must specify file name!")
+    exit(1)
+
+file_name = argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+base = ['protocols', 'rpki']
+config = ConfigTree(config_file)
+
+# Nothing to do
+if not config.exists(base):
+    exit(0)
+
+if config.exists(base + ['cache']):
+    preference = 1
+    for cache in config.list_nodes(base + ['cache']):
+        address_node = base + ['cache', cache, 'address']
+        if config.exists(address_node):
+            address = config.return_value(address_node)
+            # We do not longer support the address leafNode, RPKI cache server
+            # IP address is now used from the tagNode
+            config.delete(address_node)
+            # VyOS 1.2 had no per instance preference, setting new defaults
+            config.set(base + ['cache', cache, 'preference'], value=preference)
+            # Increase preference for the next caching peer - actually VyOS 1.2
+            # supported only one but better save then sorry (T3253)
+            preference += 1
+            config.rename(base + ['cache', cache], address)
+
+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)