diff --git a/testdata/db_dump.json b/testdata/db_dump.json
index 88c0d5ac5..f0c26f354 100644
--- a/testdata/db_dump.json
+++ b/testdata/db_dump.json
@@ -7074,7 +7074,7 @@
 "WARM_RESTART_TABLE|l2mcmgrd":{"restore_count":"0"},
 "PORT_TABLE|Ethernet124":{"state":"ok"},
 "WARM_RESTART_TABLE|portsyncd":{"restore_count":"0"},
-"TRANSCEIVER_INFO|Ethernet4":{"type":"QSFP+ or later","hardwarerev":"E","serialnum":"APF12210014T7W","manufacturename":"Amphenol","modelname":"599690001","vendor_oui":"41-50-48","vendor_date":"2012-05-24 ","Connector":"No separable connector","encoding":"Unspecified","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP+","nominal_bit_rate":"103"},
+"TRANSCEIVER_INFO|Ethernet4":{"type":"QSFP+ or later","hardware_rev":"E","serial":"APF12210014T7W","manufacturer":"Amphenol","model":"599690001","vendor_oui":"41-50-48","vendor_date":"2012-05-24 ","connector":"No separable connector","encoding":"Unspecified","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP+","nominal_bit_rate":"103"},
 "WARM_RESTART_TABLE|syncd":{"restore_count":"0"},
 "EEPROM_INFO|0x29":{"Value":"3.23.1.3","Name":"ONIE Version","Len":"8"},
 "PORT_TABLE|Ethernet8":{"state":"ok"},
@@ -7082,15 +7082,15 @@
 "WARM_RESTART_ENABLE_TABLE|teamd":{"enable":"false"},
 "TUNNEL_CAPABILITY_TABLE|vxlan":{"state":"disable"},
 "SWITCH_CAPABILITY|switch":{"MIRROR":"true","MIRRORV6":"true"},
-"TRANSCEIVER_INFO|Ethernet8":{"type":"QSFP+ or later","hardwarerev":"D","serialnum":"APF11510011VXE","manufacturename":"Amphenol","modelname":"599690001","vendor_oui":"41-50-48","vendor_date":"2011-12-23 ","Connector":"No separable connector","encoding":"Unspecified","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP+","nominal_bit_rate":"103"},
+"TRANSCEIVER_INFO|Ethernet8":{"type":"QSFP+ or later","hardware_rev":"D","serial":"APF11510011VXE","manufacturer":"Amphenol","model":"599690001","vendor_oui":"41-50-48","vendor_date":"2011-12-23 ","connector":"No separable connector","encoding":"Unspecified","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP+","nominal_bit_rate":"103"},
 "PORT_TABLE|Ethernet88":{"state":"ok"},
 "WARM_RESTART_TABLE|natsyncd":{"restore_count":"0"},
 "EEPROM_INFO|0x21":{"Value":"Z9100ON","Name":"Product Name","Len":"7"},
 "PORT_TABLE|Ethernet56":{"state":"ok"},
 "PORT_TABLE|Ethernet96":{"state":"ok"},
-"TRANSCEIVER_INFO|Ethernet16":{"type":"QSFP28 or later","hardwarerev":"X0","serialnum":"CN07696254I451E","manufacturename":"DELL","modelname":"P7C7N","vendor_oui":"78-a7-14","vendor_date":"2015-04-22 ","Connector":"No separable connector","encoding":"64B66B","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP28","nominal_bit_rate":"255"},
+"TRANSCEIVER_INFO|Ethernet16":{"type":"QSFP28 or later","hardware_rev":"X0","serial":"CN07696254I451E","manufacturer":"DELL","model":"P7C7N","vendor_oui":"78-a7-14","vendor_date":"2015-04-22 ","connector":"No separable connector","encoding":"64B66B","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP28","nominal_bit_rate":"255"},
 "EEPROM_INFO|0x27":{"Value":"A00","Name":"Label Revision","Len":"3"},
