[cbf] Add class-based forwarding support by TACappleman · Pull Request #1963 · sonic-net/sonic-swss

TACappleman · 2021-10-15T16:22:12Z

What I did

Added CBF NHG support to NhgOrch
Added NhgMapOrch to handle DSCP_TO_FC and EXP_TO_FC tables
Added UT for the new NhgOrch function and NhgMapOrch

Why I did it

Support sonic-net/SONiC#796

How I verified it

SWSS UTs covering new functionality

lgtm-com · 2021-10-15T17:29:30Z

This pull request introduces 1 alert when merging cf32453 into f248e26 - view on LGTM.com

new alerts:

1 for Except block handles 'BaseException'

TACappleman · 2021-10-18T14:36:59Z

HLD here: sonic-net/SONiC#796

prsunny · 2021-10-18T15:35:25Z

Few high-level comments:

Since you've multiple files for this feature, please move it to a new folder under orchagent
There are some existing files that changed its name or moved code. Please note, we've already reviewed those and it will be hard to re-review the same. Please retain the existing files names and changes and suggest to only add new changes.

TACappleman · 2021-10-19T08:12:13Z

/azpw run

mssonicbld · 2021-10-19T08:12:14Z

/AzurePipelines run

azure-pipelines · 2021-10-19T08:12:25Z

Azure Pipelines successfully started running 1 pipeline(s).

TACappleman · 2021-10-19T12:20:38Z

I've moved most of the new files into a subdirectory. I've reduced changes where sensible so that moved code is as easy to see as possible. But to take advantage of being able to reuse code between the two types of next hop groups, a bunch of it has to move (e.g. to templates)

lgtm-com · 2021-10-19T13:23:13Z

This pull request introduces 1 alert when merging cd49fff into 6b15584 - view on LGTM.com

new alerts:

1 for Except block handles 'BaseException'

prsunny · 2021-10-19T15:17:51Z

I've moved most of the new files into a subdirectory. I've reduced changes where sensible so that moved code is as easy to see as possible. But to take advantage of being able to reuse code between the two types of next hop groups, a bunch of it has to move (e.g. to templates)

This is too much of code churn for this feature. If its new, why modify lots of existing code unless it was not originally designed correctly. IMO, this is re-reviewing the code and not sure if this can be made to 202111

TACappleman · 2021-10-20T14:21:07Z

/azpw run

mssonicbld · 2021-10-20T14:21:08Z

/AzurePipelines run

azure-pipelines · 2021-10-20T14:21:19Z

Azure Pipelines successfully started running 1 pipeline(s).

TACappleman · 2021-10-21T08:15:21Z

/azpw run

mssonicbld · 2021-10-21T08:15:22Z

/AzurePipelines run

azure-pipelines · 2021-10-21T08:15:32Z

Azure Pipelines successfully started running 1 pipeline(s).

TACappleman · 2021-10-21T12:04:15Z

/azpw run

mssonicbld · 2021-10-21T12:04:16Z

/AzurePipelines run

azure-pipelines · 2021-10-21T12:04:27Z

Azure Pipelines successfully started running 1 pipeline(s).

TACappleman · 2021-10-21T14:08:56Z

/azpw run

mssonicbld · 2021-10-21T14:08:58Z

/AzurePipelines run

azure-pipelines · 2021-10-21T14:09:09Z

Azure Pipelines successfully started running 1 pipeline(s).

TACappleman · 2021-10-22T13:31:35Z

/azpw run

mssonicbld · 2021-10-22T13:31:37Z

/AzurePipelines run

azure-pipelines · 2021-10-22T13:31:47Z

Azure Pipelines successfully started running 1 pipeline(s).

lgtm-com · 2021-10-22T13:39:17Z

This pull request introduces 1 alert when merging e048b3a into d95823d - view on LGTM.com

new alerts:

1 for Except block handles 'BaseException'

prsunny · 2021-10-23T00:39:08Z

Based on discussion:

Note: nhgbase.h and nhgbase.cpp are templatized
Create a new folder named cbf
Change cbfnhghandler to cbfnhgorch
Move cbf*.h/cpp and nhgmap*.h/cpp to cbf
Move nhgbase.* to orchagent/
Retain nhgorch.h/cpp as it is.
Separate out the entry points. APP_NEXTHOP_GROUP_TABLE_NAME -> nhgorch, APP_CLASS_BASED_NEXT_HOP_GROUP_TABLE_NAME -> cbfnhgorch.

TACappleman · 2021-10-25T15:32:21Z

@prsunny I've made those suggested changes.

The changes to the original nhgorch now mostly consist of the following:

Code moved to the template classes
A few calls to cbfnhgorch when looking up next hop groups
Some fields renamed to better reflect the combined code (e.g. next hop group members may now be next hops or next hop groups, so renamed m_nh_key to m_key).

All these changes are now a lot easier to follow in the code, as there's less churn

TACappleman · 2021-10-25T15:33:09Z

/azpw run

This reverts commit 40aa75c.

arlakshm

lgtm.

TACappleman · 2021-11-13T19:11:42Z

@prsunny are you happy for this to merge now?

prsunny

Reviewed common code and lgtm.

* [cbf] Added initial CBF support (#2) * Added CBF NHG support to NhgOrch * Added NhgMapOrch to handle DSCP_TO_FC and EXP_TO_FC tables * Added UT for the new NhgOrch function and NhgMapOrch Support sonic-net/SONiC#796 Co-authored-by: Alexandru Banu <[email protected]>

…et#1963) What I did Add soft-reboot command support for the armhf and arm64 platforms How I did it Add logic to retrieve kernel boot arguments from the Device Tree rather than from the GRUB config for these platforms How to verify it Execute the soft-reboot command on an armhf or arm64 platform

* [cbf] Added initial CBF support (Pterosaur#2) * Added CBF NHG support to NhgOrch * Added NhgMapOrch to handle DSCP_TO_FC and EXP_TO_FC tables * Added UT for the new NhgOrch function and NhgMapOrch Support sonic-net/SONiC#796 Co-authored-by: Alexandru Banu <[email protected]>

TACappleman requested a review from prsunny as a code owner October 15, 2021 16:22

TACappleman mentioned this pull request Oct 19, 2021

Class Based Forwarding HLD sonic-net/SONiC#796

Merged

TACappleman and others added 19 commits November 13, 2021 08:33

Tweak UT timings

9dadb68

Revert "Tweak UT timings"

463619e

This reverts commit 40aa75c.

Split NhgOrch from CbfNhgOrch

e119db4

Fix weighted ECMP members

bda9c9c

Fix UT

e4f57ce

Fixes

93d726b

Fixes

719c6a1

Fix and UT

dd4eeb5

CRM and warning log

991120f

Fixes

80f3ac5

Fixes

1215907

QoS fix and UT

f0a4b95

UT

ea24f1f

Fix orchagent crash

cb7d98f

QoS fix

97f9209

Fix UT

8fe6999

Fix merge issue

922b535

Fix merge issue

9cff811

Fix and more UT

9ab2522

TACappleman force-pushed the cbf_pr branch from e84f29f to 9ab2522 Compare November 13, 2021 08:33

arlakshm approved these changes Nov 13, 2021

View reviewed changes

kperumalbfn approved these changes Nov 15, 2021

View reviewed changes

prsunny approved these changes Nov 16, 2021

View reviewed changes

rlhui merged commit 339101c into sonic-net:master Nov 16, 2021

stephenxs mentioned this pull request Nov 17, 2021

[sonic-swss] Advance submodule sonic-net/sonic-buildimage#9288

Merged

5 tasks

abanu-ms deleted the cbf_pr branch December 3, 2021 10:41

Conversation

TACappleman commented Oct 15, 2021

Uh oh!

lgtm-com bot commented Oct 15, 2021

Uh oh!

TACappleman commented Oct 18, 2021

Uh oh!

prsunny commented Oct 18, 2021

Uh oh!

TACappleman commented Oct 19, 2021

Uh oh!

mssonicbld commented Oct 19, 2021

Uh oh!

azure-pipelines bot commented Oct 19, 2021

Uh oh!

TACappleman commented Oct 19, 2021

Uh oh!

lgtm-com bot commented Oct 19, 2021

Uh oh!

prsunny commented Oct 19, 2021

Uh oh!

TACappleman commented Oct 20, 2021

Uh oh!

mssonicbld commented Oct 20, 2021

Uh oh!

azure-pipelines bot commented Oct 20, 2021

Uh oh!

TACappleman commented Oct 21, 2021

Uh oh!

mssonicbld commented Oct 21, 2021

Uh oh!

azure-pipelines bot commented Oct 21, 2021

Uh oh!

TACappleman commented Oct 21, 2021

Uh oh!

mssonicbld commented Oct 21, 2021

Uh oh!

azure-pipelines bot commented Oct 21, 2021

Uh oh!

TACappleman commented Oct 21, 2021

Uh oh!

mssonicbld commented Oct 21, 2021

Uh oh!

azure-pipelines bot commented Oct 21, 2021

Uh oh!

TACappleman commented Oct 22, 2021

Uh oh!

mssonicbld commented Oct 22, 2021

Uh oh!

azure-pipelines bot commented Oct 22, 2021

Uh oh!

lgtm-com bot commented Oct 22, 2021

Uh oh!

prsunny commented Oct 23, 2021

Uh oh!

TACappleman commented Oct 25, 2021

Uh oh!

TACappleman commented Oct 25, 2021

Uh oh!

arlakshm left a comment

Choose a reason for hiding this comment

Uh oh!

TACappleman commented Nov 13, 2021

Uh oh!

prsunny left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants