pppoe-server: T4703: combine vlan-id and vlan-range into single CLI node

The initial Accel-PPP PPPoE implementation used:

set service pppoe-server interface <name> vlan-id <id>
set service pppoe-server interface <name> vlan-range <start-stop>

This is actually a duplicated CLI node.

2 files changed, 36 insertions, 10 deletions

diff --git a/smoketest/configs/pppoe-server b/smoketest/configs/pppoe-server
index 7e4ccc80e..bfbef4a34 100644
--- a/smoketest/configs/pppoe-server
+++ b/smoketest/configs/pppoe-server
@@ -43,7 +43,13 @@ service {
             stop 192.168.0.200
         }
         gateway-address 192.168.0.2
+        interface eth1 {
+        }
         interface eth2 {
+            vlan-id 10
+            vlan-id 20
+            vlan-range 30-40
+            vlan-range 50-60
         }
         name-server 192.168.0.1
     }
diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py
index 51cc098ef..fae16d3b3 100755
--- a/smoketest/scripts/cli/test_service_pppoe-server.py
+++ b/smoketest/scripts/cli/test_service_pppoe-server.py
@@ -22,6 +22,8 @@ from base_accel_ppp_test import BasicAccelPPPTest
 from configparser import ConfigParser
 from vyos.configsession import ConfigSessionError
 from vyos.util import process_named_running
+from vyos.util import read_file
+from vyos.template import range_to_regex
 
 local_if = ['interfaces', 'dummy', 'dum667']
 ac_name = 'ACN'
@@ -37,9 +39,15 @@ class TestServicePPPoEServer(BasicAccelPPPTest.TestCase):
         super().setUp()
 
     def tearDown(self):
+        # Check for running process
+        self.assertTrue(process_named_running(self._process_name))
+
         self.cli_delete(local_if)
         super().tearDown()
 
+        # Check for running process
+        self.assertFalse(process_named_running(self._process_name))
+
     def verify(self, conf):
         mtu = '1492'
 
@@ -120,8 +128,6 @@ class TestServicePPPoEServer(BasicAccelPPPTest.TestCase):
         # check interface-cache
         self.assertEqual(conf['ppp']['unit-cache'], interface_cache)
 
-        # Check for running process
-        self.assertTrue(process_named_running(self._process_name))
 
     def test_pppoe_server_authentication_protocols(self):
         # Test configuration of local authentication for PPPoE server
@@ -139,8 +145,6 @@ class TestServicePPPoEServer(BasicAccelPPPTest.TestCase):
 
         self.assertEqual(conf['modules']['auth_mschap_v2'], None)
 
-        # Check for running process
-        self.assertTrue(process_named_running(self._process_name))
 
     def test_pppoe_server_client_ip_pool(self):
         # Test configuration of IPv6 client pools
@@ -168,9 +172,6 @@ class TestServicePPPoEServer(BasicAccelPPPTest.TestCase):
         self.assertEqual(conf['ip-pool'][start_stop], None)
         self.assertEqual(conf['ip-pool']['gw-ip-address'], self._gateway)
 
-        # Check for running process
-        self.assertTrue(process_named_running(self._process_name))
-
 
     def test_pppoe_server_client_ipv6_pool(self):
         # Test configuration of IPv6 client pools
@@ -211,9 +212,6 @@ class TestServicePPPoEServer(BasicAccelPPPTest.TestCase):
         self.assertEqual(conf['ipv6-pool'][client_prefix], None)
         self.assertEqual(conf['ipv6-pool']['delegate'], f'{delegate_prefix},{delegate_mask}')
 
-        # Check for running process
-        self.assertTrue(process_named_running(self._process_name))
-
 
     def test_accel_radius_authentication(self):
         radius_called_sid = 'ifname:mac'
@@ -234,5 +232,27 @@ class TestServicePPPoEServer(BasicAccelPPPTest.TestCase):
         self.assertEqual(conf['radius']['acct-interim-jitter'], radius_acct_interim_jitter)
 
 
+    def test_pppoe_server_vlan(self):
+
+        vlans = ['100', '200', '300-310']
+
+        # Test configuration of local authentication for PPPoE server
+        self.basic_config()
+
+        for vlan in vlans:
+            self.set(['interface', interface, 'vlan', vlan])
+
+        # commit changes
+        self.cli_commit()
+
+        # Validate configuration values
+        config = read_file(self._config_file)
+        for vlan in vlans:
+            tmp = range_to_regex(vlan)
+            self.assertIn(f'interface=re:^{interface}\.{tmp}$', config)
+
+        tmp = ','.join(vlans)
+        self.assertIn(f'vlan-mon={interface},{tmp}', config)
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)