-"TRANSCEIVER_INFO|Ethernet20":{"serialnum":"CN01M31V36Q17TF","vendor_oui":"78-a7-14","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","manufacturename":"Amphenol","type":"QSFP+ or later","vendor_date":"2013-07-03 ","type_abbrv_name":"QSFP+","ext_identifier":"Power Class 1(1.5W max)","nominal_bit_rate":"103","cable_type":"Length Cable Assembly(m)","encoding":"Unspecified","modelname":"616750000","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4', 'Fibre Channel transmission media': 'Twin Axial Pair (TW)', 'Fibre Channel link length/Transmitter Technology': 'Electrical inter-enclosure (EL)', 'Fibre Channel Speed': '1200 Mbytes/Sec'}","Connector":"No separable connector","hardwarerev":"B","cable_length":"1"},
+"TRANSCEIVER_INFO|Ethernet20":{"serial":"CN01M31V36Q17TF","vendor_oui":"78-a7-14","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","manufacturer":"Amphenol","type":"QSFP+ or later","vendor_date":"2013-07-03 ","type_abbrv_name":"QSFP+","ext_identifier":"Power Class 1(1.5W max)","nominal_bit_rate":"103","cable_type":"Length Cable Assembly(m)","encoding":"Unspecified","model":"616750000","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4', 'Fibre Channel transmission media': 'Twin Axial Pair (TW)', 'Fibre Channel link length/Transmitter Technology': 'Electrical inter-enclosure (EL)', 'Fibre Channel Speed': '1200 Mbytes/Sec'}","connector":"No separable connector","hardware_rev":"B","cable_length":"1"},
 "WARM_RESTART_ENABLE_TABLE|bgp":{"enable":"false"},
 "WARM_RESTART_TABLE|vrrpmgrd":{"restore_count":"0"},
 "PORT_TABLE|Ethernet68":{"state":"ok"},
@@ -7098,7 +7098,7 @@
 "PORT_TABLE|Ethernet92":{"state":"ok"},
 "HARDWARE_TABLE|ACCESS_LIST":{"LOOKUP_MODE":"LEGACY","COUNTER_MODE":"PER-RULE"},
 "PORT_TABLE|Ethernet76":{"state":"ok"},
-"TRANSCEIVER_INFO|Ethernet0":{"type":"QSFP+ or later","hardwarerev":"D","serialnum":"APF11490011J7E","manufacturename":"Amphenol","modelname":"599690001","vendor_oui":"41-50-48","vendor_date":"2011-12-13 ","Connector":"No separable connector","encoding":"Unspecified","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP+","nominal_bit_rate":"103"},
+"TRANSCEIVER_INFO|Ethernet0":{"type":"QSFP+ or later","hardware_rev":"D","serial":"APF11490011J7E","manufacturer":"Amphenol","model":"599690001","vendor_oui":"41-50-48","vendor_date":"2011-12-13 ","connector":"No separable connector","encoding":"Unspecified","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP+","nominal_bit_rate":"103"},
 "WARM_RESTART_TABLE|teamsyncd":{"restore_count":"0"},
 "PORT_TABLE|Ethernet60":{"state":"ok"},
 "PORT_TABLE|Ethernet108":{"state":"ok"},
@@ -7109,8 +7109,8 @@
 "TRANSCEIVER_DOM_SENSOR|Ethernet44":{"temperature":"0.0000","voltage":"0.0000","rx1power":"-inf","rx2power":"-inf","rx3power":"-inf","rx4power":"-inf","tx1bias":"0.0000","tx2bias":"0.0000","tx3bias":"0.0000","tx4bias":"0.0000","tx1power":"N/A","tx2power":"N/A","tx3power":"N/A","tx4power":"N/A","temphighalarm":"-0.0039","temphighwarning":"-0.0039","templowalarm":"-0.0039","templowwarning":"-0.0039","vcchighalarm":"6.5535","vcchighwarning":"6.5535","vcclowalarm":"6.5535","vcclowwarning":"6.5535","txpowerhighalarm":"N/A","txpowerlowalarm":"N/A","txpowerhighwarning":"N/A","txpowerlowwarning":"N/A","rxpowerhighalarm":"8.1647","rxpowerlowalarm":"8.1647","rxpowerhighwarning":"8.1647","rxpowerlowwarning":"8.1647","txbiashighalarm":"131.0700","txbiaslowalarm":"131.0700","txbiashighwarning":"131.0700","txbiaslowwarning":"131.0700"},
 "PORT_TABLE|Ethernet72":{"state":"ok"},
 "PORT_TABLE|Ethernet104":{"state":"ok"},
