Skip to content

[201911][db_migrator] fix old 1911 feature config migration to a new schema#1655

Merged
abdosi merged 7 commits intosonic-net:201911from
stepanblyschak:fix-1911-db-mig
Jun 18, 2021
Merged

[201911][db_migrator] fix old 1911 feature config migration to a new schema#1655
abdosi merged 7 commits intosonic-net:201911from
stepanblyschak:fix-1911-db-mig

Conversation

@stepanblyschak
Copy link
Contributor

@stepanblyschak stepanblyschak commented Jun 4, 2021

Signed-off-by: Stepan Blyschak stepanb@nvidia.com

What I did

Fixed badly converted code change from master for 201911in #1637.
This PR fixes python3.5 feature usage.

How I did it

Used python2 approach.

How to verify it

Takes this script and run on switch: db_migrator.py -o migrate.

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)

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
@liat-grozovik
Copy link
Collaborator

Don't merge yet. Pending offline tests since Jenkins cheekers are not running.

@stepanblyschak stepanblyschak changed the title [201911][db_migrator] fix syntax error due to usage of python >=3.5 feature [201911][db_migrator] fix syntax error due to usage of python >=3.5 feature and fix case when VERSION is not present in DB Jun 7, 2021
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
@liat-grozovik
Copy link
Collaborator

Approved from Mellanox side. This fixes the problem seen with the prev update.
@qiluo-msft we can merge and then update the submodule. This was already verified.

@abdosi
Copy link
Contributor

abdosi commented Jun 7, 2021

please add unit-test as part of this pr.

Copy link
Contributor

@abdosi abdosi left a comment

Choose a reason for hiding this comment

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

update unit-test

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
@abdosi
Copy link
Contributor

abdosi commented Jun 7, 2021

I have reverted the PR. Please update again in this PR with unit-test

Revert "[201911][db_migrator] fix old 1911 feature config migration to
a new … (#1637)"

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
@stepanblyschak stepanblyschak changed the title [201911][db_migrator] fix syntax error due to usage of python >=3.5 feature and fix case when VERSION is not present in DB [201911][db_migrator] fix old 1911 feature config migration to a new schema Jun 7, 2021
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
@liat-grozovik
Copy link
Collaborator

@yxieca , @abdosi can you please review?

@dprital
Copy link
Collaborator

dprital commented Jun 17, 2021

@yxieca , @abdosi can you please review?

@yxieca , @abdosi - Can you please ?

@abdosi abdosi merged commit 65c12fa into sonic-net:201911 Jun 18, 2021
stepanblyschak added a commit to stepanblyschak/sonic-utilities that referenced this pull request Apr 28, 2022
[201911][db_migrator] fix old 1911 feature config migration to a new schema (sonic-net#1655)
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
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.

6 participants