[db_migrator] Set correct CURRENT_VERSION, extend UT#2895
Merged
vaibhavhd merged 1 commit intosonic-net:masterfrom Jul 6, 2023
Merged
Conversation
Signed-off-by: vadymhlushko-mlnx <[email protected]>
vaibhavhd
reviewed
Jul 6, 2023
| expected_db = self.mock_dedicated_config_db(db_after_migrate) | ||
| assert not self.check_config_db(dbmgtr.configDB, expected_db.cfgdb) No newline at end of file | ||
| assert not self.check_config_db(dbmgtr.configDB, expected_db.cfgdb) | ||
| assert dbmgtr.CURRENT_VERSION == expected_db.cfgdb.get_entry('VERSIONS', 'DATABASE')['VERSION'] No newline at end of file |
Contributor
There was a problem hiding this comment.
I think we need a dedicated test just for checking this assertion.
My goal is to use UT to always catch the issue that this PR is addressing -- missing update to CURRENT_VERSION
Contributor
Author
There was a problem hiding this comment.
I don't see how to achieve that, because not every UT mocks the config_db with a VERSIONS key
Contributor
There was a problem hiding this comment.
I see. May be we should always verify this assertion in the new UTs that we add. Specifically, in the changes where new version is introduced.
We can have that conversation later, let's take this bug fix for now.
vaibhavhd
approved these changes
Jul 6, 2023
Contributor
|
MSFT ADO : 24471596 |
dgsudharsan
added a commit
to dgsudharsan/sonic-buildimage
that referenced
this pull request
Jul 11, 2023
Update sonic-utilities submodule pointer to include the following: * ff380e0 [hash]: Implement GH frontend ([sonic-net#2580](sonic-net/sonic-utilities#2580)) * 61bad06 [db_migrator] Set correct CURRENT_VERSION, extend UT ([sonic-net#2895](sonic-net/sonic-utilities#2895)) * 6b8ee47 [CLI][Show][BGP] Show BGP Change for no neighbor scenario ([sonic-net#2885](sonic-net/sonic-utilities#2885)) * 73d8d63 [doc] Update Command-Reference.md, change show bgp peer command to show bfd peer ([sonic-net#2750](sonic-net/sonic-utilities#2750)) * 7bc08c2 [db_migrator] Remove hardcoded config and migrate config from minigraph ([sonic-net#2887](sonic-net/sonic-utilities#2887)) * b1aa942 [generate_dump]: Enhance show techsupport for Marvell platform ([sonic-net#2676](sonic-net/sonic-utilities#2676)) * 316b14c Add support for secure upgrade ([sonic-net#2698](sonic-net/sonic-utilities#2698)) * dc2945b [dns] Implement config and show commands for static DNS. ([sonic-net#2737](sonic-net/sonic-utilities#2737)) * 8414a70 [chassis][multi asic] change acl_loader to use tcp socket for db communication ([sonic-net#2525](sonic-net/sonic-utilities#2525)) * 0b629ba Revert [chassis][voq] Clear fabric counters queue/port (2789) ([sonic-net#2882](sonic-net/sonic-utilities#2882)) * 3ba8241 [db_migtrator] Add migration of FLEX_COUNTER_DELAY_STATUS during 1911->master upgrade + fast-reboot. Add UT. ([sonic-net#2839](sonic-net/sonic-utilities#2839)) * fceef2e [chassis][voq] Clear fabric counters queue/port ([sonic-net#2789](sonic-net/sonic-utilities#2789)) Signed-off-by: dgsudharsan <[email protected]>
11 tasks
liat-grozovik
pushed a commit
to sonic-net/sonic-buildimage
that referenced
this pull request
Jul 11, 2023
Update sonic-utilities submodule pointer to include the following: * ff380e0 [hash]: Implement GH frontend ([#2580](sonic-net/sonic-utilities#2580)) * 61bad06 [db_migrator] Set correct CURRENT_VERSION, extend UT ([#2895](sonic-net/sonic-utilities#2895)) * 6b8ee47 [CLI][Show][BGP] Show BGP Change for no neighbor scenario ([#2885](sonic-net/sonic-utilities#2885)) * 73d8d63 [doc] Update Command-Reference.md, change show bgp peer command to show bfd peer ([#2750](sonic-net/sonic-utilities#2750)) * 7bc08c2 [db_migrator] Remove hardcoded config and migrate config from minigraph ([#2887](sonic-net/sonic-utilities#2887)) * b1aa942 [generate_dump]: Enhance show techsupport for Marvell platform ([#2676](sonic-net/sonic-utilities#2676)) * 316b14c Add support for secure upgrade ([#2698](sonic-net/sonic-utilities#2698)) * dc2945b [dns] Implement config and show commands for static DNS. ([#2737](sonic-net/sonic-utilities#2737)) * 8414a70 [chassis][multi asic] change acl_loader to use tcp socket for db communication ([#2525](sonic-net/sonic-utilities#2525)) * 0b629ba Revert [chassis][voq] Clear fabric counters queue/port (2789) ([#2882](sonic-net/sonic-utilities#2882)) * 3ba8241 [db_migtrator] Add migration of FLEX_COUNTER_DELAY_STATUS during 1911->master upgrade + fast-reboot. Add UT. ([#2839](sonic-net/sonic-utilities#2839)) * fceef2e [chassis][voq] Clear fabric counters queue/port ([#2789](sonic-net/sonic-utilities#2789)) Signed-off-by: dgsudharsan <[email protected]>
Contributor
|
@StormLiangMS Please help cherry-pick this PR to |
StormLiangMS
pushed a commit
that referenced
this pull request
Aug 14, 2023
Signed-off-by: vadymhlushko-mlnx <[email protected]> What I did Set the correct value for the db_migrator class variable CURRENT_VERSION, because if the new DB version was introduced the CURRENT_VERSION variable should have the newest version value. How I did it Edit the db_migrator.py. How to verify it Extend existing UT.
pdhruv-marvell
pushed a commit
to pdhruv-marvell/sonic-utilities
that referenced
this pull request
Aug 23, 2023
Signed-off-by: vadymhlushko-mlnx <[email protected]> What I did Set the correct value for the db_migrator class variable CURRENT_VERSION, because if the new DB version was introduced the CURRENT_VERSION variable should have the newest version value. How I did it Edit the db_migrator.py. How to verify it Extend existing UT.
sonic-otn
pushed a commit
to sonic-otn/sonic-buildimage
that referenced
this pull request
Sep 20, 2023
Update sonic-utilities submodule pointer to include the following: * ff380e0 [hash]: Implement GH frontend ([sonic-net#2580](sonic-net/sonic-utilities#2580)) * 61bad06 [db_migrator] Set correct CURRENT_VERSION, extend UT ([sonic-net#2895](sonic-net/sonic-utilities#2895)) * 6b8ee47 [CLI][Show][BGP] Show BGP Change for no neighbor scenario ([sonic-net#2885](sonic-net/sonic-utilities#2885)) * 73d8d63 [doc] Update Command-Reference.md, change show bgp peer command to show bfd peer ([sonic-net#2750](sonic-net/sonic-utilities#2750)) * 7bc08c2 [db_migrator] Remove hardcoded config and migrate config from minigraph ([sonic-net#2887](sonic-net/sonic-utilities#2887)) * b1aa942 [generate_dump]: Enhance show techsupport for Marvell platform ([sonic-net#2676](sonic-net/sonic-utilities#2676)) * 316b14c Add support for secure upgrade ([sonic-net#2698](sonic-net/sonic-utilities#2698)) * dc2945b [dns] Implement config and show commands for static DNS. ([sonic-net#2737](sonic-net/sonic-utilities#2737)) * 8414a70 [chassis][multi asic] change acl_loader to use tcp socket for db communication ([sonic-net#2525](sonic-net/sonic-utilities#2525)) * 0b629ba Revert [chassis][voq] Clear fabric counters queue/port (2789) ([sonic-net#2882](sonic-net/sonic-utilities#2882)) * 3ba8241 [db_migtrator] Add migration of FLEX_COUNTER_DELAY_STATUS during 1911->master upgrade + fast-reboot. Add UT. ([sonic-net#2839](sonic-net/sonic-utilities#2839)) * fceef2e [chassis][voq] Clear fabric counters queue/port ([sonic-net#2789](sonic-net/sonic-utilities#2789)) Signed-off-by: dgsudharsan <[email protected]>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What I did
Set the correct value for the
db_migratorclass variableCURRENT_VERSION, because if the new DB version was introduced theCURRENT_VERSIONvariable should have the newest version value.How I did it
Edit the
db_migrator.py.How to verify it
Extend existing UT.
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)