Skip to content

Commit a222410

Browse files
committed
Add version_202411_02 function
1 parent 7cbb2f2 commit a222410

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

scripts/db_migrator.py

+8
Original file line numberDiff line numberDiff line change
@@ -1293,6 +1293,14 @@ def version_202411_01(self):
12931293
Version 202411_01.
12941294
"""
12951295
log.log_info('Handling version_202411_01')
1296+
self.set_version('version_202411_02')
1297+
return 'version_202411_02'
1298+
1299+
def version_202411_02(self):
1300+
"""
1301+
Version 202411_02.
1302+
"""
1303+
log.log_info('Handling version_202411_02')
12961304
self.set_version('version_202505_01')
12971305
return 'version_202505_01'
12981306

tests/db_migrator_test.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ def setup_class(cls):
8888
{'v1': 'version_202311_02', 'v2': 'version_202311_01', 'result': True},
8989
{'v1': 'version_202305_01', 'v2': 'version_202311_01', 'result': False},
9090
{'v1': 'version_202311_01', 'v2': 'version_202305_01', 'result': True},
91-
{'v1': 'version_202405_01', 'v2': 'version_202411_01', 'result': False},
92-
{'v1': 'version_202411_01', 'v2': 'version_202405_01', 'result': True},
93-
{'v1': 'version_202411_01', 'v2': 'version_master_01', 'result': False},
91+
{'v1': 'version_202405_01', 'v2': 'version_202411_02', 'result': False},
92+
{'v1': 'version_202411_02', 'v2': 'version_202405_01', 'result': True},
93+
{'v1': 'version_202411_02', 'v2': 'version_master_01', 'result': False},
9494
{'v1': 'version_202311_01', 'v2': 'version_master_01', 'result': False},
9595
{'v1': 'version_master_01', 'v2': 'version_202311_01', 'result': True},
9696
{'v1': 'version_master_01', 'v2': 'version_master_02', 'result': False},
@@ -386,7 +386,7 @@ def test_dns_nameserver_migrator(self):
386386
dbmgtr.migrate()
387387
dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'dns-nameserver-expected')
388388
expected_db = Db()
389-
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_01')
389+
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_02')
390390
resulting_keys = dbmgtr.configDB.keys(dbmgtr.configDB.CONFIG_DB, 'DNS_NAMESERVER*')
391391
expected_keys = expected_db.cfgdb.keys(expected_db.cfgdb.CONFIG_DB, 'DNS_NAMESERVER*')
392392

@@ -905,15 +905,15 @@ def test_init(self, mock_args):
905905
@mock.patch('swsscommon.swsscommon.SonicDBConfig.isInit', mock.MagicMock(return_value=False))
906906
@mock.patch('swsscommon.swsscommon.SonicDBConfig.initialize', mock.MagicMock())
907907
def test_init_no_namespace(self, mock_args):
908-
mock_args.return_value = argparse.Namespace(namespace=None, operation='version_202411_01', socket=None)
908+
mock_args.return_value = argparse.Namespace(namespace=None, operation='version_202411_02', socket=None)
909909
import db_migrator
910910
db_migrator.main()
911911

912912
@mock.patch('argparse.ArgumentParser.parse_args')
913913
@mock.patch('swsscommon.swsscommon.SonicDBConfig.isGlobalInit', mock.MagicMock(return_value=False))
914914
@mock.patch('swsscommon.swsscommon.SonicDBConfig.initializeGlobalConfig', mock.MagicMock())
915915
def test_init_namespace(self, mock_args):
916-
mock_args.return_value = argparse.Namespace(namespace="asic0", operation='version_202411_01', socket=None)
916+
mock_args.return_value = argparse.Namespace(namespace="asic0", operation='version_202411_02', socket=None)
917917
import db_migrator
918918
db_migrator.main()
919919

@@ -950,7 +950,7 @@ def test_dns_nameserver_migrator_minigraph(self):
950950
dbmgtr.migrate()
951951
dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'gnmi-minigraph-expected')
952952
expected_db = Db()
953-
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_01')
953+
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_02')
954954
resulting_table = dbmgtr.configDB.get_table("GNMI")
955955
expected_table = expected_db.cfgdb.get_table("GNMI")
956956

@@ -966,7 +966,7 @@ def test_dns_nameserver_migrator_configdb(self):
966966
dbmgtr.migrate()
967967
dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'gnmi-configdb-expected')
968968
expected_db = Db()
969-
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_01')
969+
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_02')
970970
resulting_table = dbmgtr.configDB.get_table("GNMI")
971971
expected_table = expected_db.cfgdb.get_table("GNMI")
972972

0 commit comments

Comments
 (0)