Skip to content

[dhcp_relay] Revert cli for dhcp per-interface counter#19154

Merged
yxieca merged 4 commits intosonic-net:masterfrom
yaqiangz:master_rever_dhcp_relay
Jun 5, 2024
Merged

[dhcp_relay] Revert cli for dhcp per-interface counter#19154
yxieca merged 4 commits intosonic-net:masterfrom
yaqiangz:master_rever_dhcp_relay

Conversation

@yaqiangz
Copy link
Contributor

@yaqiangz yaqiangz commented May 31, 2024

Why I did it

Functionality for dhcp per-interface counter has been reverted:
dhcpmon: #18273
dhcprelay: #18288

Cli support hasn't been reverted, but it would not take effect because functionality has been removed.

Work item tracking
  • Microsoft ADO (number only): 28252981

How I did it

Revert related code

How to verify it

UT passed

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

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

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

@yaqiangz
Copy link
Contributor Author

yaqiangz commented Jun 2, 2024

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yaqiangz
Copy link
Contributor Author

yaqiangz commented Jun 4, 2024

/azpw ms_conflict

1 similar comment
@yaqiangz
Copy link
Contributor Author

yaqiangz commented Jun 4, 2024

/azpw ms_conflict

@yaqiangz yaqiangz marked this pull request as ready for review June 5, 2024 00:35
@yaqiangz yaqiangz requested a review from lguohan as a code owner June 5, 2024 00:35
@yaqiangz
Copy link
Contributor Author

yaqiangz commented Jun 5, 2024

@yxieca Could you please help to review this PR?
Change for 202305 has been done by Kelly #18253

@yxieca yxieca merged commit f161794 into sonic-net:master Jun 5, 2024
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Jun 5, 2024
* Revert "add show dhcp_relay ipv4 counter entry, fix interface name offset issue (sonic-net#16507)"

This reverts commit 9c1c82e.

* Revert "[dhcp-relay]: dhcp/dhcpv6 per interface counter support (sonic-net#16377)"

This reverts commit a522a63.

* Remove test_show_dhcp_relay_ipv4_counter_with_enabled_dhcp_server
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202311: #19211

mssonicbld pushed a commit that referenced this pull request Jun 5, 2024
* Revert "add show dhcp_relay ipv4 counter entry, fix interface name offset issue (#16507)"

This reverts commit 9c1c82e.

* Revert "[dhcp-relay]: dhcp/dhcpv6 per interface counter support (#16377)"

This reverts commit a522a63.

* Remove test_show_dhcp_relay_ipv4_counter_with_enabled_dhcp_server
@vivekrnv
Copy link
Contributor

vivekrnv commented Sep 4, 2024

Backport present in 202311 but not in 202405

@yaqiangz
Copy link
Contributor Author

yaqiangz commented Sep 5, 2024

Hi @bingwang-ms could you please help to approve this backport request?

mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Sep 5, 2024
* Revert "add show dhcp_relay ipv4 counter entry, fix interface name offset issue (sonic-net#16507)"

This reverts commit 9c1c82e.

* Revert "[dhcp-relay]: dhcp/dhcpv6 per interface counter support (sonic-net#16377)"

This reverts commit a522a63.

* Remove test_show_dhcp_relay_ipv4_counter_with_enabled_dhcp_server
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202405: #20150

mssonicbld pushed a commit that referenced this pull request Sep 7, 2024
* Revert "add show dhcp_relay ipv4 counter entry, fix interface name offset issue (#16507)"

This reverts commit 9c1c82e.

* Revert "[dhcp-relay]: dhcp/dhcpv6 per interface counter support (#16377)"

This reverts commit a522a63.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants