pppoe-server: T2829: shift config migrators by one

As VyOS vrux (1.2.7) requires a mirgator (1-to-2) for the MPPE node change
(T2829) we need to shift all other migrators in 1.3 by one.

As migrators probe the existance of nodes no negative side-effects are
expected.

3 files changed, 134 insertions, 124 deletions

diff --git a/src/migration-scripts/pppoe-server/1-to-2 b/src/migration-scripts/pppoe-server/1-to-2
index 7cae3b5bc..902efb86b 100755
--- a/src/migration-scripts/pppoe-server/1-to-2
+++ b/src/migration-scripts/pppoe-server/1-to-2
@@ -14,7 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Convert "service pppoe-server interface ethX" to: "service pppoe-server interface ethX {}"
+# change mppe node to a leaf node with value prefer
+
+import os
 
 from sys import argv, exit
 from vyos.configtree import ConfigTree
@@ -28,21 +30,32 @@ file_name = 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):
+config = ConfigTree(config_file)
+base = ['service', 'pppoe-server']
+if not config.exists(base):
+    # Nothing to do
     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])
+    mppe_base = base + ['ppp-options', 'mppe']
+    if config.exists(mppe_base):
+        # get current values
+        tmp = config.list_nodes(mppe_base)
+        # drop node(s) first ...
+        config.delete(mppe_base)
+
+        print(tmp)
+        # set new value based on preference
+        if 'require' in tmp:
+            config.set(mppe_base, value='require')
+        elif 'prefer' in tmp:
+            config.set(mppe_base, value='prefer')
+        elif 'deny' in tmp:
+            config.set(mppe_base, value='deny')
 
     try:
-        open(file_name,'w').write(ctree.to_string())
+        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)
+
diff --git a/src/migration-scripts/pppoe-server/2-to-3 b/src/migration-scripts/pppoe-server/2-to-3
index 5f9730a41..7cae3b5bc 100755
--- a/src/migration-scripts/pppoe-server/2-to-3
+++ b/src/migration-scripts/pppoe-server/2-to-3
@@ -14,9 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# - remove primary/secondary identifier from nameserver
-
-import os
+# Convert "service pppoe-server interface ethX" to: "service pppoe-server interface ethX {}"
 
 from sys import argv, exit
 from vyos.configtree import ConfigTree
@@ -30,112 +28,21 @@ file_name = argv[1]
 with open(file_name, 'r') as f:
     config_file = f.read()
 
-config = ConfigTree(config_file)
-base = ['service', 'pppoe-server']
-if not config.exists(base):
-    # Nothing to do
+ctree = ConfigTree(config_file)
+cbase = ['service', 'pppoe-server','interface']
+
+if not ctree.exists(cbase):
     exit(0)
 else:
