Skip to content

[202012] Replace VLAN table with DHCP_RELAY table for verifying ipv6 helpers and add unittests#11794

Merged
kellyyeh merged 1 commit intosonic-net:202012from
kellyyeh:dhcprelay-table
Aug 25, 2022
Merged

[202012] Replace VLAN table with DHCP_RELAY table for verifying ipv6 helpers and add unittests#11794
kellyyeh merged 1 commit intosonic-net:202012from
kellyyeh:dhcprelay-table

Conversation

@kellyyeh
Copy link
Contributor

@kellyyeh kellyyeh commented Aug 19, 2022

Cherry-pick #10654

Why I did it

dhcp6relay reads ipv6 helpers from DHCP_RELAY table. Docker supervisord should rely on DHCP_RELAY instead of VLAN table to determine if dhcpv6 relay needs to be started. Added "vlan missing ip helper" dhcp relay unittest

How I did it

Change docker supervisord to check for DHCP_RELAY table for ipv6 helpers
Added unittests

How to verify it

Run dhcp_relay docker, ensure ipv6 helper is present is only DHCP_RELAY table and not VLAN table, and dhcp6relay should start up

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@Blueve
Copy link
Contributor

Blueve commented Aug 24, 2022

@kellyyeh do we need this in 202012?

@kellyyeh kellyyeh requested a review from Blueve August 24, 2022 18:07
@kellyyeh
Copy link
Contributor Author

@Blueve Yes this change

@kellyyeh do we need this in 202012?

Yes, this PR is for 202012. It already exists in master

{% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}

@prsunny
Copy link
Contributor

prsunny commented Aug 24, 2022

@kellyyeh , can you please add [202012] to title and also the PR thats merged to master?

@kellyyeh kellyyeh requested a review from yxieca August 24, 2022 19:02
@kellyyeh kellyyeh changed the title Replace VLAN table with DHCP_RELAY table for verifying ipv6 helpers [202012] Replace VLAN table with DHCP_RELAY table for verifying ipv6 helpers Aug 24, 2022
@kellyyeh kellyyeh changed the title [202012] Replace VLAN table with DHCP_RELAY table for verifying ipv6 helpers [202012] Replace VLAN table with DHCP_RELAY table for verifying ipv6 helpers and add unittests Aug 24, 2022
@kellyyeh kellyyeh added Request for 202111 Branch For PRs being requested for 202111 branch Request for 202205 Branch labels Aug 24, 2022
@kellyyeh kellyyeh merged commit 973fb9e into sonic-net:202012 Aug 25, 2022
@kellyyeh kellyyeh deleted the dhcprelay-table branch August 25, 2022 02:53
@yxieca
Copy link
Contributor

yxieca commented Aug 26, 2022

@kellyyeh 202205 is already having dhcp in submodule. Please advance submodule head instead.

@kellyyeh
Copy link
Contributor Author

kellyyeh commented Sep 9, 2022

@yxieca This change is in docker-dhcp-relay and sonic-config-engine, no changes in sonic-dhcp-relay

@yxieca
Copy link
Contributor

yxieca commented Sep 9, 2022

@kellyyeh 202205 is already having dhcp in submodule. Please advance submodule head instead.

@kellyyeh we don't cherry-pick from lower branch to higher branch. Please move the flag to the master branch PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Request for 202111 Branch For PRs being requested for 202111 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants