Skip to content

Commit dd42f31

Browse files
authored
Fix for test_transceiver_info (#4963)
What is the motivation for this PR? In test_transceiver_info the key of hardware_rev has been changed to vendor_rev. According to these PRs(sonic-net/sonic-platform-daemons#231, sonic-net/sonic-utilities#1950), now only master branch support the key of vendor_rev. So, for other branches it still keeps the key of hardware_rev. How did you do it? For latest master release, use "vendor_rev" as transceiver info key. For release in ["201911", "202012", "202106", "202111"], use "hardware_rev" as transceiver info key. How did you verify/test it? Run test_transceiver_info on different branches, for example: master, 202012.
1 parent d5e7677 commit dd42f31

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

tests/snmp/test_snmp_phy_entity.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,12 @@ def test_transceiver_info(duthosts, enum_rand_one_per_hwsku_hostname, snmp_physi
501501
for oid, values in snmp_physical_entity_info.items():
502502
values['oid'] = oid
503503
name_to_snmp_facts[values['entPhysName']] = values
504+
505+
transceiver_rev_key = "vendor_rev"
506+
release_list = ["201911", "202012", "202106", "202111"]
507+
if any(release in duthost.os_version for release in release_list):
508+
transceiver_rev_key = "hardware_rev"
509+
504510
for key in keys:
505511
name = key.split(TABLE_NAME_SEPARATOR_VBAR)[-1]
506512
assert name in name_to_snmp_facts, 'Cannot find port {} in physical entity mib'.format(name)
@@ -511,7 +517,7 @@ def test_transceiver_info(duthosts, enum_rand_one_per_hwsku_hostname, snmp_physi
511517
assert transceiver_snmp_fact['entPhysClass'] == PHYSICAL_CLASS_PORT
512518
assert transceiver_snmp_fact['entPhyParentRelPos'] == -1
513519
assert transceiver_snmp_fact['entPhysName'] == name
514-
assert transceiver_snmp_fact['entPhysHwVer'] == transceiver_info['vendor_rev']
520+
assert transceiver_snmp_fact['entPhysHwVer'] == transceiver_info[transceiver_rev_key]
515521
assert transceiver_snmp_fact['entPhysFwVer'] == ''
516522
assert transceiver_snmp_fact['entPhysSwVer'] == ''
517523
assert transceiver_snmp_fact['entPhysSerialNum'] == transceiver_info['serial']

0 commit comments

Comments
 (0)