Skip to content

Commit d1ca905

Browse files
ryanzhu706ryanzhu706
authored
Update DB version to 202411 on master branch. (#3414)
* Update DB version to 202411 on master branch.
1 parent f2b7621 commit d1ca905

File tree

2 files changed

+35
-24
lines changed

2 files changed

+35
-24
lines changed

‎scripts/db_migrator.py

+11-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(self, namespace, socket=None):
5858
none-zero values.
5959
build: sequentially increase within a minor version domain.
6060
"""
61-
self.CURRENT_VERSION = 'version_202405_01'
61+
self.CURRENT_VERSION = 'version_202411_01'
6262

6363
self.TABLE_NAME = 'VERSIONS'
6464
self.TABLE_KEY = 'DATABASE'
@@ -1228,10 +1228,18 @@ def version_202311_03(self):
12281228

12291229
def version_202405_01(self):
12301230
"""
1231-
Version 202405_01, this version should be the final version for
1232-
master branch until 202405 branch is created.
1231+
Version 202405_01.
12331232
"""
12341233
log.log_info('Handling version_202405_01')
1234+
self.set_version('version_202411_01')
1235+
return 'version_202411_01'
1236+
1237+
def version_202411_01(self):
1238+
"""
1239+
Version 202411_01, this version should be the final version for
1240+
master branch until 202411 branch is created.
1241+
"""
1242+
log.log_info('Handling version_202411_01')
12351243
return None
12361244

12371245
def get_version(self):

‎tests/db_migrator_test.py

+24-21
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,27 @@ class TestVersionComparison(object):
7474
def setup_class(cls):
7575
cls.version_comp_list = [
7676
# Old format v.s old format
77-
{ 'v1' : 'version_1_0_1', 'v2' : 'version_1_0_2', 'result' : False },
78-
{ 'v1' : 'version_1_0_2', 'v2' : 'version_1_0_1', 'result' : True },
79-
{ 'v1' : 'version_1_0_1', 'v2' : 'version_2_0_1', 'result' : False },
80-
{ 'v1' : 'version_2_0_1', 'v2' : 'version_1_0_1', 'result' : True },
77+
{'v1': 'version_1_0_1', 'v2': 'version_1_0_2', 'result': False},
78+
{'v1': 'version_1_0_2', 'v2': 'version_1_0_1', 'result': True},
79+
{'v1': 'version_1_0_1', 'v2': 'version_2_0_1', 'result': False},
80+
{'v1': 'version_2_0_1', 'v2': 'version_1_0_1', 'result': True},
8181
# New format v.s old format
82-
{ 'v1' : 'version_1_0_1', 'v2' : 'version_202311_01', 'result' : False },
83-
{ 'v1' : 'version_202311_01', 'v2' : 'version_1_0_1', 'result' : True },
84-
{ 'v1' : 'version_1_0_1', 'v2' : 'version_master_01', 'result' : False },
85-
{ 'v1' : 'version_master_01', 'v2' : 'version_1_0_1', 'result' : True },
82+
{'v1': 'version_1_0_1', 'v2': 'version_202311_01', 'result': False},
83+
{'v1': 'version_202311_01', 'v2': 'version_1_0_1', 'result': True},
84+
{'v1': 'version_1_0_1', 'v2': 'version_master_01', 'result': False},
85+
{'v1': 'version_master_01', 'v2': 'version_1_0_1', 'result': True},
8686
# New format v.s new format
87-
{ 'v1' : 'version_202311_01', 'v2' : 'version_202311_02', 'result' : False },
88-
{ 'v1' : 'version_202311_02', 'v2' : 'version_202311_01', 'result' : True },
89-
{ 'v1' : 'version_202305_01', 'v2' : 'version_202311_01', 'result' : False },
90-
{ 'v1' : 'version_202311_01', 'v2' : 'version_202305_01', 'result' : True },
91-
{ 'v1' : 'version_202311_01', 'v2' : 'version_master_01', 'result' : False },
92-
{ 'v1' : 'version_master_01', 'v2' : 'version_202311_01', 'result' : True },
93-
{ 'v1' : 'version_master_01', 'v2' : 'version_master_02', 'result' : False },
94-
{ 'v1' : 'version_master_02', 'v2' : 'version_master_01', 'result' : True },
87+
{'v1': 'version_202311_01', 'v2': 'version_202311_02', 'result': False},
88+
{'v1': 'version_202311_02', 'v2': 'version_202311_01', 'result': True},
89+
{'v1': 'version_202305_01', 'v2': 'version_202311_01', 'result': False},
90+
{'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},
94+
{'v1': 'version_202311_01', 'v2': 'version_master_01', 'result': False},
95+
{'v1': 'version_master_01', 'v2': 'version_202311_01', 'result': True},
96+
{'v1': 'version_master_01', 'v2': 'version_master_02', 'result': False},
97+
{'v1': 'version_master_02', 'v2': 'version_master_01', 'result': True},
9598
]
9699

97100
def test_version_comparison(self):
@@ -383,7 +386,7 @@ def test_dns_nameserver_migrator(self):
383386
dbmgtr.migrate()
384387
dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'dns-nameserver-expected')
385388
expected_db = Db()
386-
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202405_01')
389+
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_01')
387390
resulting_keys = dbmgtr.configDB.keys(dbmgtr.configDB.CONFIG_DB, 'DNS_NAMESERVER*')
388391
expected_keys = expected_db.cfgdb.keys(expected_db.cfgdb.CONFIG_DB, 'DNS_NAMESERVER*')
389392

@@ -895,15 +898,15 @@ def test_init(self, mock_args):
895898
@mock.patch('swsscommon.swsscommon.SonicDBConfig.isInit', mock.MagicMock(return_value=False))
896899
@mock.patch('swsscommon.swsscommon.SonicDBConfig.initialize', mock.MagicMock())
897900
def test_init_no_namespace(self, mock_args):
898-
mock_args.return_value=argparse.Namespace(namespace=None, operation='version_202405_01', socket=None)
901+
mock_args.return_value = argparse.Namespace(namespace=None, operation='version_202411_01', socket=None)
899902
import db_migrator
900903
db_migrator.main()
901904

902905
@mock.patch('argparse.ArgumentParser.parse_args')
903906
@mock.patch('swsscommon.swsscommon.SonicDBConfig.isGlobalInit', mock.MagicMock(return_value=False))
904907
@mock.patch('swsscommon.swsscommon.SonicDBConfig.initializeGlobalConfig', mock.MagicMock())
905908
def test_init_namespace(self, mock_args):
906-
mock_args.return_value=argparse.Namespace(namespace="asic0", operation='version_202405_01', socket=None)
909+
mock_args.return_value = argparse.Namespace(namespace="asic0", operation='version_202411_01', socket=None)
907910
import db_migrator
908911
db_migrator.main()
909912

@@ -940,7 +943,7 @@ def test_dns_nameserver_migrator_minigraph(self):
940943
dbmgtr.migrate()
941944
dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'gnmi-minigraph-expected')
942945
expected_db = Db()
943-
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202405_01')
946+
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_01')
944947
resulting_table = dbmgtr.configDB.get_table("GNMI")
945948
expected_table = expected_db.cfgdb.get_table("GNMI")
946949

@@ -956,7 +959,7 @@ def test_dns_nameserver_migrator_configdb(self):
956959
dbmgtr.migrate()
957960
dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'gnmi-configdb-expected')
958961
expected_db = Db()
959-
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202405_01')
962+
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_202411_01')
960963
resulting_table = dbmgtr.configDB.get_table("GNMI")
961964
expected_table = expected_db.cfgdb.get_table("GNMI")
962965

0 commit comments

Comments
 (0)