[fpmsyncd] Fpmsyncd Next Hop Table Enhancement #16762

ntt-omw · 2023-10-02T10:46:05Z

Why I did it

Implementing code changes for sonic-net/SONiC#1425

How I did it

Added RTA_NH_ID attribute patch to libnl3 to add nexthop group feature to fpmsyncd.

How to verify it

enable/disable nexthop group feature

Klish will call REST API to configure feature next-hop-group enable.
FEATURE|nexthop_group will be created in CONFIG_DB
- template zebra.conf.j2 will generate zebra.conf with fpm use-next-hop-groups if FEATURE|nexthop_group exists in CONFIG_DB. Else, it will generate zebra.conf with no fpm use-next-hop-groups (default behavior)
Do config save comman and write to /etc/sonic/config_db.json
restart SONiC: virsh reboot sonic-nhg
/etc/frr/zebra.conf has fpm use-next-hop-groups instead of no fpm use-next-hop-groups

Klish CLI for feature nexthop_group

Enable: sonic(config)# feature next-hop-group enable
Disable: sonic(config)# no feature next-hop-group

Enable

admin@sonic:~$ sonic-cli

sonic# configure terminal

sonic(config)#
  end        Exit to EXEC mode
  exit       Exit from current mode
  feature    Configure additional feature
  interface  Select an interface
  ip         Global IP configuration subcommands
  mclag      domain
  no         To delete / disable commands in config mode

sonic(config)# feature
  next-hop-group  Next-hop Groups feature

sonic(config)# feature next-hop-group
  enable  Enable Next-hop Groups feature

sonic(config)# feature next-hop-group enable
  <cr>

Disable

sonic(config)# no
  feature  Disable additional feature
  ip       Global IP configuration subcommands
  mclag    domain

sonic(config)# no feature
  next-hop-group  Disable Next-hop Groups feature

sonic(config)# no feature next-hop-group
  <cr>

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

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)

lguohan · 2023-10-02T16:30:18Z

dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2

@@ -7,8 +7,13 @@
 {% endblock banner %}
 !
 {% block fpm %}
+{% if ( ('nexthop_group' in FEATURE) and ('state' in  FEATURE['nexthop_group']) and
+        (FEATURE['nexthop_group']['state'] == 'enabled') ) %}
+fpm use-next-hop-groups


can you follow example here?

https://github.com/sonic-net/SONiC/blob/master/doc/BGP/BGP-supress-fib-pending.md#632--device_metadata

@lguohan Moved under device metadata following the example.

nakano-omw · 2023-11-15T03:47:03Z

/AzurePipelines run

azure-pipelines · 2023-11-15T03:47:11Z

Commenter does not have sufficient privileges for PR 16762 in repo sonic-net/sonic-buildimage

nakano-omw · 2023-11-15T03:49:13Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2023-11-15T03:49:19Z

Commenter does not have sufficient privileges for PR 16762 in repo sonic-net/sonic-buildimage

nakano-omw · 2023-11-15T04:12:19Z

@lguohan
Please help in restarting the /AzurePipelines run Azure.sonic-buildimage. Would you be able to grant me the privilege?

ntt-omw · 2023-11-16T01:58:38Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2023-11-16T01:58:45Z

Commenter does not have sufficient privileges for PR 16762 in repo sonic-net/sonic-buildimage

nakano-omw · 2023-12-05T00:17:52Z

/azpw run Azure.sonic-buildimage

ridahanif96 · 2023-12-15T04:44:36Z

@nakano-omw you need to repush your code.

nakano-omw · 2023-12-15T12:11:37Z

@ridahanif96 Thanks for the comment. Fix conflicts and repush.

nakano-omw · 2024-01-10T23:25:37Z

/azpw run Azure.sonic-buildimage

nakano-omw · 2024-01-25T09:15:33Z

@ridahanif96 @zhangyanzhao It has been reviewed in Routing WG. Could we approve and merge the PR ?

zhangyanzhao · 2024-01-30T07:12:35Z

@lguohan can you please merge this PR if you have no more comments? Thanks.

nakano-omw · 2024-02-27T03:00:28Z

