Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pppoe-server: T6685: Add options to accept any and blank service names #4041

Merged
merged 1 commit into from
Sep 12, 2024

Conversation

natali-rs1985
Copy link
Contributor

Change Summary

Added options:

accept-any-service
accept-blank-service

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)

Related PR(s)

Component(s) name

pppoe-server

Proposed changes

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

set service pppoe-server accept-blank-service
set service pppoe-server accept-any-service

commit

vyos@vyos# cat /run/accel-pppd/pppoe.conf | grep -service
accept-any-service=1
accept-blank-service=1

Smoketest result

vyos@vyos# sudo nano /usr/libexec/vyos/tests/smoke/cli/test_service_pppoe-server.py
[edit]
vyos@vyos# python3 /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_log_level (__main__.TestServicePPPoEServer.test_accel_log_level) ... 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_pppoe_server_shaper (__main__.TestServicePPPoEServer.test_pppoe_server_shaper) ... ok
test_pppoe_server_vlan (__main__.TestServicePPPoEServer.test_pppoe_server_vlan) ... ok

----------------------------------------------------------------------
Ran 19 tests in 139.655s

OK
[edit]

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

Copy link

github-actions bot commented Sep 10, 2024

👍
No issues in PR Title / Commit Title

@natali-rs1985 natali-rs1985 changed the title pppoe-service: T6685: Possibility of any services name or blank in pppoe pppoe-server: T6685: Possibility of any services name or blank in pppoe Sep 10, 2024
@dmbaturin dmbaturin changed the title pppoe-server: T6685: Possibility of any services name or blank in pppoe pppoe-server: T6685: Add options to accept any and blank service names Sep 10, 2024
Copy link
Member

@dmbaturin dmbaturin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might use the same wording in both help strings, but we probably need to agree on a policy for that.

@dmbaturin dmbaturin merged commit 48ac2a9 into vyos:current Sep 12, 2024
14 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

3 participants