Update db_migrator to support PORT_QOS_MAP|global
#2205
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: bingwang <wang.bing@microsoft.com>
bingwang-ms
added
Cherry Pick Conflict_202205
Request for 202205 Branch
and removed
Cherry Pick Conflict_202205
labels
stephenxs
suggested changes
Jul 5, 2022
neethajohn
reviewed
Jul 14, 2022
neethajohn
previously approved these changes
Jul 15, 2022
|
@stephenxs, please take a final look |
prsunny
reviewed
Jul 15, 2022
scripts/db_migrator.py
Outdated
| @@ -725,6 +742,8 @@ def common_migration_ops(self): | |||
| self.migrate_mgmt_ports_on_s6100() | |||
| else: | |||
| log.log_notice("Asic Type: {}, Hwsku: {}".format(self.asic_type, self.hwsku)) | |||
|
|
|||
| self.migrate_port_qos_map_global() | |||
There was a problem hiding this comment.
why is this in the common migration path? I thought it should be based on a version.
There was a problem hiding this comment.
Updated. Please take a look. Thanks
stephenxs
previously approved these changes
Jul 16, 2022
LGTM. Approved. |
prsunny
approved these changes
Jul 26, 2022
neethajohn
approved these changes
Jul 26, 2022
yxieca
pushed a commit
that referenced
this pull request
Jul 28, 2022
Signed-off-by: bingwang <wang.bing@microsoft.com> What I did This PR is to update the db_migrator to support generation of PORT_QOS_MAP|global. After PR sonic-net/sonic-buildimage#10565, there will be two DSCP_TO_TC_MAP DSCP_TO_TC_MAP|AZURE is the default map, which is used at port level and switch level DSCP_TO_TC_MAP|AZURE_TUNNEL is used to remap the priority of tunnel traffic in dualtor deployment To address the issue, an entry PORT_QOS_MAP|global will be added into config_db "PORT_QOS_MAP": { "global": { "dscp_to_tc_map": "AZURE" } } To handle the upgrade from older image, db_migrator is updated to generate the entry. There is no way to check if PORT_QOS_MAP|global is supported, so the migration is ran on all platforms. There is check in sonic-swss to check the switch capability code, so it will not cause issue. How I did it Update db_migrator to add a common migration step. How to verify it Verified by vstest
preetham-singh
pushed a commit
to preetham-singh/sonic-utilities
that referenced
this pull request
Nov 21, 2022
Signed-off-by: bingwang <wang.bing@microsoft.com> What I did This PR is to update the db_migrator to support generation of PORT_QOS_MAP|global. After PR sonic-net/sonic-buildimage#10565, there will be two DSCP_TO_TC_MAP DSCP_TO_TC_MAP|AZURE is the default map, which is used at port level and switch level DSCP_TO_TC_MAP|AZURE_TUNNEL is used to remap the priority of tunnel traffic in dualtor deployment To address the issue, an entry PORT_QOS_MAP|global will be added into config_db "PORT_QOS_MAP": { "global": { "dscp_to_tc_map": "AZURE" } } To handle the upgrade from older image, db_migrator is updated to generate the entry. There is no way to check if PORT_QOS_MAP|global is supported, so the migration is ran on all platforms. There is check in sonic-swss to check the switch capability code, so it will not cause issue. How I did it Update db_migrator to add a common migration step. How to verify it Verified by vstest
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: bingwang wang.bing@microsoft.com
What I did
This PR is to update the
db_migratorto support generation ofPORT_QOS_MAP|global.After PR sonic-net/sonic-buildimage#10565, there will be two DSCP_TO_TC_MAP
To address the issue, an entry
PORT_QOS_MAP|globalwill be added intoconfig_dbTo handle the upgrade from older image,
db_migratoris updated to generate the entry.There is no way to check if
PORT_QOS_MAP|globalis supported, so the migration is ran on all platforms. There is check insonic-swssto check the switch capability code, so it will not cause issue.How I did it
Update
db_migratorto add a common migration step.How to verify it
Verified by vstest
Previous command output (if the output of a command-line utility has changed)
New command output (if the output of a command-line utility has changed)