-"TRANSCEIVER_INFO|Ethernet44":{"serialnum":"CN01M31V4872FLK","vendor_oui":"78-a7-14","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","manufacturename":"Amphenol","type":"QSFP+ or later","vendor_date":"2014-08-09 ","type_abbrv_name":"QSFP+","ext_identifier":"Power Class 1(1.5W max)","nominal_bit_rate":"103","cable_type":"Length Cable Assembly(m)","encoding":"Unspecified","modelname":"616750000","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4', 'Fibre Channel transmission media': 'Twin Axial Pair (TW)', 'Fibre Channel link length/Transmitter Technology': 'Electrical inter-enclosure (EL)', 'Fibre Channel Speed': '1200 Mbytes/Sec'}","Connector":"No separable connector","hardwarerev":"C","cable_length":"1"},
-"TRANSCEIVER_INFO|Ethernet12":{"type":"QSFP28 or later","hardwarerev":"X0","serialnum":"CN07696254I452H","manufacturename":"DELL","modelname":"P7C7N","vendor_oui":"78-a7-14","vendor_date":"2015-04-22 ","Connector":"No separable connector","encoding":"64B66B","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP28","nominal_bit_rate":"255"},
+"TRANSCEIVER_INFO|Ethernet44":{"serial":"CN01M31V4872FLK","vendor_oui":"78-a7-14","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","manufacturer":"Amphenol","type":"QSFP+ or later","vendor_date":"2014-08-09 ","type_abbrv_name":"QSFP+","ext_identifier":"Power Class 1(1.5W max)","nominal_bit_rate":"103","cable_type":"Length Cable Assembly(m)","encoding":"Unspecified","model":"616750000","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4', 'Fibre Channel transmission media': 'Twin Axial Pair (TW)', 'Fibre Channel link length/Transmitter Technology': 'Electrical inter-enclosure (EL)', 'Fibre Channel Speed': '1200 Mbytes/Sec'}","connector":"No separable connector","hardware_rev":"C","cable_length":"1"},
+"TRANSCEIVER_INFO|Ethernet12":{"type":"QSFP28 or later","hardware_rev":"X0","serial":"CN07696254I452H","manufacturer":"DELL","model":"P7C7N","vendor_oui":"78-a7-14","vendor_date":"2015-04-22 ","connector":"No separable connector","encoding":"64B66B","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"1","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP28","nominal_bit_rate":"255"},
 "WARM_RESTART_ENABLE_TABLE|system":{"enable":"false"},
 "PORT_TABLE|Ethernet44":{"state":"ok"},
 "TRANSCEIVER_DOM_SENSOR|Ethernet24":{"temperature":"0.0000","voltage":"0.0000","rx1power":"-inf","rx2power":"-inf","rx3power":"-inf","rx4power":"-inf","tx1bias":"0.0000","tx2bias":"0.0000","tx3bias":"0.0000","tx4bias":"0.0000","tx1power":"N/A","tx2power":"N/A","tx3power":"N/A","tx4power":"N/A","temphighalarm":"-0.0039","temphighwarning":"-0.0039","templowalarm":"-0.0039","templowwarning":"-0.0039","vcchighalarm":"6.5535","vcchighwarning":"6.5535","vcclowalarm":"6.5535","vcclowwarning":"6.5535","txpowerhighalarm":"N/A","txpowerlowalarm":"N/A","txpowerhighwarning":"N/A","txpowerlowwarning":"N/A","rxpowerhighalarm":"8.1647","rxpowerlowalarm":"8.1647","rxpowerhighwarning":"8.1647","rxpowerlowwarning":"8.1647","txbiashighalarm":"131.0700","txbiaslowalarm":"131.0700","txbiashighwarning":"131.0700","txbiaslowwarning":"131.0700"},
@@ -7132,11 +7132,11 @@
 "PORT_TABLE|Ethernet48":{"state":"ok"},
 "MGMT_PORT_TABLE|eth0":{"oper_status":"up"},
 "PORT_TABLE|Ethernet4":{"state":"ok"},
-"TRANSCEIVER_INFO|Ethernet60":{"type":"QSFP28 or later","hardwarerev":"A","serialnum":"DE03CC3559G003E","manufacturename":"DELL","modelname":"3CC35","vendor_oui":"a8-b0-ae","vendor_date":"2015-09-17 ","Connector":"No separable connector","encoding":"64B66B","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"3","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP28","nominal_bit_rate":"255"},
+"TRANSCEIVER_INFO|Ethernet60":{"type":"QSFP28 or later","hardware_rev":"A","serial":"DE03CC3559G003E","manufacturer":"DELL","model":"3CC35","vendor_oui":"a8-b0-ae","vendor_date":"2015-09-17 ","connector":"No separable connector","encoding":"64B66B","ext_identifier":"Power Class 1(1.5W max)","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","cable_type":"Length Cable Assembly(m)","cable_length":"3","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4'}","type_abbrv_name":"QSFP28","nominal_bit_rate":"255"},
 "PORT_TABLE|Ethernet36":{"state":"ok"},
 "IMAGE_TABLE|SONiC-OS-sonic-rbac.0-c80bfd39":{"SONiC-OS-sonic-rbac.0-c80bfd39":"None"},
 "PORT_TABLE|Ethernet12":{"state":"ok"},
-"TRANSCEIVER_INFO|Ethernet24":{"serialnum":"CN01M31V36Q177K","vendor_oui":"78-a7-14","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","manufacturename":"Amphenol","type":"QSFP+ or later","vendor_date":"2013-07-03 ","type_abbrv_name":"QSFP+","ext_identifier":"Power Class 1(1.5W max)","nominal_bit_rate":"103","cable_type":"Length Cable Assembly(m)","encoding":"Unspecified","modelname":"616750000","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4', 'Fibre Channel transmission media': 'Twin Axial Pair (TW)', 'Fibre Channel link length/Transmitter Technology': 'Electrical inter-enclosure (EL)', 'Fibre Channel Speed': '1200 Mbytes/Sec'}","Connector":"No separable connector","hardwarerev":"B","cable_length":"1"},
+"TRANSCEIVER_INFO|Ethernet24":{"serial":"CN01M31V36Q177K","vendor_oui":"78-a7-14","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","manufacturer":"Amphenol","type":"QSFP+ or later","vendor_date":"2013-07-03 ","type_abbrv_name":"QSFP+","ext_identifier":"Power Class 1(1.5W max)","nominal_bit_rate":"103","cable_type":"Length Cable Assembly(m)","encoding":"Unspecified","model":"616750000","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4', 'Fibre Channel transmission media': 'Twin Axial Pair (TW)', 'Fibre Channel link length/Transmitter Technology': 'Electrical inter-enclosure (EL)', 'Fibre Channel Speed': '1200 Mbytes/Sec'}","connector":"No separable connector","hardware_rev":"B","cable_length":"1"},
 "PSU_INFO|PSU 1":{"presence":"true","status":"true","output_voltage":"","output_current":"","output_power":"","model":"","mfr_id":"","fan":"PSU1_FAN1","serial":""},
 "PORT_TABLE|Ethernet40":{"state":"ok"},
 "PORT_TABLE|Ethernet100":{"state":"ok"},
@@ -7159,5 +7159,5 @@
 "EEPROM_INFO|State":{"Initialized":"1"},
 "EEPROM_INFO|TlvHeader":{"Total Length":"66","Version":"1","Id String":"TlvInfo"},
 "PORT_TABLE|Ethernet16":{"state":"ok"},
-"TRANSCEIVER_INFO|Ethernet76":{"serialnum":"CN01M31V36Q1784","vendor_oui":"78-a7-14","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","manufacturename":"Amphenol","type":"QSFP+ or later","vendor_date":"2013-07-03 ","type_abbrv_name":"QSFP+","ext_identifier":"Power Class 1(1.5W max)","nominal_bit_rate":"103","cable_type":"Length Cable Assembly(m)","encoding":"Unspecified","modelname":"616750000","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4', 'Fibre Channel transmission media': 'Twin Axial Pair (TW)', 'Fibre Channel link length/Transmitter Technology': 'Electrical inter-enclosure (EL)', 'Fibre Channel Speed': '1200 Mbytes/Sec'}","Connector":"No separable connector","hardwarerev":"B","cable_length":"1"},
-"WARM_RESTART_TABLE|vrrpsyncd":{"restore_count":"0"}}]
\ No newline at end of file
+"TRANSCEIVER_INFO|Ethernet76":{"serial":"CN01M31V36Q1784","vendor_oui":"78-a7-14","ext_rateselect_compliance":"QSFP+ Rate Select Version 1","manufacturer":"Amphenol","type":"QSFP+ or later","vendor_date":"2013-07-03 ","type_abbrv_name":"QSFP+","ext_identifier":"Power Class 1(1.5W max)","nominal_bit_rate":"103","cable_type":"Length Cable Assembly(m)","encoding":"Unspecified","model":"616750000","specification_compliance":"{'10/40G Ethernet Compliance Code': '40GBASE-CR4', 'Fibre Channel transmission media': 'Twin Axial Pair (TW)', 'Fibre Channel link length/Transmitter Technology': 'Electrical inter-enclosure (EL)', 'Fibre Channel Speed': '1200 Mbytes/Sec'}","connector":"No separable connector","hardware_rev":"B","cable_length":"1"},
+"WARM_RESTART_TABLE|vrrpsyncd":{"restore_count":"0"}}]