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

[201911] Add dhcp6relay as dhcprelay submodule #12052

Merged
merged 8 commits into from
Nov 7, 2022

Conversation

kellyyeh
Copy link
Contributor

@kellyyeh kellyyeh commented Sep 13, 2022

Why I did it

Add dhcp6relay in 201911 branch, and make it a submodule

How I did it

Cherry-picked below PR's and made compatible for stretch/201911

Add DHCPv6 minigraph parsing support #8870

Parse DHCP Table #8988

Replace isc-dhcp with DHCPv6 Relay in dhcp_relay docker #8884

Change dhcp6relay to be a submodule, and rename it to dhcprelay #10711

How to verify it

Ran full dhcpv6 test suite with sonic-mgmt master branch and passed

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)

@kellyyeh kellyyeh changed the title [201911] Add dhcp6relay [201911] Add dhcp6relay as dhcprelay submodule Sep 16, 2022
rules/dhcprelay.mk Outdated Show resolved Hide resolved
@kellyyeh kellyyeh force-pushed the 201911-dhcp6relay branch 2 times, most recently from d9205f3 to 3f2daa4 Compare September 19, 2022 06:20
rules/dhcprelay.mk Outdated Show resolved Hide resolved
{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
{% set _dummy = monitor_instance.update({'flag': True}) %}
{%- endif %}
{% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %}
Copy link
Contributor

Choose a reason for hiding this comment

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

this part may be removed also if only v4 messages are monitored(line9-11, line23, line33)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed

@kellyyeh kellyyeh requested review from yxieca and removed request for pettershao-ragilenetworks September 27, 2022 20:01
@yxieca
Copy link
Contributor

yxieca commented Sep 28, 2022

@kellyyeh please fill in the PR template. especially the how to verify part. Thanks.

@kellyyeh
Copy link
Contributor Author

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Oct 19, 2022

CLA Signed

The committers listed above are authorized under a signed CLA.

@kellyyeh kellyyeh merged commit 757130c into sonic-net:201911 Nov 7, 2022
@kellyyeh kellyyeh deleted the 201911-dhcp6relay branch November 7, 2022 23:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants