ipoe: T4678: T4703: rewrite to get_config_dict()

In addition to the rewrite to make use of get_config_dict() the CLI is
slightly adjusted as specified in T4703.

* Rename vlan-id and vlan-range to simply vlan
* Rename network-mode to simply mode
* Re-use existing common Jinja2 template for Accel-PPP which are shared
  with PPPoE and SSTP server.
* Retrieve default values via defaultValue XML node

3 files changed, 209 insertions, 1 deletions

diff --git a/smoketest/configs/ipoe-server b/smoketest/configs/ipoe-server
new file mode 100644
index 000000000..7699dbcb9
--- /dev/null
+++ b/smoketest/configs/ipoe-server
@@ -0,0 +1,118 @@
+interfaces {
+    ethernet eth0 {
+        address dhcp
+    }
+    ethernet eth1 {
+        address 192.168.0.1/24
+    }
+    ethernet eth2 {
+    }
+    loopback lo {
+    }
+}
+nat {
+    source {
+        rule 100 {
+            outbound-interface eth0
+            source {
+                address 192.168.0.0/24
+            }
+            translation {
+                address masquerade
+            }
+        }
+    }
+}
+service {
+    ipoe-server {
+        authentication {
+            interface eth1 {
+                mac-address 08:00:27:2f:d8:06 {
+                    rate-limit {
+                        download 1000
+                        upload 500
+                    }
+                }
+            }
+            interface eth2 {
+                mac-address 08:00:27:2f:d8:06 {
+                }
+            }
+            mode local
+        }
+        client-ip-pool {
+            name POOL1 {
+                gateway-address 192.0.2.1
+                subnet 192.0.2.0/24
+            }
+        }
+        client-ipv6-pool {
+            delegate 2001:db8:1::/48 {
+                delegation-prefix 56
+            }
+            prefix 2001:db8::/48 {
+                mask 64
+            }
+        }
+        interface eth1 {
+            client-subnet 192.168.0.0/24
+            network vlan
+            network-mode L3
+            vlan-id 100
+            vlan-id 200
+            vlan-range 1000-2000
+            vlan-range 2500-2700
+        }
+        interface eth2 {
+            client-subnet 192.168.1.0/24
+        }
+        name-server 10.10.1.1
+        name-server 10.10.1.2
+        name-server 2001:db8:aaa::
+        name-server 2001:db8:bbb::
+    }
+    ssh {
+    }
+}
+system {
+    config-management {
+        commit-revisions 100
+    }
+    console {
+        device ttyS0 {
+            speed 115200
+        }
+    }
+    host-name vyos
+    login {
+        user vyos {
+            authentication {
+                encrypted-password $6$O5gJRlDYQpj$MtrCV9lxMnZPMbcxlU7.FI793MImNHznxGoMFgm3Q6QP3vfKJyOSRCt3Ka/GzFQyW1yZS4NS616NLHaIPPFHc0
+                plaintext-password ""
+            }
+        }
+    }
+    ntp {
+        server 0.pool.ntp.org {
+        }
+        server 1.pool.ntp.org {
+        }
+        server 2.pool.ntp.org {
+        }
+    }
+    syslog {
+        global {
+            facility all {
+                level info
+            }
+            facility protocols {
+                level debug
+            }
+        }
+    }
+}
+
+
+// Warning: Do not remove the following line.
+// vyos-config-version: "broadcast-relay@1:cluster@1:config-management@1:conntrack@1:conntrack-sync@1:dhcp-relay@2:dhcp-server@5:dhcpv6-server@1:dns-forwarding@3:firewall@5:https@2:interfaces@13:ipoe-server@1:ipsec@5:l2tp@3:lldp@1:mdns@1:nat@5:ntp@1:pppoe-server@5:pptp@2:qos@1:quagga@6:salt@1:snmp@2:ssh@2:sstp@3:system@19:vrrp@2:vyos-accel-ppp@2:wanloadbalance@3:webgui@1:webproxy@2:zone-policy@1"
+// Release version: 1.3.1
diff --git a/smoketest/scripts/cli/test_service_ipoe-server.py b/smoketest/scripts/cli/test_service_ipoe-server.py
new file mode 100755
index 000000000..bdab35834
--- /dev/null
+++ b/smoketest/scripts/cli/test_service_ipoe-server.py
@@ -0,0 +1,91 @@
+#!/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/>.
+
+import re
+import unittest
+
+from base_accel_ppp_test import BasicAccelPPPTest
+from vyos.configsession import ConfigSessionError
+from vyos.util import cmd
+
+from configparser import ConfigParser
+
+ac_name = 'ACN'
+interface = 'eth0'
+
+class TestServiceIPoEServer(BasicAccelPPPTest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls._base_path = ['service', 'ipoe-server']
+        cls._config_file = '/run/accel-pppd/ipoe.conf'
+        cls._chap_secrets = '/run/accel-pppd/ipoe.chap-secrets'
+
+        # call base-classes classmethod
+        super(TestServiceIPoEServer, cls).setUpClass()
+
+    def verify(self, conf):
+        super().verify(conf)
+
+        # Validate configuration values
+        accel_modules = list(conf['modules'].keys())
+        self.assertIn('log_syslog', accel_modules)
+        self.assertIn('ipoe', accel_modules)
+        self.assertIn('shaper', accel_modules)
+        self.assertIn('ipv6pool', accel_modules)
+        self.assertIn('ipv6_nd', accel_modules)
+        self.assertIn('ipv6_dhcp', accel_modules)
+        self.assertIn('ippool', accel_modules)
+
+    def basic_config(self):
+        self.set(['interface', interface, 'client-subnet', '192.168.0.0/24'])
+
+    def test_accel_local_authentication(self):
+        mac_address = '08:00:27:2f:d8:06'
+        self.set(['authentication', 'interface', interface, 'mac', mac_address])
+        self.set(['authentication', 'mode', 'local'])
+
+        # No IPoE interface configured
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+
+        # Test configuration of local authentication for PPPoE server
+        self.basic_config()
+
+        # commit changes
+        self.cli_commit()
+
+        # Validate configuration values
+        conf = ConfigParser(allow_no_value=True, delimiters='=')
+        conf.read(self._config_file)
+
+        # check proper path to chap-secrets file
+        self.assertEqual(conf['chap-secrets']['chap-secrets'], self._chap_secrets)
+
+        accel_modules = list(conf['modules'].keys())
+        self.assertIn('chap-secrets', accel_modules)
+
+        # basic verification
+        self.verify(conf)
+
+        # check local users
+        tmp = cmd(f'sudo cat {self._chap_secrets}')
+        regex = f'{interface}\s+\*\s+{mac_address}\s+\*'
+        tmp = re.findall(regex, tmp)
+        self.assertTrue(tmp)
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
+
diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py
index 17687a26b..7546c2e3d 100755
--- a/smoketest/scripts/cli/test_service_pppoe-server.py
+++ b/smoketest/scripts/cli/test_service_pppoe-server.py
@@ -19,7 +19,6 @@ import unittest
 from base_accel_ppp_test import BasicAccelPPPTest
 
 from configparser import ConfigParser
-from vyos.configsession import ConfigSessionError
 from vyos.util import read_file
 from vyos.template import range_to_regex