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

dhcp-server: T4718: Listen-address is not commit if the ip address is on the interface with vrf #3195

Merged
merged 1 commit into from Mar 30, 2024

Conversation

HollyGurza
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

Proposed changes

How to test

set interfaces ethernet eth1 address 10.1.1.1/30
set interfaces ethernet eth1 vrf SMOKE-DHCP
set protocols static route 10.1.10.0/24 interface eth1 vrf SMOKE-DHCP
set vrf name SMOKE-DHCP protocols static route 10.1.10.0/24 next-hop 10.1.1.2
set vrf name SMOKE-DHCP table 1000
set service dhcp-server shared-network-name SMOKE-DHCP-NETWORK subnet 10.1.10.0/24 subnet-id 1
set service dhcp-server shared-network-name SMOKE-DHCP-NETWORK subnet 10.1.10.0/24 default-router 10.1.10.1
set service dhcp-server shared-network-name SMOKE-DHCP-NETWORK subnet 10.1.10.0/24 name-server 1.1.1.1
set service dhcp-server shared-network-name SMOKE-DHCP-NETWORK subnet 10.1.10.0/24 range 1 start 10.1.10.10
set service dhcp-server shared-network-name SMOKE-DHCP-NETWORK subnet 10.1.10.0/24 range 1 stop 10.1.10.20

set service dhcp-server listen-address 10.1.1.1
commit
cat /run/kea/kea-dhcp4.conf
{
    "Dhcp4": {
        "interfaces-config": {
            "interfaces": ["eth1/10.1.1.1"],
...

Smoketest result

vyos@vyos:~$ python3 /usr/libexec/vyos/tests/smoke/cli/test_service_dh
test_service_dhcp-relay.py     test_service_dhcp-server.py    test_service_dhcpv6-relay.py   test_service_dhcpv6-server.py  
vyos@vyos:~$ python3 /usr/libexec/vyos/tests/smoke/cli/test_service_dhcp-server.py 
test_dhcp_exclude_in_range (__main__.TestServiceDHCPServer.test_dhcp_exclude_in_range) ... ok
test_dhcp_exclude_not_in_range (__main__.TestServiceDHCPServer.test_dhcp_exclude_not_in_range) ... ok
test_dhcp_high_availability (__main__.TestServiceDHCPServer.test_dhcp_high_availability) ... ok
test_dhcp_multiple_pools (__main__.TestServiceDHCPServer.test_dhcp_multiple_pools) ... ok
test_dhcp_on_interface_with_vrf (__main__.TestServiceDHCPServer.test_dhcp_on_interface_with_vrf) ... ok
test_dhcp_relay_server (__main__.TestServiceDHCPServer.test_dhcp_relay_server) ... ok
test_dhcp_single_pool_options (__main__.TestServiceDHCPServer.test_dhcp_single_pool_options) ... ok
test_dhcp_single_pool_options_scoped (__main__.TestServiceDHCPServer.test_dhcp_single_pool_options_scoped) ... ok
test_dhcp_single_pool_range (__main__.TestServiceDHCPServer.test_dhcp_single_pool_range) ... ok
test_dhcp_single_pool_static_mapping (__main__.TestServiceDHCPServer.test_dhcp_single_pool_static_mapping) ... ok

----------------------------------------------------------------------
Ran 10 tests in 52.150s

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

@vyosbot vyosbot requested a review from a team March 28, 2024 08:16
@vyosbot vyosbot requested review from dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team March 28, 2024 08:16
@c-po c-po merged commit 252d03d into vyos:current Mar 30, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3 participants