[202511] Backport PR #22486: sonic dhcp relay agent for IPv4 by ashutosh-agrawal · Pull Request #25371 · sonic-net/sonic-buildimage

ashutosh-agrawal · 2026-02-05T22:31:11Z

Backport of #22486 to 202511

This PR backports the sonic DHCPv4 relay agent functionality from master to the 202511 branch.

Original PR

[dhcp_relay] sonic dhcp relay agent for IPv4 #22486 (merged to master as 7c759ca)

Changes

Cherry-picked all changes from the original PR
Resolved conflict in sonic-device_metadata.yang (added zebra_nexthop field specific to 202511)
Fixed indentation in dhcprelayd.py for consistency

What was added

New sonic DHCPv4 relay agent package (dhcp4relay)
Configuration flag has_sonic_dhcpv4_relay in DEVICE_METADATA
Supervisord templates for the sonic agent
Comprehensive test coverage for all scenarios
When enabled, the sonic agent replaces ISC DHCP relay for IPv4

Testing

Includes all test files and expected outputs from original PR
Tests verify correct behavior with sonic agent enabled/disabled
Tests verify correct behavior with/without DHCP relay configuration

How to verify

Configure sonic DHCPv4 agent as described in the feature HLD: sonic-net/SONiC#1938

Why I did it Currently SONiC uses the 'isc-dhcp-relay' package to allow DHCP relay functionality on IPv4 networks. With this PR we are adding sonic dhcp relay agent for IPv4 as described in this HLD(sonic-net/SONiC#1938) Work item tracking Microsoft ADO (number only): How I did it Edit supervisord template to start sonic DHCPv4 relay instance when configured to do so in Config DB. Align cfg unit test to the new change. How to verify it Configure sonic DHCPv4 agent as described in the feature HLD(sonic-net/SONiC#1938) Test it with real client/server with IPv4 or use the sonic-mgmt suite Signed-off-by: Ashutosh Agrawal <ashu@cisco.com> Co-authored-by: Shivashankar C R <shivashankar.c.r@gmail.com> Co-authored-by: Ashutosh Agrawal <ashu@cisco.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com>

mssonicbld · 2026-02-05T22:31:20Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-02-05T22:31:32Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-02-06T01:37:02Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-02-06T01:37:16Z

Azure Pipelines successfully started running 1 pipeline(s).

dayouliu1 · 2026-02-09T23:36:32Z

FYI from the checks it seems like there are build failures for all platforms.

Ex for broadcom:

dpkg-checkbuilddeps: error: Unmet build dependencies: libboost-thread-dev libboost-system-dev
dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting
dpkg-buildpackage: warning: (Use -d flag to override.)
[  FAIL LOG END  ] [ target/debs/bookworm/sonic-dhcp4relay_1.0.0-0_amd64.deb ]
make: *** [slave.mk:799: target/debs/bookworm/sonic-dhcp4relay_1.0.0-0_amd64.deb] Error 1
make: *** Waiting for unfinished jobs....
[ finished ] [ target/debs/bookworm/libteam5_1.31-1_amd64.deb-install ] 
[ finished ] [ target/debs/bookworm/python3-swsscommon_1.0.0_amd64.deb-install ] 
[ finished ] [ target/docker-config-engine-bookworm.gz ] 
make[1]: *** [Makefile.work:624: bookworm] Error 2
make[1]: Leaving directory '/data/vss/_work/1/s'
make: *** [Makefile:50: target/sonic-aboot-broadcom.swi] Error 2

ashutosh-agrawal · 2026-02-10T00:34:23Z

@dayouliu1 @vmittal-msft @Blueve I think build failures are due to Boost library dependency. We probably need to backport PR#87 and PR#88 to fix it. Also, PR#84 needs to be backported for functional bug fixes.

dayouliu1 · 2026-02-10T21:55:48Z

Manual backport of #87 and #88 to 202511 if needed:
https://github.com/sonic-net/sonic-dhcp-relay/pull/91/changes
https://github.com/sonic-net/sonic-dhcp-relay/pull/90/changes

mssonicbld · 2026-02-19T07:41:12Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-02-19T07:41:24Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-02-19T17:29:23Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-02-19T17:29:37Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-02-20T17:48:57Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-02-20T17:49:08Z

Azure Pipelines failed to run 1 pipeline(s).

mssonicbld · 2026-02-24T18:33:35Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-02-24T18:33:47Z

Azure Pipelines successfully started running 1 pipeline(s).

vmittal-msft · 2026-03-16T21:27:15Z

/azpw run

mssonicbld · 2026-03-16T21:27:18Z

/AzurePipelines run

azure-pipelines · 2026-03-16T21:27:34Z

Azure Pipelines successfully started running 1 pipeline(s).

vmittal-msft · 2026-03-17T17:26:45Z

@ashutosh-agrawal can you please check failures ?

ashutosh-agrawal · 2026-03-18T02:41:52Z

@vmittal-msft We need the following PR to be merged to fix the build issues.

sonic-net/sonic-dhcp-relay#95

@dayouliu1 had earlier opened two separate PRs for the changes but both set of changes are required together to pass the CI on sonic-dhcp-relay repo.

Once you merge the above PR, I'll update the refpoint to sonic-dhcp-relay in this PR.

Signed-off-by: Ashutosh Agrawal <ashu@cisco.com>

mssonicbld · 2026-03-18T20:55:02Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-03-18T20:55:14Z

Azure Pipelines successfully started running 1 pipeline(s).

yxieca · 2026-03-18T23:10:48Z

/azpw ms_conflict

yxieca · 2026-03-20T15:14:16Z

/azpw ms_conflict

…rypick

mssonicbld · 2026-03-21T23:43:40Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-03-21T23:43:52Z

Azure Pipelines successfully started running 1 pipeline(s).

yijingyan2 · 2026-03-22T01:24:19Z

/azpw ms_conflict

yijingyan2 · 2026-03-22T01:31:54Z

/azpw ms_conflict

yijingyan2 · 2026-03-22T01:44:42Z

/azpw ms_conflict

yijingyan2 · 2026-03-23T07:20:08Z

/azpw ms_conflict

yijingyan2 · 2026-03-23T07:24:29Z

/azpw retry

mssonicbld · 2026-03-23T07:24:32Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-03-23T07:24:34Z

Retrying failed(or canceled) stages in build 1067549:
✅Stage Test:

Job impacted-area-kvmtest-t2 by Elastictest: retried.

yijingyan2 · 2026-03-23T07:46:29Z

/azpw ms_conflict

ashutosh-agrawal requested review from lguohan, qiluo-msft and xumia as code owners February 5, 2026 22:31

Merge branch '202511' into 202511-pr22486-cherrypick

d888da8

sdszhang closed this Feb 19, 2026

sdszhang reopened this Feb 19, 2026

Merge branch '202511' into 202511-pr22486-cherrypick

d01691f

vmittal-msft approved these changes Feb 20, 2026

View reviewed changes

Merge branch '202511' into 202511-pr22486-cherrypick

3e368b6

radha-danda mentioned this pull request Feb 20, 2026

[action] [PR:21583] Add pre step to change counterpoll port interval to 2000 in golden config sonic-net/sonic-mgmt#22068

Open

12 tasks

vmittal-msft added 2 commits February 23, 2026 09:45

Merge branch '202511' into 202511-pr22486-cherrypick

545d56f

Merge branch '202511' into 202511-pr22486-cherrypick

daee515

ashutosh-agrawal mentioned this pull request Mar 18, 2026

Backport master PR#87 and PR#88 together to 202511 sonic-net/sonic-dhcp-relay#95

Merged

Update sonic-dhcp-relay submodule to include boost dependency fixes

46b6c9c

Signed-off-by: Ashutosh Agrawal <ashu@cisco.com>

ashutosh-agrawal requested review from dgsudharsan, praveen-li and venkatmahalingam as code owners March 18, 2026 20:54

Merge remote-tracking branch 'origin/202511' into 202511-pr22486-cher…

295e609

…rypick

vmittal-msft merged commit b2e816b into sonic-net:202511 Mar 23, 2026
18 checks passed

ashutosh-agrawal mentioned this pull request Jun 26, 2026

[sonic-dhcp-relay] Nomination for repo maintainer sonic-net/SONiC#2416

Open

Uh oh!

Conversation

ashutosh-agrawal commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Backport of #22486 to 202511

Original PR

Changes

What was added

Testing

How to verify

Uh oh!

mssonicbld commented Feb 5, 2026

Uh oh!

azure-pipelines Bot commented Feb 5, 2026

Uh oh!

mssonicbld commented Feb 6, 2026

Uh oh!

azure-pipelines Bot commented Feb 6, 2026

Uh oh!

dayouliu1 commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ashutosh-agrawal commented Feb 10, 2026

Uh oh!

dayouliu1 commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mssonicbld commented Feb 19, 2026

Uh oh!

azure-pipelines Bot commented Feb 19, 2026

Uh oh!

mssonicbld commented Feb 19, 2026

Uh oh!

azure-pipelines Bot commented Feb 19, 2026

Uh oh!

mssonicbld commented Feb 20, 2026

Uh oh!

azure-pipelines Bot commented Feb 20, 2026

Uh oh!

mssonicbld commented Feb 24, 2026

Uh oh!

azure-pipelines Bot commented Feb 24, 2026

Uh oh!

vmittal-msft commented Mar 16, 2026

Uh oh!

mssonicbld commented Mar 16, 2026

Uh oh!

azure-pipelines Bot commented Mar 16, 2026

Uh oh!

vmittal-msft commented Mar 17, 2026

Uh oh!

ashutosh-agrawal commented Mar 18, 2026

Uh oh!

mssonicbld commented Mar 18, 2026

Uh oh!

azure-pipelines Bot commented Mar 18, 2026

Uh oh!

yxieca commented Mar 18, 2026

Uh oh!

yxieca commented Mar 20, 2026

Uh oh!

mssonicbld commented Mar 21, 2026

Uh oh!

azure-pipelines Bot commented Mar 21, 2026

Uh oh!

yijingyan2 commented Mar 22, 2026

Uh oh!

yijingyan2 commented Mar 22, 2026

Uh oh!

yijingyan2 commented Mar 22, 2026

Uh oh!

yijingyan2 commented Mar 23, 2026

Uh oh!

yijingyan2 commented Mar 23, 2026

Uh oh!

mssonicbld commented Mar 23, 2026

Uh oh!

mssonicbld commented Mar 23, 2026

Uh oh!

yijingyan2 commented Mar 23, 2026

ashutosh-agrawal commented Feb 5, 2026 •

edited

Loading

dayouliu1 commented Feb 9, 2026 •

edited

Loading

dayouliu1 commented Feb 10, 2026 •

edited

Loading