-
-    # Migrate IPv4 DNS servers
-    dns_base = base + ['dns-servers']
-    if config.exists(dns_base):
-        for server in ['server-1', 'server-2']:
-          if config.exists(dns_base + [server]):
-            dns = config.return_value(dns_base + [server])
-            config.set(base + ['name-server'], value=dns, replace=False)
-
-        config.delete(dns_base)
-
-    # Migrate IPv6 DNS servers
-    dns_base = base + ['dnsv6-servers']
-    if config.exists(dns_base):
-        for server in ['server-1', 'server-2', 'server-3']:
-          if config.exists(dns_base + [server]):
-            dns = config.return_value(dns_base + [server])
-            config.set(base + ['name-server'], value=dns, replace=False)
-
-        config.delete(dns_base)
-
-    # Migrate IPv4 WINS servers
-    wins_base = base + ['wins-servers']
-    if config.exists(wins_base):
-        for server in ['server-1', 'server-2']:
-          if config.exists(wins_base + [server]):
-            wins = config.return_value(wins_base + [server])
-            config.set(base + ['wins-server'], value=wins, replace=False)
-
-        config.delete(wins_base)
-
-    # Migrate radius-settings node to RADIUS and use this as base for the
-    # later migration of the RADIUS servers - this will save a lot of code
-    radius_settings = base + ['authentication', 'radius-settings']
-    if config.exists(radius_settings):
-        config.rename(radius_settings, 'radius')
-
-    # Migrate RADIUS dynamic author / change of authorisation server
-    dae_old = base + ['authentication', 'radius', 'dae-server']
-    if config.exists(dae_old):
-        config.rename(dae_old, 'dynamic-author')
-        dae_new = base + ['authentication', 'radius', 'dynamic-author']
-
-        if config.exists(dae_new + ['ip-address']):
-            config.rename(dae_new + ['ip-address'], 'server')
-
-        if config.exists(dae_new + ['secret']):
-            config.rename(dae_new + ['secret'], 'key')
-
-    # Migrate RADIUS server
-    radius_server = base + ['authentication', 'radius-server']
-    if config.exists(radius_server):
-        new_base = base + ['authentication', 'radius', 'server']
-        config.set(new_base)
-        config.set_tag(new_base)
-        for server in config.list_nodes(radius_server):
-            old_base = radius_server + [server]
-            config.copy(old_base, new_base + [server])
-
-            # migrate key
-            if config.exists(new_base + [server, 'secret']):
-                config.rename(new_base + [server, 'secret'], 'key')
-
-            # remove old req-limit node
-            if config.exists(new_base + [server, 'req-limit']):
-                config.delete(new_base + [server, 'req-limit'])
-
-        config.delete(radius_server)
-
-    # Migrate IPv6 prefixes
-    ipv6_base = base + ['client-ipv6-pool']
-    if config.exists(ipv6_base + ['prefix']):
-        prefix_old = config.return_values(ipv6_base + ['prefix'])
-        # delete old prefix CLI nodes
-        config.delete(ipv6_base + ['prefix'])
-        # create ned prefix tag node
-        config.set(ipv6_base + ['prefix'])
-        config.set_tag(ipv6_base + ['prefix'])
-
-        for p in prefix_old:
-            prefix = p.split(',')[0]
-            mask = p.split(',')[1]
-            config.set(ipv6_base + ['prefix', prefix, 'mask'], value=mask)
-
-    if config.exists(ipv6_base + ['delegate-prefix']):
-        prefix_old = config.return_values(ipv6_base + ['delegate-prefix'])
-        # delete old delegate prefix CLI nodes
-        config.delete(ipv6_base + ['delegate-prefix'])
-        # create ned delegation tag node
-        config.set(ipv6_base + ['delegate'])
-        config.set_tag(ipv6_base + ['delegate'])
-
-        for p in prefix_old:
-            prefix = p.split(',')[0]
-            mask = p.split(',')[1]
-            config.set(ipv6_base + ['delegate', prefix, 'delegation-prefix'], value=mask)
+    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:
-        with open(file_name, 'w') as f:
-            f.write(config.to_string())
+        open(file_name,'w').write(ctree.to_string())
     except OSError as e:
         print("Failed to save the modified config: {}".format(e))
         exit(1)
diff --git a/src/migration-scripts/pppoe-server/3-to-4 b/src/migration-scripts/pppoe-server/3-to-4
index 6709d5f86..5f9730a41 100755
--- a/src/migration-scripts/pppoe-server/3-to-4
+++ b/src/migration-scripts/pppoe-server/3-to-4
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# change mppe node to a leaf node with value prefer
+# - remove primary/secondary identifier from nameserver
 
 import os
 
@@ -36,12 +36,102 @@ if not config.exists(base):
     # Nothing to do
     exit(0)
 else:
