dhcpv6-pd: pppoe: T2506: restructure CLI

Rename the CLI nodes for prefix delegation from "dhcpv6-options delegate
<interface>" to "dhcpv6-options prefix-delegation interface <interface>".

The change is required to add the possibility to request for specific prefix
sized via the CLI. That option was not possible with the old configuration
tree.

7 files changed, 87 insertions, 18 deletions

diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index bdca9d170..b531e97fc 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -299,8 +299,8 @@ def apply(bond):
         if bond['dhcpv6_temporary']:
             b.dhcp.v6.options['dhcpv6_temporary'] = True
 
-        if bond['dhcpv6_pd']:
-            b.dhcp.v6.options['dhcpv6_pd'] = bond['dhcpv6_pd']
+        if bond['dhcpv6_pd_interfaces']:
+            b.dhcp.v6.options['dhcpv6_pd_interfaces'] = bond['dhcpv6_pd_interfaces']
 
         # ignore link state changes
         b.set_link_detect(bond['disable_link_detect'])
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index 3ff339f0f..865d8a999 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -321,8 +321,8 @@ def apply(bridge):
         if bridge['dhcpv6_temporary']:
             br.dhcp.v6.options['dhcpv6_temporary'] = True
 
-        if bridge['dhcpv6_pd']:
-            br.dhcp.v6.options['dhcpv6_pd'] = br['dhcpv6_pd']
+        if bridge['dhcpv6_pd_interfaces']:
+            br.dhcp.v6.options['dhcpv6_pd_interfaces'] = br['dhcpv6_pd_interfaces']
 
         # assign/remove VRF
         br.set_vrf(bridge['vrf'])
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index 0d73a30f1..8ffefc7cf 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -201,8 +201,8 @@ def apply(eth):
         if eth['dhcpv6_temporary']:
             e.dhcp.v6.options['dhcpv6_temporary'] = True
 
-        if eth['dhcpv6_pd']:
-            e.dhcp.v6.options['dhcpv6_pd'] = eth['dhcpv6_pd']
+        if eth['dhcpv6_pd_interfaces']:
+            e.dhcp.v6.options['dhcpv6_pd_interfaces'] = eth['dhcpv6_pd_interfaces']
 
         # ignore link state changes
         e.set_link_detect(eth['disable_link_detect'])
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index 6cde850c9..e8aeb810f 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -36,7 +36,7 @@ default_config_data = {
     'deleted': False,
     'description': '\0',
     'disable': False,
-    'dhcpv6_pd': [],
+    'dhcpv6_pd_interfaces': [],
     'intf': '',
     'idle_timeout': '',
     'ipv6_autoconf': False,
@@ -137,15 +137,19 @@ def get_config():
     if conf.exists('vrf'):
         pppoe['vrf'] = conf.return_value(['vrf'])
 
-    if conf.exists(['dhcpv6-options', 'delegate']):
-        for interface in conf.list_nodes(['dhcpv6-options', 'delegate']):
+    if conf.exists(['dhcpv6-options', 'prefix-delegation']):
+        dhcpv6_pd_path = base_path + [pppoe['intf'],
+                                      'dhcpv6-options', 'prefix-delegation']
+        conf.set_level(dhcpv6_pd_path)
+
+        for interface in conf.list_nodes(['interface']):
+            conf.set_level(dhcpv6_pd_path + ['interface', interface])
             pd = {
                 'ifname': interface,
                 'sla_id': '',
                 'sla_len': '',
                 'if_id': ''
             }
-            conf.set_level(base_path + [pppoe['intf'], 'dhcpv6-options', 'delegate', interface])
 
             if conf.exists(['sla-id']):
                 pd['sla_id'] = conf.return_value(['sla-id'])
@@ -153,10 +157,10 @@ def get_config():
             if conf.exists(['sla-len']):
                 pd['sla_len'] = conf.return_value(['sla-len'])
 
-            if conf.exists(['interface-id']):
-                pd['if_id'] = conf.return_value(['interface-id'])
+            if conf.exists(['address']):
+                pd['if_id'] = conf.return_value(['address'])
 
-            pppoe['dhcpv6_pd'].append(pd)
+            pppoe['dhcpv6_pd_interfaces'].append(pd)
 
     return pppoe
 
@@ -223,7 +227,7 @@ def generate(pppoe):
     render(script_pppoe_ipv6_up, 'pppoe/ipv6-up.script.tmpl',
            pppoe, trim_blocks=True, permission=0o755)
 
-    if len(pppoe['dhcpv6_pd']) > 0:
+    if len(pppoe['dhcpv6_pd_interfaces']) > 0:
         # ipv6.tmpl relies on ifname - this should be made consitent in the
         # future better then double key-ing the same value
         pppoe['ifname'] = intf
diff --git a/src/conf_mode/interfaces-pseudo-ethernet.py b/src/conf_mode/interfaces-pseudo-ethernet.py
index 3e036a753..c1f52d42c 100755
--- a/src/conf_mode/interfaces-pseudo-ethernet.py
+++ b/src/conf_mode/interfaces-pseudo-ethernet.py
@@ -171,8 +171,8 @@ def apply(peth):
     if peth['dhcpv6_temporary']:
         p.dhcp.v6.options['dhcpv6_temporary'] = True
 
-    if peth['dhcpv6_pd']:
-        p.dhcp.v6.options['dhcpv6_pd'] = peth['dhcpv6_pd']
+    if peth['dhcpv6_pd_interfaces']:
+        p.dhcp.v6.options['dhcpv6_pd_interfaces'] = peth['dhcpv6_pd_interfaces']
 
     # ignore link state changes
     p.set_link_detect(peth['disable_link_detect'])
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index 0fa20c5f4..54420acd1 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -591,8 +591,8 @@ def apply(wifi):
         if wifi['dhcpv6_temporary']:
             w.dhcp.v6.options['dhcpv6_temporary'] = True
 
-        if wifi['dhcpv6_pd']:
-            w.dhcp.v6.options['dhcpv6_pd'] = wifi['dhcpv6_pd']
+        if wifi['dhcpv6_pd_interfaces']:
+            w.dhcp.v6.options['dhcpv6_pd_interfaces'] = wifi['dhcpv6_pd_interfaces']
 
         # ignore link state changes
         w.set_link_detect(wifi['disable_link_detect'])
diff --git a/src/migration-scripts/interfaces/9-to-10 b/src/migration-scripts/interfaces/9-to-10
new file mode 100755
index 000000000..ce28627b8
--- /dev/null
+++ b/src/migration-scripts/interfaces/9-to-10
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 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/>.
+
+# - rename CLI node 'dhcpv6-options delgate' to 'dhcpv6-options prefix-delegation
+#   interface'
+# - rename CLI node 'interface-id' for prefix-delegation to 'address' as it
+#   represents the local interface IPv6 address assigned by DHCPv6-PD
+
+from sys import exit, argv
+from vyos.configtree import ConfigTree
+
+if __name__ == '__main__':
+    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()
+
+    config = ConfigTree(config_file)
+
+    for intf_type in config.list_nodes(['interfaces']):
+        for intf in config.list_nodes(['interfaces', intf_type]):
+            # cache current config tree
+            base_path = ['interfaces', intf_type, intf, 'dhcpv6-options',
+                          'delegate']
+
+            if config.exists(base_path):
+                # cache new config tree
+                new_path = ['interfaces', intf_type, intf, 'dhcpv6-options',
+                             'prefix-delegation']
+                if not config.exists(new_path):
+                    config.set(new_path)
+
+                # copy to new node
+                config.copy(base_path, new_path + ['interface'])
+                print(new_path + ['interface'])
+
+                # rename interface-id to address
+                for interface in config.list_nodes(new_path + ['interface']):
+                    config.rename(new_path + ['interface', interface, 'interface-id'], 'address')
+
+                # delete old noe
+                config.delete(base_path)
+
+    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)