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

[dhcp_server] Remove invoke of dhcpmon when dhcp_server is enabled #19673

Merged
merged 4 commits into from
Jul 25, 2024
Merged

[dhcp_server] Remove invoke of dhcpmon when dhcp_server is enabled #19673

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abdf206
[dhcp_server] Remove invoke of dhcpmon when dhcp_server is enabled
yaqiangz Jul 24, 2024
985273e
set include_dhcp_server to y
yaqiangz Jul 24, 2024
0f7aa4a
Update log
yaqiangz Jul 25, 2024
d05d863
Revert "set include_dhcp_server to y"
yaqiangz Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rules/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ INCLUDE_NAT = y
INCLUDE_DHCP_RELAY = y

# INCLUDE_DHCP_SERVER - build and install dhcp-server package
INCLUDE_DHCP_SERVER ?= n
INCLUDE_DHCP_SERVER ?= y

# INCLUDE_P4RT - build docker-p4rt for P4RT support
INCLUDE_P4RT = n
Expand Down
4 changes: 3 additions & 1 deletion src/sonic-dhcp-utilities/dhcp_utilities/dhcprelayd/dhcprelayd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ def refresh_dhcrelay(self, force_kill=False):
self._disable_checkers(checkers_to_be_disabled)

self._start_dhcrelay_process(dhcp_interfaces, dhcp_server_ip, force_kill)
self._start_dhcpmon_process(dhcp_interfaces, force_kill)

# TODO dhcpmon is not ready for count packet for dhcp_server, hence comment invoke it for now
# self._start_dhcpmon_process(dhcp_interfaces, force_kill)

def wait(self):
"""
Expand Down
Loading