-    mppe_base = base + ['ppp-options', 'mppe']
-    if config.exists(mppe_base):
-        # drop node first ...
-        config.delete(mppe_base)
-        # ... and set new default
-        config.set(mppe_base, value='prefer')
+
+    # Migrate IPv4 DNS servers
+    dns_base = base + ['dns-servers']
+    if config.exists(dns_base):
+        for server in ['server-1', 'server-2']:
+          if config.exists(dns_base + [server]):
+            dns = config.return_value(dns_base + [server])
+            config.set(base + ['name-server'], value=dns, replace=False)
+
+        config.delete(dns_base)
+
+    # Migrate IPv6 DNS servers
+    dns_base = base + ['dnsv6-servers']
+    if config.exists(dns_base):
+        for server in ['server-1', 'server-2', 'server-3']:
+          if config.exists(dns_base + [server]):
+            dns = config.return_value(dns_base + [server])
+            config.set(base + ['name-server'], value=dns, replace=False)
+
+        config.delete(dns_base)
+
+    # Migrate IPv4 WINS servers
+    wins_base = base + ['wins-servers']
+    if config.exists(wins_base):
+        for server in ['server-1', 'server-2']:
+          if config.exists(wins_base + [server]):
+            wins = config.return_value(wins_base + [server])
+            config.set(base + ['wins-server'], value=wins, replace=False)
+
+        config.delete(wins_base)
+
+    # Migrate radius-settings node to RADIUS and use this as base for the
+    # later migration of the RADIUS servers - this will save a lot of code
+    radius_settings = base + ['authentication', 'radius-settings']
+    if config.exists(radius_settings):
+        config.rename(radius_settings, 'radius')
+
+    # Migrate RADIUS dynamic author / change of authorisation server
+    dae_old = base + ['authentication', 'radius', 'dae-server']
+    if config.exists(dae_old):
+        config.rename(dae_old, 'dynamic-author')
+        dae_new = base + ['authentication', 'radius', 'dynamic-author']
+
+        if config.exists(dae_new + ['ip-address']):
+            config.rename(dae_new + ['ip-address'], 'server')
+
+        if config.exists(dae_new + ['secret']):
+            config.rename(dae_new + ['secret'], 'key')
+
+    # Migrate RADIUS server
+    radius_server = base + ['authentication', 'radius-server']
+    if config.exists(radius_server):
+        new_base = base + ['authentication', 'radius', 'server']
+        config.set(new_base)
+        config.set_tag(new_base)
+        for server in config.list_nodes(radius_server):
+            old_base = radius_server + [server]
+            config.copy(old_base, new_base + [server])
+
+            # migrate key
+            if config.exists(new_base + [server, 'secret']):
+                config.rename(new_base + [server, 'secret'], 'key')
+
+            # remove old req-limit node
+            if config.exists(new_base + [server, 'req-limit']):
+                config.delete(new_base + [server, 'req-limit'])
+
+        config.delete(radius_server)
+
+    # Migrate IPv6 prefixes
+    ipv6_base = base + ['client-ipv6-pool']
+    if config.exists(ipv6_base + ['prefix']):
+        prefix_old = config.return_values(ipv6_base + ['prefix'])
+        # delete old prefix CLI nodes
+        config.delete(ipv6_base + ['prefix'])
+        # create ned prefix tag node
+        config.set(ipv6_base + ['prefix'])
+        config.set_tag(ipv6_base + ['prefix'])
+
+        for p in prefix_old:
+            prefix = p.split(',')[0]
+            mask = p.split(',')[1]
+            config.set(ipv6_base + ['prefix', prefix, 'mask'], value=mask)
+
+    if config.exists(ipv6_base + ['delegate-prefix']):
+        prefix_old = config.return_values(ipv6_base + ['delegate-prefix'])
+        # delete old delegate prefix CLI nodes
+        config.delete(ipv6_base + ['delegate-prefix'])
+        # create ned delegation tag node
+        config.set(ipv6_base + ['delegate'])
+        config.set_tag(ipv6_base + ['delegate'])
+
+        for p in prefix_old:
+            prefix = p.split(',')[0]
+            mask = p.split(',')[1]
+            config.set(ipv6_base + ['delegate', prefix, 'delegation-prefix'], value=mask)
 
     try:
         with open(file_name, 'w') as f: