diff --git a/scripts/sfpshow b/scripts/sfpshow index b0c951a185..0787688903 100755 --- a/scripts/sfpshow +++ b/scripts/sfpshow @@ -391,6 +391,7 @@ class SFPShow(object): if dump_dom: sfp_type = sfp_info_dict['type'] dom_info_dict = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_DOM_SENSOR|{}'.format(interface_name)) + dom_info_dict.update(state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_DOM_THRESHOLD|{}'.format(interface_name))) dom_output = self.convert_dom_to_output_string(sfp_type, dom_info_dict) output += dom_output else: diff --git a/tests/mock_tables/asic0/state_db.json b/tests/mock_tables/asic0/state_db.json index 8766f43d65..21b4fa0eab 100644 --- a/tests/mock_tables/asic0/state_db.json +++ b/tests/mock_tables/asic0/state_db.json @@ -31,7 +31,9 @@ "tx1power": "N/A", "tx2power": "N/A", "tx3power": "N/A", - "tx4power": "N/A", + "tx4power": "N/A" + }, + "TRANSCEIVER_DOM_THRESHOLD|Ethernet0": { "rxpowerhighalarm": "3.4001", "rxpowerhighwarning": "2.4000", "rxpowerlowalarm": "-13.5067", diff --git a/tests/mock_tables/asic1/state_db.json b/tests/mock_tables/asic1/state_db.json index f288bc1a6c..dd775b9b50 100644 --- a/tests/mock_tables/asic1/state_db.json +++ b/tests/mock_tables/asic1/state_db.json @@ -31,7 +31,9 @@ "tx1power": "N/A", "tx2power": "N/A", "tx3power": "N/A", - "tx4power": "N/A", + "tx4power": "N/A" + }, + "TRANSCEIVER_DOM_THRESHOLD|Ethernet64": { "rxpowerhighalarm": "3.4001", "rxpowerhighwarning": "2.4000", "rxpowerlowalarm": "-13.5067", diff --git a/tests/mock_tables/state_db.json b/tests/mock_tables/state_db.json index dc7e69a4fa..12552997b9 100644 --- a/tests/mock_tables/state_db.json +++ b/tests/mock_tables/state_db.json @@ -49,7 +49,9 @@ "tx1power": "N/A", "tx2power": "N/A", "tx3power": "N/A", - "tx4power": "N/A", + "tx4power": "N/A" + }, + "TRANSCEIVER_DOM_THRESHOLD|Ethernet0": { "rxpowerhighalarm": "3.4001", "rxpowerhighwarning": "2.4000", "rxpowerlowalarm": "-13.5067", @@ -111,7 +113,9 @@ "tx5power": "1.175", "tx6power": "1.175", "tx7power": "1.175", - "tx8power": "1.175", + "tx8power": "1.175" + }, + "TRANSCEIVER_DOM_THRESHOLD|Ethernet8": { "rxpowerhighalarm": "6.9999", "rxpowerhighwarning": "4.9999", "rxpowerlowalarm": "-11.9044",