Skip to content

Commit 9411196

Browse files
updated db_migrator tests
1 parent ddabf32 commit 9411196

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

scripts/db_migrator.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,9 @@ def migrate_config_db_switchport_mode(self):
469469
if pc_key in vlan_member_keys:
470470
pc_value["mode"] = "trunk"
471471
self.configDB.set_entry("PORTCHANNEL", pc_key, pc_value)
472+
else:
473+
pc_value["mode"] = "routed"
474+
self.configDB.set_entry("PORTCHANNEL", pc_key, pc_value)
472475

473476

474477
def migrate_qos_db_fieldval_reference_remove(self, table_list, db, db_num, db_delimeter):

tests/db_migrator_input/config_db/switchport-expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"mtu": "9100",
5454
"speed": "40000"
5555
},
56-
56+
5757
"VLAN|Vlan2": {
5858
"vlanid": "2"
5959
},
@@ -132,6 +132,6 @@
132132
"PORTCHANNEL_MEMBER|PortChannel0002|Ethernet28": {},
133133

134134
"VERSIONS|DATABASE": {
135-
"VERSION": "version_4_0_0"
135+
"VERSION": "version_4_0_1"
136136
}
137137
}

tests/db_migrator_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ def test_switchport_mode_migrator(self):
266266
expected_db = Db()
267267
advance_version_for_expected_database(dbmgtr.configDB, expected_db.cfgdb, 'version_4_0_1')
268268

269-
# assert dbmgtr.configDB.get_table('PORT') == expected_db.cfgdb.get_table('PORT')
270-
# assert dbmgtr.configDB.get_table('PORTCHANNEL') == expected_db.cfgdb.get_table('PORTCHANNEL')
271-
# assert dbmgtr.configDB.get_table('VERSIONS') == expected_db.cfgdb.get_table('VERSIONS')
269+
assert dbmgtr.configDB.get_table('PORT') == expected_db.cfgdb.get_table('PORT')
270+
assert dbmgtr.configDB.get_table('PORTCHANNEL') == expected_db.cfgdb.get_table('PORTCHANNEL')
271+
assert dbmgtr.configDB.get_table('VERSIONS') == expected_db.cfgdb.get_table('VERSIONS')
272272

273273
class TestInitConfigMigrator(object):
274274
@classmethod

0 commit comments

Comments
 (0)