Support tunnel traffic QoS remapping #2190

bingwang-ms · 2022-03-21T12:03:40Z

Signed-off-by: bingwang bingwang@microsoft.com

What I did
This PR is to update orchagent to support tunnel traffic remapping.
HLD sonic-net/SONiC#950
Changes include

Change the termination type of mux tunnel to P2P to apply different attributes
Update tunneldecaporch to apply new SAI attributes to tunnel
Update muxorch to apply new SAI attributes to tunnel
Update qosorch to parse new QoS map tables

Why I did it
Please check HLD sonic-net/SONiC#950 for more details.

How I verified it
Verified by vs test

sudo pytest test_mux.py -v --dvsname=vs   
collected 8 items                                                                                                                                                                                     

test_mux.py::TestMuxTunnel::test_Tunnel PASSED                                                                                                                                                  [ 12%]
test_mux.py::TestMuxTunnel::test_Peer PASSED                                                                                                                                                    [ 25%]
test_mux.py::TestMuxTunnel::test_Neighbor PASSED                                                                                                                                                [ 37%]
test_mux.py::TestMuxTunnel::test_Fdb PASSED                                                                                                                                                     [ 50%]
test_mux.py::TestMuxTunnel::test_Route PASSED                                                                                                                                                   [ 62%]
test_mux.py::TestMuxTunnel::test_acl PASSED                                                                                                                                                     [ 75%]
test_mux.py::TestMuxTunnel::test_mux_metrics PASSED                                                                                                                                             [ 87%]
test_mux.py::test_nonflaky_dummy PASSED                                                                                                                                                         [100%]

sudo pytest test_tunnel.py -v --dvsname=vs
collected 6 items                                                                                                                                                                                     

test_tunnel.py::TestDecapTunnel::test_TunnelDecap_v4 PASSED                                                                                                                                     [ 16%]
test_tunnel.py::TestDecapTunnel::test_TunnelDecap_v6 PASSED                                                                                                                                     [ 33%]
test_tunnel.py::TestDecapTunnel::test_TunnelDecap_MuxTunnel PASSED                                                                                                                              [ 50%]
test_tunnel.py::TestSymmetricTunnel::test_TunnelSymmetric_v4 PASSED                                                                                                                             [ 66%]
test_tunnel.py::TestSymmetricTunnel::test_TunnelSymmetric_v6 PASSED                                                                                                                             [ 83%]
test_tunnel.py::test_nonflaky_dummy PASSED

System test is work in progress.

Details if related

Signed-off-by: bingwang <bingwang@microsoft.com>

orchagent/tunneldecaporch.cpp

prsunny · 2022-03-21T20:57:33Z

We would need VS test update and also reminder to change the dual tor sonic-mgmt test for IPinIP cases.

Signed-off-by: bingwang <bingwang@microsoft.com>

bingwang-ms · 2022-03-28T14:34:01Z

PR still WIP. Thanks

Signed-off-by: bingwang <bingwang@microsoft.com>

orchagent/qosorch.cpp

Signed-off-by: bingwang <wang.bing@microsoft.com>

bingwang-ms · 2022-04-12T08:36:29Z

PR still WIP. Thanks

PR is ready for review.

lgtm-com · 2022-04-12T09:59:28Z

This pull request introduces 1 alert when merging 2af94da into 6301db7 - view on LGTM.com

new alerts:

1 for Declaration hides parameter

Signed-off-by: bingwang <wang.bing@microsoft.com>

bingwang-ms · 2022-04-18T06:29:21Z

/azp run

azure-pipelines · 2022-04-18T06:29:30Z

Azure Pipelines successfully started running 1 pipeline(s).

orchagent/muxorch.cpp

orchagent/tunneldecaporch.cpp

orchagent/muxorch.cpp

orchagent/tunneldecaporch.cpp

Signed-off-by: bingwang <wang.bing@microsoft.com>

lgtm-com · 2022-04-20T14:59:30Z

This pull request fixes 1 alert when merging 11efd68 into 1fd1dbf - view on LGTM.com

fixed alerts:

1 for Unused import

orchagent/muxorch.cpp

Signed-off-by: bingwang <wang.bing@microsoft.com>

lgtm-com · 2022-04-22T12:55:23Z

This pull request fixes 1 alert when merging a82a593 into 1fd1dbf - view on LGTM.com

fixed alerts:

1 for Unused import

prsunny

Overally, the changes lgtm. One minor comment regarding backward compatibility .

orchagent/muxorch.cpp

Signed-off-by: bingwang <wang.bing@microsoft.com>

lgtm-com · 2022-04-26T07:51:56Z

This pull request fixes 1 alert when merging 151255d into 7f53db7 - view on LGTM.com

fixed alerts:

1 for Unused import

prsunny · 2022-04-26T16:42:44Z

Please fix coverage

bingwang-ms · 2022-04-27T01:57:18Z

/azp run

azure-pipelines · 2022-04-27T01:57:28Z

Azure Pipelines successfully started running 1 pipeline(s).

bingwang-ms · 2022-04-27T06:48:28Z

/azp run

azure-pipelines · 2022-04-27T06:48:38Z

Azure Pipelines successfully started running 1 pipeline(s).

*After the latest changes in this PR #2190 an issue was introduced. When the tunnel was deleted the TunnelTermEntries were deleted from ASIC but not from the OA cache. Due to that then the same tunnel is created the TunnelTermEntries are not created as OA has it in local cache. Signed-off-by: Myron Sosyak <myronx.sosyak@intel.com>

