diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-09-12 13:49:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-12 13:49:14 +0100 |
| commit | 48ac2a98ec665eaf81872f0263157fff8d37bd6c (patch) | |
| tree | ab69afaf46b0483dfdee6460ed3faa6b3430a17f | |
| parent | fe67039aa3e213cfa8d2c41c2990c60d1a96924c (diff) | |
| parent | da35b91a0c1484e112dedda9caf08227fa048529 (diff) | |
| download | vyos-1x-48ac2a98ec665eaf81872f0263157fff8d37bd6c.tar.gz vyos-1x-48ac2a98ec665eaf81872f0263157fff8d37bd6c.zip | |
Merge pull request #4041 from natali-rs1985/T6685-current
pppoe-server: T6685: Add options to accept any and blank service names
| -rw-r--r-- | data/templates/accel-ppp/pppoe.config.j2 | 6 | ||||
| -rw-r--r-- | interface-definitions/service_pppoe-server.xml.in | 12 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_service_pppoe-server.py | 16 |
3 files changed, 34 insertions, 0 deletions
diff --git a/data/templates/accel-ppp/pppoe.config.j2 b/data/templates/accel-ppp/pppoe.config.j2 index beab46936..cf952c687 100644 --- a/data/templates/accel-ppp/pppoe.config.j2 +++ b/data/templates/accel-ppp/pppoe.config.j2 @@ -70,6 +70,12 @@ vlan-mon={{ iface }},{{ iface_config.vlan | join(',') }} {% if service_name %} service-name={{ service_name | join(',') }} {% endif %} +{% if accept_any_service is vyos_defined %} +accept-any-service=1 +{% endif %} +{% if accept_blank_service is vyos_defined %} +accept-blank-service=1 +{% endif %} {% if pado_delay %} {% set delay_without_sessions = pado_delay.delays_without_sessions[0] | default('0') %} {% set pado_delay_param = namespace(value=delay_without_sessions) %} diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 93ec7ade9..0c99fd261 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -77,6 +77,18 @@ <multi/> </properties> </leafNode> + <leafNode name="accept-any-service"> + <properties> + <help>Accept any service name in PPPoE Active Discovery Request (PADR)</help> + <valueless/> + </properties> + </leafNode> + <leafNode name="accept-blank-service"> + <properties> + <help>Accept blank service name in PADR</help> + <valueless/> + </properties> + </leafNode> <tagNode name="pado-delay"> <properties> <help>PADO delays</help> diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py index 8add5ee6c..8cd87e0f2 100755 --- a/smoketest/scripts/cli/test_service_pppoe-server.py +++ b/smoketest/scripts/cli/test_service_pppoe-server.py @@ -195,6 +195,22 @@ class TestServicePPPoEServer(BasicAccelPPPTest.TestCase): config = read_file(self._config_file) self.assertIn('any-login=1', config) + def test_pppoe_server_accept_service(self): + services = ['user1-service', 'user2-service'] + self.basic_config() + + for service in services: + self.set(['service-name', service]) + self.set(['accept-any-service']) + self.set(['accept-blank-service']) + self.cli_commit() + + # Validate configuration values + config = read_file(self._config_file) + self.assertIn(f'service-name={",".join(services)}', config) + self.assertIn('accept-any-service=1', config) + self.assertIn('accept-blank-service=1', config) + if __name__ == '__main__': unittest.main(verbosity=2) |