@lguohan can you please merge this PR. Thanks.

linux-foundation-easycla · 2024-05-14T05:26:37Z

The committers listed above are authorized under a signed CLA.

✅ login: nakano-omw / name: Kanji Nakano (cef3946, f38b32c, 2d2a6ff, b368331, c1a04a4, a37a170, f2d59c3)

Signed-off-by: nakano.kanji <[email protected]>

dgsudharsan · 2024-05-20T21:34:28Z

@ntt-omw Can you please sync to the latest. We re enabled nexthop kernel support #18953

dgsudharsan · 2024-05-20T21:38:12Z

src/sonic-yang-models/yang-models/sonic-device_metadata.yang

@@ -254,6 +254,16 @@ module sonic-device_metadata {
                    type inet:ipv4-address;
                    description "BGP Router identifier";
                }
+
+                leaf nexthop_group {


For yang, you need to add unit tests as well update sample_config_db, add update configuration schema. Please refer to this for example #14045

I added the sample_config_db. Thanks.

Signed-off-by: Kanji Nakano <[email protected]>

Signed-off-by: nakano.kanji <[email protected]>

eddieruan-alibaba · 2024-09-11T01:16:53Z

Cherry picked into phoenixwing folk.http://phoenixwing.com.cn/codes

kperumalbfn · 2024-09-12T21:48:03Z

@ntt-omw please update the branch and resolve the conflicts.

nakano-omw · 2024-09-13T07:05:22Z

@kperumalbfn @eddieruan-alibaba @qiluo-msft Branch updated and conflicts resolved. Please approve and merge.

eddieruan-alibaba · 2024-09-13T07:53:13Z

Thanks @nakano-omw I have reviewed it again. My approval is still there.

nakano-omw · 2024-09-13T08:10:40Z

@qiluo-msft It is marked as needing review by qiluo-msft. This PR has been reviewed by the Routing WG. Please approve.

kperumalbfn · 2024-09-12T21:46:37Z

dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2

+        (DEVICE_METADATA['localhost']['nexthop_group'] == 'enabled') ) %}
+! enable next hop group support
+fpm use-next-hop-groups
+{% else %}


@ebiken Do we have sonic-mgmt tests for FPM nexthop_group? If not, could you please add it.

Thanks for the review. But I'm away from this project now. Hi @nakano-omw , could you please follow up with @kperumalbfn ? Thanks.

@kperumalbfn Thanks for the review. The sonic-mgmt tests are being created in the Phoenixwing .
sonic-net/sonic-mgmt#13785

Thanks @nakano-omw Will review sonic-mgmt tests as well.

[fpmsyncd] Fpmsyncd Next Hop Table Enhancement (sonic-net#16762) Signed-off-by: nakano.kanji <[email protected]>

ntt-omw requested a review from lguohan as a code owner October 2, 2023 10:46

ntt-omw changed the title ~~nexthop group support~~ [fpmsyncd]nexthop group support Oct 2, 2023

ntt-omw changed the title ~~[fpmsyncd]nexthop group support~~ [fpmsyncd] Fpmsyncd Next Hop Table Enhancement Oct 2, 2023

ntt-omw mentioned this pull request Oct 2, 2023

Fpmsyncd Next Hop Table Enhancement HLD sonic-net/SONiC#1425

Merged

lguohan reviewed Oct 2, 2023

View reviewed changes

nakano-omw requested a review from qiluo-msft as a code owner November 9, 2023 10:25

nakano-omw force-pushed the ntt_fpmsyncd_enhanced branch from f1ed3fc to 07cd4ff Compare May 14, 2024 04:55

nakano-omw force-pushed the ntt_fpmsyncd_enhanced branch 2 times, most recently from cd0a5de to 035a3c6 Compare May 14, 2024 06:10

nexthop group support

cef3946

Signed-off-by: nakano.kanji <[email protected]>

nakano-omw force-pushed the ntt_fpmsyncd_enhanced branch from 7aaece3 to cef3946 Compare May 14, 2024 06:12

nexthop group support

c1a04a4

Signed-off-by: nakano.kanji <[email protected]>

dgsudharsan suggested changes May 20, 2024

View reviewed changes

Merge branch 'master' into ntt_fpmsyncd_enhanced

f2d59c3

nakano-omw added 2 commits May 22, 2024 15:20

sample_config_db.json update

b368331

Signed-off-by: Kanji Nakano <[email protected]>

sample_config_db.json test update

2d2a6ff

Signed-off-by: Kanji Nakano <[email protected]>

dgsudharsan approved these changes May 23, 2024

View reviewed changes

dgsudharsan added the YANG YANG model related changes label May 23, 2024

YANG test update

a37a170

Signed-off-by: nakano.kanji <[email protected]>

eddieruan-alibaba approved these changes Aug 31, 2024

View reviewed changes

Merge branch 'master' into ntt_fpmsyncd_enhanced

f38b32c

kperumalbfn reviewed Sep 15, 2024

View reviewed changes

kperumalbfn approved these changes Sep 17, 2024

View reviewed changes

kperumalbfn merged commit 2c47e35 into sonic-net:master Sep 17, 2024
23 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[fpmsyncd] Fpmsyncd Next Hop Table Enhancement #16762

[fpmsyncd] Fpmsyncd Next Hop Table Enhancement #16762

ntt-omw commented Oct 2, 2023

lguohan Oct 2, 2023

ebiken Nov 10, 2023

nakano-omw commented Nov 15, 2023

azure-pipelines bot commented Nov 15, 2023

nakano-omw commented Nov 15, 2023

azure-pipelines bot commented Nov 15, 2023

nakano-omw commented Nov 15, 2023

ntt-omw commented Nov 16, 2023

azure-pipelines bot commented Nov 16, 2023

nakano-omw commented Dec 5, 2023

ridahanif96 commented Dec 15, 2023

nakano-omw commented Dec 15, 2023 •

edited

Loading

nakano-omw commented Jan 10, 2024

nakano-omw commented Jan 25, 2024

zhangyanzhao commented Jan 30, 2024

nakano-omw commented Feb 27, 2024

linux-foundation-easycla bot commented May 14, 2024 •

edited

Loading

dgsudharsan commented May 20, 2024

dgsudharsan May 20, 2024

nakano-omw May 22, 2024

eddieruan-alibaba commented Sep 11, 2024

kperumalbfn commented Sep 12, 2024

nakano-omw commented Sep 13, 2024

eddieruan-alibaba commented Sep 13, 2024

nakano-omw commented Sep 13, 2024

kperumalbfn Sep 12, 2024

kentaro-arrcus Sep 16, 2024

nakano-omw Sep 17, 2024

kperumalbfn Sep 17, 2024

[fpmsyncd] Fpmsyncd Next Hop Table Enhancement #16762

[fpmsyncd] Fpmsyncd Next Hop Table Enhancement #16762

Conversation

ntt-omw commented Oct 2, 2023

Why I did it

How I did it

How to verify it

enable/disable nexthop group feature

Klish CLI for feature nexthop_group

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

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)

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nakano-omw commented Nov 15, 2023

azure-pipelines bot commented Nov 15, 2023

nakano-omw commented Nov 15, 2023

azure-pipelines bot commented Nov 15, 2023

nakano-omw commented Nov 15, 2023

ntt-omw commented Nov 16, 2023

azure-pipelines bot commented Nov 16, 2023

nakano-omw commented Dec 5, 2023

ridahanif96 commented Dec 15, 2023

nakano-omw commented Dec 15, 2023 • edited Loading

nakano-omw commented Jan 10, 2024

nakano-omw commented Jan 25, 2024

zhangyanzhao commented Jan 30, 2024

nakano-omw commented Feb 27, 2024

linux-foundation-easycla bot commented May 14, 2024 • edited Loading

dgsudharsan commented May 20, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eddieruan-alibaba commented Sep 11, 2024

kperumalbfn commented Sep 12, 2024

nakano-omw commented Sep 13, 2024

eddieruan-alibaba commented Sep 13, 2024

nakano-omw commented Sep 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nakano-omw commented Dec 15, 2023 •

edited

Loading

linux-foundation-easycla bot commented May 14, 2024 •

edited

Loading