Skip to content

Conversation

@bingwang-ms
Copy link
Contributor

Signed-off-by: bingwang [email protected]

This PR is a cherry-pick of PR #1413, and resolve cherry-pick conflicts as well.

This PR add following behavior to tunnel encap and decap

Tunnel Encap:

  • SAI_TUNNEL_ATTR_ENCAP_QOS_TC_AND_COLOR_TO_DSCP_MAP for remarking the packet based on normalized TC as per port TC MAP binding
  • SAI_TUNNEL_ATTR_ENCAP_QOS_TC_TO_QUEUE_MAP for queue selection based on normalized TC as per port TC MAP binding

Tunnel Decap:

  • SAI_TUNNEL_ATTR_DECAP_QOS_DSCP_TO_TC_MAP new TC MAP can be bind'ed to the tunnel for decap. This MAP overrides port MAP if configured.
  • SAI_TUNNEL_ATTR_DECAP_QOS_TC_TO_PRIORITY_GROUP_MAP for mapping the normalized TC to priority group mainly for PFC generation.
    DSCP mode takes effect as configured for both cases.

@bingwang-ms bingwang-ms changed the title Tunnel Scoped TC MAP and Remarking [v1.7] Tunnel Scoped TC MAP and Remarking Mar 23, 2022
@rlhui
Copy link
Collaborator

rlhui commented Mar 31, 2022

@JaiOCP , please review, thx

Copy link
Contributor

@JaiOCP JaiOCP left a comment

Choose a reason for hiding this comment

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

Looks Good

@bingwang-ms
Copy link
Contributor Author

@kcudnik Could you help merge this PR? Thanks

@rlhui rlhui merged commit bfaaa0e into opencomputeproject:v1.7 Apr 1, 2022
richardyu-ms added a commit to richardyu-ms/SAI that referenced this pull request Apr 8, 2022
In order to enable the function for Tunnel Scoped TC MAP in opencomputeproject#1452, we
need to enable the tunnel related interfaces, attribute and method
tables.

Add the method sai headers files.

Test done:
make -C ./meta/

Signed-off-by: richardyu-ms <[email protected]>
richardyu-ms added a commit to richardyu-ms/SAI that referenced this pull request Apr 10, 2022
richardyu-ms added a commit to richardyu-ms/SAI that referenced this pull request Apr 11, 2022
opencomputeproject#1452,only leave TC map

Signed-off-by: richardyu-ms <[email protected]>
Signed-off-by: root <root@a3188c47ac11>
richardyu-ms added a commit to richardyu-ms/SAI that referenced this pull request Apr 11, 2022
opencomputeproject#1452,only leave TC map

Signed-off-by: richardyu-ms <[email protected]>
Signed-off-by: root <root@a3188c47ac11>
Signed-off-by: richardyu-ms <[email protected]>
richardyu-ms added a commit to richardyu-ms/SAI that referenced this pull request Apr 11, 2022
richardyu-ms added a commit to richardyu-ms/SAI that referenced this pull request Apr 11, 2022
richardyu-ms added a commit that referenced this pull request Apr 26, 2022
* revert unnecessary changes

Signed-off-by: richardyu-ms <[email protected]>

* take back two removed method for bulk operation and add keyworkds for the ipsec

Signed-off-by: richardyu-ms <[email protected]>

* remove ipsec related interfaces and attributes

Signed-off-by: richardyu-ms <[email protected]>

* Remove unnecessary change related to ECN and VxLan udp souce port in PR #1452,only leave TC map

Signed-off-by: richardyu-ms <[email protected]>

* In order to keep the enum value compatiable with latter version, add vxlan source port and ECN

Signed-off-by: richardyu-ms <[email protected]>

* Set enum values

Signed-off-by: richardyu-ms <[email protected]>

* add test to make sure the value of enum is right

Signed-off-by: richardyu-ms <[email protected]>

* refactor the testing code

Signed-off-by: richardyu-ms <[email protected]>

* remove a test method and remove a unused enum which might cause enum inconsistence between versions

Signed-off-by: richardyu-ms <[email protected]>

* remove the enum values which might cause value holes

Signed-off-by: richardyu-ms <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants