Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 5 commits into from
Jun 1, 2022
Merged

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

merged 5 commits into from
Jun 1, 2022

Conversation

bingwang-ms
Copy link
Contributor

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

What I did
This PR is to cherry-pick #2190 into 202012 branch after resolving conflicts.

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 --pdb --dvsname=vs
========================================================================================= test session starts =========================================================================================
platform linux -- Python 3.7.5, pytest-7.1.1, pluggy-1.0.0
rootdir: /home/bingwang/work/sonic/sonic-buildimage-202012/src/sonic-swss/tests
collected 27 items                                                                                                                                                                                    

test_mux.py ...........................                                                                                                                                                         [100%]

sudo pytest test_tunnel.py --pdb --dvsname=vs
========================================================================================= test session starts =========================================================================================
platform linux -- Python 3.7.5, pytest-7.1.1, pluggy-1.0.0
rootdir: /home/bingwang/work/sonic/sonic-buildimage-202012/src/sonic-swss/tests
collected 6 items                                                                                                                                                                                     

test_tunnel.py ......                                                                                                                                                                           [100%]

System test is work in progress.

Details if related

bingwang-ms and others added 3 commits April 27, 2022 03:22
@bingwang-ms
Support tunnel traffic QoS remapping
8877663 
Signed-off-by: bingwang <bingwang@microsoft.com>
@bingwang-ms
Fix build error
04933ce 
Signed-off-by: bingwang <bingwang@microsoft.com>
@bingwang-ms
Fix vstest
7b6eda8 
Signed-off-by: bingwang <wang.bing@microsoft.com>
@bingwang-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

bingwang-ms and others added 2 commits May 9, 2022 12:22
@bingwang-ms
Improve retry logic
9ad4f7b 
Signed-off-by: bingwang <wang.bing@microsoft.com>
@bingwang-ms
Fix bug in remove tunnel term
47914af 
Signed-off-by: bingwang <bingwang@microsoft.com>
@lgtm-com
Copy link

lgtm-com bot commented May 9, 2022

This pull request introduces 2 alerts when merging 47914af into cfed8c7 - view on LGTM.com

new alerts:

  • 2 for Comparison result is always the same

@bingwang-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@neethajohn neethajohn requested a review from prsunny May 31, 2022 23:50
neethajohn
neethajohn reviewed May 31, 2022
View reviewed changes
orchagent/qosorch.cpp
@@ -246,7 +251,7 @@ sai_object_id_t DscpToTcMapHandler::addQosItem(const vector<sai_attribute_t> &at
}
SWSS_LOG_DEBUG("created QosMap object:%" PRIx64, sai_object);

applyDscpToTcMapToSwitch(SAI_SWITCH_ATTR_QOS_DSCP_TO_TC_MAP, sai_object);
//applyDscpToTcMapToSwitch(SAI_SWITCH_ATTR_QOS_DSCP_TO_TC_MAP, sai_object);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if pcbb is not enabled, we need this function

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. If pcbb is enabled, do we need to set SAI_TUNNEL_ATTR_DECAP_QOS_DSCP_TO_TC_MAP for other IPinIP tunnel except for Mux tunnel?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will merge this PR for now, and fix this issue in another PR.

@bingwang-ms bingwang-ms merged commit ab675b3 into sonic-net:202012 Jun 1, 2022
@bingwang-ms bingwang-ms mentioned this pull request Jun 6, 2022
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neethajohn neethajohn neethajohn left review comments

@prsunny prsunny prsunny approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bingwang-ms @prsunny @neethajohn