Merge branch 'current' into equuleus

2 files changed, 86 insertions, 0 deletions

diff --git a/src/migration-scripts/pppoe-server/1-to-2 b/src/migration-scripts/pppoe-server/1-to-2
new file mode 100755
index 000000000..fa83896d3
--- /dev/null
+++ b/src/migration-scripts/pppoe-server/1-to-2
@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+
+# Convert "service pppoe-server interface ethX"
+# to:
+# "service pppoe-server interface ethX {}"
+
+import sys
+
+from vyos.configtree import ConfigTree
+
+if (len(sys.argv) < 1):
+    print("Must specify file name!")
+    sys.exit(1)
+
+file_name = sys.argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+ctree = ConfigTree(config_file)
+cbase = ['service', 'pppoe-server','interface']
+
+if not ctree.exists(cbase):
+  sys.exit(0)
+else:
+  nics = ctree.return_values(cbase)
+  # convert leafNode to a tagNode
+  ctree.set(cbase)
+  ctree.set_tag(cbase)
+  for nic in nics:
+    ctree.set(cbase + [nic])
+
+  try:
+    open(file_name,'w').write(ctree.to_string())
+  except OSError as e:
+    print("Failed to save the modified config: {}".format(e))
+    sys.exit(1)
+
diff --git a/src/migration-scripts/system/6-to-7 b/src/migration-scripts/system/6-to-7
new file mode 100755
index 000000000..bf07abf3a
--- /dev/null
+++ b/src/migration-scripts/system/6-to-7
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+
+# Change smp_affinity to smp-affinity
+
+import sys
+
+from vyos.configtree import ConfigTree
+
+if (len(sys.argv) < 1):
+    print("Must specify file name!")
+    sys.exit(1)
+
+file_name = sys.argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+config = ConfigTree(config_file)
+
+update_required = False
+
+intf_types = config.list_nodes(["interfaces"])
+
+for intf_type in intf_types:
+    intf_type_path = ["interfaces", intf_type]
+    intfs = config.list_nodes(intf_type_path)
+
+    for intf in intfs:
+        intf_path = intf_type_path + [intf]
+        if not config.exists(intf_path + ["smp_affinity"]):
+            # Nothing to do.
+            continue
+        else:
+            # Rename the node.
+            old_smp_affinity_path = intf_path + ["smp_affinity"]
+            config.rename(old_smp_affinity_path, "smp-affinity")
+            update_required = True
+
+if update_required:
+    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))
+        sys.exit(1)
+
+
+