[FRR] Switch to dplane_fpm_nl plugin instead of fpm #12852

stepanblyschak · 2022-11-28T13:01:33Z

Why I did it

dplane_fpm_nl is a new FPM implementation in FRR. The old plugin fpm will not have any new features implemented. Usage of the new plugin gives us ability to use BGP suppression feature and next hop groups in the future.

How I did it

Switch to dplane_fpm_nl zebra plugin from old fpm plugin which is not supported anymore
Remove stale patches for old fpm plugin and add similar patches for dplane_fpm_nl

How to verify it

Build and run on the switch.

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

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

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

As part of these changes: - Switch to dplane_fpm_nl zebra plugin from old fpm plugin which is not supported anymore - Remove stale patches for old fpm plugin and add similar patches for dplane_fpm_nl - FRR patch backport from 8.4 to add support for fpm dataplane feedback - Templates are updated to read new feature configuration and configure FRR accordingly - YANG models updates to reflect new configuration Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

…pm-dplane-nl

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

stepanblyschak · 2022-11-29T09:12:01Z

/azpw run

mssonicbld · 2022-11-29T09:12:02Z

/AzurePipelines run

azure-pipelines · 2022-11-29T09:12:08Z

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

stepanblyschak · 2022-11-29T09:14:30Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-11-29T09:14:31Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-11-29T09:14:44Z

Azure Pipelines successfully started running 1 pipeline(s).

stepanblyschak · 2022-11-29T16:06:17Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-11-29T16:06:19Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-11-29T16:06:34Z

Azure Pipelines successfully started running 1 pipeline(s).

stepanblyschak · 2022-11-30T10:35:42Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-11-30T10:35:45Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-11-30T10:35:57Z

Azure Pipelines successfully started running 1 pipeline(s).

lguohan · 2022-12-04T06:31:42Z

why build failed?

stepanblyschak · 2022-12-12T01:27:49Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-12-12T01:27:51Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-12-12T01:28:03Z

Azure Pipelines successfully started running 1 pipeline(s).

stepanblyschak · 2022-12-12T12:11:50Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-12-12T12:11:52Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-12-12T12:12:06Z

Azure Pipelines successfully started running 1 pipeline(s).

stepanblyschak · 2022-12-13T20:49:05Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-12-13T20:49:07Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-12-13T20:49:20Z

Azure Pipelines successfully started running 1 pipeline(s).

liat-grozovik · 2023-01-11T14:52:40Z

@dgsudharsan could you please also help to review the FRR changes?

liat-grozovik · 2023-01-11T14:53:25Z

@dgsudharsan could you please also help to review the FRR changes?

dgsudharsan · 2023-01-12T06:30:44Z

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

@@ -6,6 +6,13 @@
 !
 {% endblock banner %}
 !
+{% block fpm %}
+! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages


What is the behavior if the user has split mode and performs an upgrade?

fpmsyncd will get RTN_NEWROUTE without next hops and routes won't be programmed. User needs to update his own configs

dgsudharsan · 2023-01-12T06:34:15Z

@stepanblyschak Can you please mention the commit ids for the patch updates?

stepanblyschak · 2023-01-12T09:19:45Z

@dgsudharsan This commit FRRouting/frr@551fa8c comes from FRR upstream. Other patches are not in FRR upstream and were updated to work on top of new plugin

…unified modes Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

stepanblyschak · 2023-01-13T09:49:12Z

@dgsudharsan Could you please check the last commit?

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

StormLiangMS

approved with a question

StormLiangMS · 2023-02-06T14:52:17Z

dockers/docker-fpm-frr/docker_init.sh

+    FILE_NAME=${1}
+
+    grep -q '^no fpm use-next-hop-groups' $FILE_NAME || {
+        sed -i '1i no fpm use-next-hop-groups\nfpm address 127.0.0.1' $FILE_NAME


why adding this?

Please refer to the comment by @dgsudharsan #12852 (comment).
SONiC supports split mode FRR configuration. That is, user provides own zebra.conf, bgp.conf, etc. in /etc/sonic/frr folder, instead of generated from templates by SONiC.
In case user upgrades from older version to image with these changes he will not have mandatory configuration in his zebra.conf copied from the old image. I added this line to insert this configuration in case user does not have it.

Signed-off-by: Stepan Blyschak stepanb@nvidia.com DEPENDS: #12852 Why I did it To support BGP pending FIB suppression. How I did it I backported patches from FRR 8.4 feature that allows communicating ASIC route status back to FRR. Also, added a new field in DEVICE_METADATA YANG model table. Added UT for YANG model changes. How to verify it Run on the switch.

… image to debian bullseye This fixes an issue zebra config missing in docker-sonic-vpp because of the below fix in the mainline sonic-net/sonic-buildimage#12852 Unit tested static routes update, vrf routes etc. Signed-off-by: Shashidhar Patil <shashidhar.patil@gmail.com>

stepanblyschak and others added 13 commits October 20, 2022 13:33

Merge branch 'master' into bgp-suppress-fib-pending

112797f

organize patches

3079089

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

remove redundant files

ad59c4f

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

update patches

8b4db68

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

remove yang

0880950

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

fix

58026cc

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

Merge branch 'master' of github.com:azure/sonic-buildimage into frr-f…

226c7ab

…pm-dplane-nl

fixups

0b88bd1

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

update py2 templates

c99ca4a

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

fix patch

3ceb01d

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

backport fix from FRR

15671f0

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

update template in tests

57e85e5

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

stepanblyschak requested review from StormLiangMS and lguohan as code owners November 28, 2022 13:01

This was referenced Nov 28, 2022

[BGP] support BGP pending FIB suppression #12853

Merged

FIB Suppress Announcements of Routes Not Installed in HW sonic-net/SONiC#1103

Merged

Merge branch 'master' into frr-fpm-dplane-nl

902b654

liat-grozovik requested a review from dgsudharsan January 11, 2023 14:52

dgsudharsan reviewed Jan 12, 2023

View reviewed changes

write zebra mandatory configuration if not preset in split and split-…

fc57184

…unified modes Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

dgsudharsan approved these changes Jan 16, 2023

View reviewed changes

Use RTA_TABLE nl attribute when VRF if_index is >= 256

995e00f

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

StormLiangMS requested a review from prsunny February 6, 2023 15:09

StormLiangMS approved these changes Feb 6, 2023

View reviewed changes

lguohan merged commit 68e1079 into sonic-net:master Feb 6, 2023

patilshashidhar mentioned this pull request Apr 25, 2023

fpmsync ignores the route updates sonic-net/sonic-swss#2746

Closed

patilshashidhar mentioned this pull request Apr 25, 2023

Issue #18 : Migrate syncd-vpp and docker-sonic-vpp container image to… sonic-net/sonic-platform-vpp#23

Merged

StormLiangMS mentioned this pull request May 7, 2024

[frr-zebra] no valid nexthop error print #18887

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FRR] Switch to dplane_fpm_nl plugin instead of fpm #12852

