From a222410ca4857a1186df317d3f83b893a13323ab Mon Sep 17 00:00:00 2001 From: Ben Levi Date: Thu, 17 Apr 2025 18:35:41 +0300 Subject: [PATCH] Add version_202411_02 function --- scripts/db_migrator.py | 8 ++++++++ tests/db_migrator_test.py | 16 ++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py index f50eb9cab0..24ce0f47b5 100755 --- a/scripts/db_migrator.py +++ b/scripts/db_migrator.py @@ -1293,6 +1293,14 @@ def version_202411_01(self): Version 202411_01. """ log.log_info('Handling version_202411_01') + self.set_version('version_202411_02') + return 'version_202411_02' + + def version_202411_02(self): + """ + Version 202411_02. + """ + log.log_info('Handling version_202411_02') self.set_version('version_202505_01') return 'version_202505_01' diff --git a/tests/db_migrator_test.py b/tests/db_migrator_test.py index e0729fdd02..3cb81e09dc 100644 --- a/tests/db_migrator_test.py +++ b/tests/db_migrator_test.py @@ -88,9 +88,9 @@ def setup_class(cls): {'v1': 'version_202311_02', 'v2': 'version_202311_01', 'result': True}, {'v1': 'version_202305_01', 'v2': 'version_202311_01', 'result': False}, {'v1': 'version_202311_01', 'v2': 'version_202305_01', 'result': True}, - {'v1': 'version_202405_01', 'v2': 'version_202411_01', 'result': False}, - {'v1': 'version_202411_01', 'v2': 'version_202405_01', 'result': True}, - {'v1': 'version_202411_01', 'v2': 'version_master_01', 'result': False}, + {'v1': 'version_202405_01', 'v2': 'version_202411_02', 'result': False}, + {'v1': 'version_202411_02', 'v2': 'version_202405_01', 'result': True}, + {'v1': 'version_202411_02', 'v2': 'version_master_01', 'result': False}, {'v1': 'version_202311_01', 'v2': 'version_master_01', 'result': False}, {'v1': 'version_master_01', 'v2': 'version_202311_01', 'result': True}, {'v1': 'version_master_01', 'v2': 'version_master_02', 'result': False}, @@ -386,7 +386,7 @@ def test_dns_nameserver_migrator(self): dbmgtr.migrate() dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'dns-nameserver-expected') expected_db = Db() - advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_01') + advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_02') resulting_keys = dbmgtr.configDB.keys(dbmgtr.configDB.CONFIG_DB, 'DNS_NAMESERVER*') expected_keys = expected_db.cfgdb.keys(expected_db.cfgdb.CONFIG_DB, 'DNS_NAMESERVER*') @@ -905,7 +905,7 @@ def test_init(self, mock_args): @mock.patch('swsscommon.swsscommon.SonicDBConfig.isInit', mock.MagicMock(return_value=False)) @mock.patch('swsscommon.swsscommon.SonicDBConfig.initialize', mock.MagicMock()) def test_init_no_namespace(self, mock_args): - mock_args.return_value = argparse.Namespace(namespace=None, operation='version_202411_01', socket=None) + mock_args.return_value = argparse.Namespace(namespace=None, operation='version_202411_02', socket=None) import db_migrator db_migrator.main() @@ -913,7 +913,7 @@ def test_init_no_namespace(self, mock_args): @mock.patch('swsscommon.swsscommon.SonicDBConfig.isGlobalInit', mock.MagicMock(return_value=False)) @mock.patch('swsscommon.swsscommon.SonicDBConfig.initializeGlobalConfig', mock.MagicMock()) def test_init_namespace(self, mock_args): - mock_args.return_value = argparse.Namespace(namespace="asic0", operation='version_202411_01', socket=None) + mock_args.return_value = argparse.Namespace(namespace="asic0", operation='version_202411_02', socket=None) import db_migrator db_migrator.main() @@ -950,7 +950,7 @@ def test_dns_nameserver_migrator_minigraph(self): dbmgtr.migrate() dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'gnmi-minigraph-expected') expected_db = Db() - advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_01') + advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_02') resulting_table = dbmgtr.configDB.get_table("GNMI") expected_table = expected_db.cfgdb.get_table("GNMI") @@ -966,7 +966,7 @@ def test_dns_nameserver_migrator_configdb(self): dbmgtr.migrate() dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'gnmi-configdb-expected') expected_db = Db() - advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_01') + advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_02') resulting_table = dbmgtr.configDB.get_table("GNMI") expected_table = expected_db.cfgdb.get_table("GNMI")