* Support tunnel traffic remap Signed-off-by: bingwang <bingwang@microsoft.com>

*After the latest changes in this PR sonic-net#2190 an issue was introduced. When the tunnel was deleted the TunnelTermEntries were deleted from ASIC but not from the OA cache. Due to that then the same tunnel is created the TunnelTermEntries are not created as OA has it in local cache. Signed-off-by: Myron Sosyak <myronx.sosyak@intel.com>

Support tunnel traffic remap

03a2683

Signed-off-by: bingwang <bingwang@microsoft.com>

bingwang-ms requested a review from neethajohn March 21, 2022 12:04

prsunny requested changes Mar 21, 2022

View reviewed changes

Address comments

094494b

Signed-off-by: bingwang <bingwang@microsoft.com>

Read all tables

19f120a

Signed-off-by: bingwang <bingwang@microsoft.com>

neethajohn reviewed Apr 4, 2022

View reviewed changes

orchagent/qosorch.cpp Outdated Show resolved Hide resolved

bingwang-ms added 4 commits April 8, 2022 06:00

Build pass

6168628

Signed-off-by: bingwang <wang.bing@microsoft.com>

Merge Master into tunnel_dscp_remap

22a7b24

Signed-off-by: bingwang <wang.bing@microsoft.com>

Update vs test

dbf28d3

Signed-off-by: bingwang <wang.bing@microsoft.com>

Add vs test cases

2af94da

Signed-off-by: bingwang <wang.bing@microsoft.com>

bingwang-ms marked this pull request as ready for review April 12, 2022 08:35

bingwang-ms added 2 commits April 13, 2022 01:43

Fix LGTM

7fcfa68

Signed-off-by: bingwang <wang.bing@microsoft.com>

Merge branch 'master' into tunnel_dscp_remap

35aa720

Merge remote-tracking branch 'upstream/master' into tunnel_dscp_remap

42d03ed

prsunny requested changes Apr 20, 2022

View reviewed changes

Address comments

11efd68

Signed-off-by: bingwang <wang.bing@microsoft.com>

prsunny reviewed Apr 20, 2022

View reviewed changes

orchagent/muxorch.cpp Outdated Show resolved Hide resolved

Remove app_db from muxorch

a82a593

Signed-off-by: bingwang <wang.bing@microsoft.com>

prsunny reviewed Apr 25, 2022

View reviewed changes

orchagent/muxorch.cpp Outdated Show resolved Hide resolved

Update muxorch to ignore non-existing attributes

151255d

Signed-off-by: bingwang <wang.bing@microsoft.com>

prsunny approved these changes Apr 26, 2022

View reviewed changes

bingwang-ms merged commit 88fad97 into sonic-net:master Apr 27, 2022

bingwang-ms mentioned this pull request Apr 29, 2022

[202012][cherry-pick] Support tunnel traffic QoS remapping #2246

Merged

msosyak mentioned this pull request Jun 10, 2022

Fix key generation in removeDecapTunnel #2322

Merged

bingwang-ms mentioned this pull request Jun 13, 2022

[HLD] DSCP/TC remapping for tunnel traffic sonic-net/SONiC#950

Merged

bingwang-ms added the Request for 202205 Branch label Jun 21, 2022

yxieca removed the Request for 202205 Branch label Jun 21, 2022

preetham-singh pushed a commit to preetham-singh/sonic-swss that referenced this pull request Aug 6, 2022

Support tunnel traffic QoS remapping (sonic-net#2190)

c9ad7c3

* Support tunnel traffic remap Signed-off-by: bingwang <bingwang@microsoft.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support tunnel traffic QoS remapping #2190

Support tunnel traffic QoS remapping #2190

bingwang-ms commented Mar 21, 2022 •

edited

Loading

prsunny commented Mar 21, 2022

bingwang-ms commented Mar 28, 2022

bingwang-ms commented Apr 12, 2022

lgtm-com bot commented Apr 12, 2022

bingwang-ms commented Apr 18, 2022

azure-pipelines bot commented Apr 18, 2022

lgtm-com bot commented Apr 20, 2022

lgtm-com bot commented Apr 22, 2022

prsunny left a comment

lgtm-com bot commented Apr 26, 2022

prsunny commented Apr 26, 2022

bingwang-ms commented Apr 27, 2022

azure-pipelines bot commented Apr 27, 2022

bingwang-ms commented Apr 27, 2022

azure-pipelines bot commented Apr 27, 2022

Support tunnel traffic QoS remapping #2190

Support tunnel traffic QoS remapping #2190

Conversation

bingwang-ms commented Mar 21, 2022 • edited Loading

prsunny commented Mar 21, 2022

bingwang-ms commented Mar 28, 2022

bingwang-ms commented Apr 12, 2022

lgtm-com bot commented Apr 12, 2022

bingwang-ms commented Apr 18, 2022

azure-pipelines bot commented Apr 18, 2022

lgtm-com bot commented Apr 20, 2022

lgtm-com bot commented Apr 22, 2022

prsunny left a comment

Choose a reason for hiding this comment

lgtm-com bot commented Apr 26, 2022

prsunny commented Apr 26, 2022

bingwang-ms commented Apr 27, 2022

azure-pipelines bot commented Apr 27, 2022

bingwang-ms commented Apr 27, 2022

azure-pipelines bot commented Apr 27, 2022

bingwang-ms commented Mar 21, 2022 •

edited

Loading