[FRR] Switch to dplane_fpm_nl plugin instead of fpm #12852

stepanblyschak commented Nov 28, 2022

stepanblyschak commented Nov 29, 2022

mssonicbld commented Nov 29, 2022

azure-pipelines bot commented Nov 29, 2022

stepanblyschak commented Nov 29, 2022

mssonicbld commented Nov 29, 2022

azure-pipelines bot commented Nov 29, 2022

stepanblyschak commented Nov 29, 2022

mssonicbld commented Nov 29, 2022

azure-pipelines bot commented Nov 29, 2022

stepanblyschak commented Nov 30, 2022

mssonicbld commented Nov 30, 2022

azure-pipelines bot commented Nov 30, 2022

lguohan commented Dec 4, 2022

stepanblyschak commented Dec 12, 2022

mssonicbld commented Dec 12, 2022

azure-pipelines bot commented Dec 12, 2022

stepanblyschak commented Dec 12, 2022

mssonicbld commented Dec 12, 2022

azure-pipelines bot commented Dec 12, 2022

stepanblyschak commented Dec 13, 2022

mssonicbld commented Dec 13, 2022

azure-pipelines bot commented Dec 13, 2022

liat-grozovik commented Jan 11, 2023

liat-grozovik commented Jan 11, 2023

dgsudharsan Jan 12, 2023

stepanblyschak Jan 12, 2023 •

edited

Loading

dgsudharsan commented Jan 12, 2023

stepanblyschak commented Jan 12, 2023

stepanblyschak commented Jan 13, 2023

StormLiangMS left a comment

StormLiangMS Feb 6, 2023

stepanblyschak Feb 6, 2023

[FRR] Switch to dplane_fpm_nl plugin instead of fpm #12852

[FRR] Switch to dplane_fpm_nl plugin instead of fpm #12852

Conversation

stepanblyschak commented Nov 28, 2022

Why I did it

How I did it

How to verify it

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

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

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

stepanblyschak commented Nov 29, 2022

mssonicbld commented Nov 29, 2022

azure-pipelines bot commented Nov 29, 2022

stepanblyschak commented Nov 29, 2022

mssonicbld commented Nov 29, 2022

azure-pipelines bot commented Nov 29, 2022

stepanblyschak commented Nov 29, 2022

mssonicbld commented Nov 29, 2022

azure-pipelines bot commented Nov 29, 2022

stepanblyschak commented Nov 30, 2022

mssonicbld commented Nov 30, 2022

azure-pipelines bot commented Nov 30, 2022

lguohan commented Dec 4, 2022

stepanblyschak commented Dec 12, 2022

mssonicbld commented Dec 12, 2022

azure-pipelines bot commented Dec 12, 2022

stepanblyschak commented Dec 12, 2022

mssonicbld commented Dec 12, 2022

azure-pipelines bot commented Dec 12, 2022

stepanblyschak commented Dec 13, 2022

mssonicbld commented Dec 13, 2022

azure-pipelines bot commented Dec 13, 2022

liat-grozovik commented Jan 11, 2023

liat-grozovik commented Jan 11, 2023

dgsudharsan Jan 12, 2023

Choose a reason for hiding this comment

stepanblyschak Jan 12, 2023 • edited Loading

Choose a reason for hiding this comment

dgsudharsan commented Jan 12, 2023

stepanblyschak commented Jan 12, 2023

stepanblyschak commented Jan 13, 2023

StormLiangMS left a comment

Choose a reason for hiding this comment

StormLiangMS Feb 6, 2023

Choose a reason for hiding this comment

stepanblyschak Feb 6, 2023

Choose a reason for hiding this comment

stepanblyschak Jan 12, 2023 •

edited

Loading