pppoe-server: T6141: T5364: PPPoE-server add pado-delay without sessions fails

[natali-rs1985]

Change Summary

Fixed:

set service pppoe-server pado-delay 10

Also changed sorting by delays to sorting by sessions as the documentation requires

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Code style update (formatting, renaming)
• Refactoring (no functional changes)
• Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
• Other (please describe):

Related Task(s)

• https://vyos.dev/T6141
• https://vyos.dev/T5364

Related PR(s)

Component(s) name

pppoe-server

Proposed changes

Now can add pado-delay without sessions

How to test

set service pppoe-server authentication local-users username user1 password 'user1'
set service pppoe-server authentication mode 'local'
set service pppoe-server client-ip-pool first range '100.64.0.1-100.64.0.100'
set service pppoe-server default-pool 'first'
set service pppoe-server gateway-address '100.64.0.1'
set service pppoe-server interface eth1
commit

set service pppoe-server pado-delay 10
commit

vyos@vyos# cat /run/accel-pppd/pppoe.conf | grep pado-delay
pado-delay=10

set service pppoe-server pado-delay 20 sessions 200
commit

vyos@vyos# cat /run/accel-pppd/pppoe.conf | grep pado-delay
pado-delay=10,-1:200

Smoketest result

vyos@vyos# /usr/libexec/vyos/tests/smoke/cli/test_service_pppoe-server.py
test_accel_ipv4_pool (__main__.TestServicePPPoEServer.test_accel_ipv4_pool) ... ok
test_accel_ipv6_pool (__main__.TestServicePPPoEServer.test_accel_ipv6_pool) ... ok
test_accel_limits (__main__.TestServicePPPoEServer.test_accel_limits) ... ok
test_accel_local_authentication (__main__.TestServicePPPoEServer.test_accel_local_authentication) ... ok
test_accel_name_servers (__main__.TestServicePPPoEServer.test_accel_name_servers) ... ok
test_accel_next_pool (__main__.TestServicePPPoEServer.test_accel_next_pool) ... ok
test_accel_ppp_options (__main__.TestServicePPPoEServer.test_accel_ppp_options) ... ok
test_accel_radius_authentication (__main__.TestServicePPPoEServer.test_accel_radius_authentication) ... ok
test_accel_shaper (__main__.TestServicePPPoEServer.test_accel_shaper) ... ok
test_accel_snmp (__main__.TestServicePPPoEServer.test_accel_snmp) ... ok
test_accel_wins_server (__main__.TestServicePPPoEServer.test_accel_wins_server) ... ok
test_pppoe_limits (__main__.TestServicePPPoEServer.test_pppoe_limits) ... ok
test_pppoe_server_authentication_protocols (__main__.TestServicePPPoEServer.test_pppoe_server_authentication_protocols) ... ok
test_pppoe_server_pado_delay (__main__.TestServicePPPoEServer.test_pppoe_server_pado_delay) ... ok
test_pppoe_server_shaper (__main__.TestServicePPPoEServer.test_pppoe_server_shaper) ... ok
test_pppoe_server_vlan (__main__.TestServicePPPoEServer.test_pppoe_server_vlan) ... ok

----------------------------------------------------------------------
Ran 16 tests in 234.722s

OK

Checklist:

• I have read the CONTRIBUTING document
• I have linked this PR to one or more Phabricator Task(s)
• I have run the components SMOKETESTS if applicable
• My commit headlines contain a valid Task id
• My change requires a change to the documentation
• I have updated the documentation accordingly

[c-po]

While fixing pado-delay, please also extend smoketest\scripts\cli\test_service_pppoe-server.py to verify the pado-delay

[natali-rs1985]

While fixing pado-delay, please also extend smoketest\scripts\cli\test_service_pppoe-server.py to verify the pado-delay

Smoketests were extended

[dmbaturin]

@natali-rs1985 Just a note: it's usually better to use git commit --amend and git push --force to update a commit if you are fixing issues. There's always an option to squash and merge here on GitHub, but it's easier to read related changes in a single commit for subsequent reviewers.

[sever-sever]

@Mergifyio backport sagitta

[mergify]

backport sagitta

✅ Backports have been created

• #3299 pppoe-server: T6141: T5364: PPPoE-server add pado-delay without sessions fails (backport #3296) has been created for branch sagitta