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.

Sign up for GitHub

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

Jump to bottom

ipoe_server: T6649: Accel-ppp separate vlan-mon from listen interfaces #3987

Merged
merged 1 commit into from
Aug 16, 2024
Merged

ipoe_server: T6649: Accel-ppp separate vlan-mon from listen interfaces #3987

merged 1 commit into from
Aug 16, 2024

Conversation

natali-rs1985
Copy link
Contributor

Change Summary

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

ipoe-server, pppoe-server

Proposed changes

Added ability to enable vlan-mon option and not to use it by default

How to test

set service ipoe-server authentication mode 'radius'
set service ipoe-server authentication radius server 192.168.122.14 key 'vyos-secret'
set service ipoe-server client-ip-pool ONE range '100.64.0.1-100.64.0.10'
set service ipoe-server default-pool 'ONE'
set service ipoe-server gateway-address '100.64.0.14/28'
set service ipoe-server name-server '1.1.1.1'
set service ipoe-server name-server '8.8.8.8'
set service ipoe-server interface eth1 vlan '5-20'
set service ipoe-server interface eth1 vlan-mon
commit

vyos@vyos# cat /run/accel-pppd/ipoe.conf | grep vlan-mon
vlan-mon=eth1,5-20

Smoketest result

Ipoe-server tests:

vyos@vyos# python3 /usr/libexec/vyos/tests/smoke/cli/test_service_ipoe-server.py
test_accel_ipv4_pool (__main__.TestServiceIPoEServer.test_accel_ipv4_pool) ... ok
test_accel_ipv6_pool (__main__.TestServiceIPoEServer.test_accel_ipv6_pool) ... ok
test_accel_limits (__main__.TestServiceIPoEServer.test_accel_limits) ... ok
test_accel_local_authentication (__main__.TestServiceIPoEServer.test_accel_local_authentication) ... ok
test_accel_log_level (__main__.TestServiceIPoEServer.test_accel_log_level) ... ok
test_accel_name_servers (__main__.TestServiceIPoEServer.test_accel_name_servers) ... ok
test_accel_next_pool (__main__.TestServiceIPoEServer.test_accel_next_pool) ... ok
test_accel_ppp_options (__main__.TestServiceIPoEServer.test_accel_ppp_options) ... skipped 'PPP is not a part of IPoE'
test_accel_radius_authentication (__main__.TestServiceIPoEServer.test_accel_radius_authentication) ... ok
test_accel_shaper (__main__.TestServiceIPoEServer.test_accel_shaper) ... ok
test_accel_snmp (__main__.TestServiceIPoEServer.test_accel_snmp) ... ok
test_accel_wins_server (__main__.TestServiceIPoEServer.test_accel_wins_server) ... skipped 'WINS server is not used in IPoE'
test_ipoe_server_vlan (__main__.TestServiceIPoEServer.test_ipoe_server_vlan) ... ok

----------------------------------------------------------------------
Ran 13 tests in 61.904s

OK (skipped=2)
[edit]
vyos@vyos#

PPPoe-server tests:

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_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_any_login (__main__.TestServicePPPoEServer.test_pppoe_server_any_login) ... 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 18 tests in 111.528s

OK
[edit]
vyos@vyos#

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

@natali-rs1985 natali-rs1985 requested a review from a team as a code owner August 15, 2024 14:56
@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 15, 2024 •
edited
Loading

👍
No issues in PR Title / Commit Title

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 15, 2024 •
edited
Loading

✅ No issues found in unused-imports check.. Please refer the workflow run

sever-sever
sever-sever reviewed Aug 15, 2024
View reviewed changes
interface-definitions/include/accel-ppp/vlan-mon.xml.i Outdated
<!-- include start from accel-ppp/vlan-mon.xml.i -->
<leafNode name="vlan-mon">
<properties>
<help>Automatically crate VLANs interfaces</help>
Copy link
Member

Choose a reason for hiding this comment

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

Typo crate

Automatically create VLAN interfaces

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@dmbaturin dmbaturin merged commit 9e740c4 into vyos:current Aug 16, 2024
13 of 14 checks passed
@sever-sever
Copy link
Member

@Mergifyio backport circinus

@mergify Mergify
Copy link
Contributor

mergify bot commented Aug 16, 2024 •
edited
Loading

backport circinus

✅ Backports have been created

@mergify mergify bot mentioned this pull request Aug 16, 2024
Merged
12 tasks
c-po added a commit that referenced this pull request Aug 17, 2024
@c-po
Merge pull request #3995 from vyos/mergify/bp/circinus/pr-3987
c6dee2f 
ipoe_server: T6649: Accel-ppp separate vlan-mon from listen interfaces (backport #3987)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmbaturin dmbaturin dmbaturin approved these changes

@sever-sever sever-sever sever-sever approved these changes

@sarthurdev sarthurdev Awaiting requested review from sarthurdev sarthurdev is a code owner automatically assigned from vyos/reviewers

@zdc zdc Awaiting requested review from zdc zdc is a code owner automatically assigned from vyos/reviewers

@jestabro jestabro Awaiting requested review from jestabro jestabro is a code owner automatically assigned from vyos/reviewers

@c-po c-po Awaiting requested review from c-po c-po is a code owner automatically assigned from vyos/reviewers

@nicolas-fort nicolas-fort Awaiting requested review from nicolas-fort nicolas-fort is a code owner automatically assigned from vyos/reviewers

Assignees

@natali-rs1985 natali-rs1985

Labels
backport current
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@natali-rs1985 @sever-sever @dmbaturin