diff --git a/tests/mock_tables/counters_db.json b/tests/mock_tables/counters_db.json
index cedf4df27d5e..f9efd46107d4 100644
--- a/tests/mock_tables/counters_db.json
+++ b/tests/mock_tables/counters_db.json
@@ -1,5 +1,5 @@
 {
-  "COUNTERS:1000000000007": {
+  "COUNTERS:oid:0x1000000000007": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -83,7 +83,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000000a": {
+  "COUNTERS:oid:0x100000000000a": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -167,7 +167,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000020": {
+  "COUNTERS:oid:0x1000000000020": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -251,7 +251,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000021": {
+  "COUNTERS:oid:0x1000000000021": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -335,7 +335,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000022": {
+  "COUNTERS:oid:0x1000000000022": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -419,7 +419,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000000f": {
+  "COUNTERS:oid:0x100000000000f": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -503,7 +503,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000010": {
+  "COUNTERS:oid:0x1000000000010": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -587,7 +587,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000001f": {
+  "COUNTERS:oid:0x100000000001f": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -671,7 +671,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000006": {
+  "COUNTERS:oid:0x1000000000006": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -755,7 +755,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000001b": {
+  "COUNTERS:oid:0x100000000001b": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -839,7 +839,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000018": {
+  "COUNTERS:oid:0x1000000000018": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -923,7 +923,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000000b": {
+  "COUNTERS:oid:0x100000000000b": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1007,7 +1007,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000000c": {
+  "COUNTERS:oid:0x100000000000c": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1091,7 +1091,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000001c": {
+  "COUNTERS:oid:0x100000000001c": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1175,7 +1175,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000005": {
+  "COUNTERS:oid:0x1000000000005": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1259,7 +1259,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000001e": {
+  "COUNTERS:oid:0x100000000001e": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1343,7 +1343,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000001d": {
+  "COUNTERS:oid:0x100000000001d": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1427,7 +1427,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000000d": {
+  "COUNTERS:oid:0x100000000000d": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1511,7 +1511,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000000e": {
+  "COUNTERS:oid:0x100000000000e": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1595,7 +1595,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000019": {
+  "COUNTERS:oid:0x1000000000019": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1679,7 +1679,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:100000000001a": {
+  "COUNTERS:oid:0x100000000001a": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1764,40 +1764,40 @@
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
   "COUNTERS_PORT_NAME_MAP": {
-    "Ethernet8": "1000000000017",
-    "Ethernet0": "1000000000018",
-    "Ethernet4": "1000000000016",
-    "Ethernet108": "1000000000007",
-    "Ethernet100": "1000000000009",
-    "Ethernet104": "1000000000008",
-    "Ethernet96": "100000000000a",
-    "Ethernet124": "1000000000003",
-    "Ethernet120": "1000000000004",
-    "Ethernet92": "100000000000c",
-    "Ethernet28": "1000000000013",
-    "Ethernet52": "100000000001c",
-    "Ethernet56": "100000000001d",
-    "Ethernet76": "1000000000022",
-    "Ethernet72": "1000000000021",
-    "Ethernet32": "1000000000011",
-    "Ethernet16": "100000000001a",
-    "Ethernet36": "100000000000f",
-    "Ethernet12": "1000000000019",
-    "Ethernet88": "100000000000e",
-    "Ethernet24": "1000000000014",
-    "Ethernet116": "1000000000005",
-    "Ethernet80": "1000000000012",
-    "Ethernet112": "1000000000006",
-    "Ethernet84": "1000000000010",
-    "Ethernet48": "100000000001b",
-    "Ethernet44": "100000000000b",
-    "Ethernet40": "100000000000d",
-    "Ethernet64": "100000000001f",
-    "Ethernet60": "100000000001e",
-    "Ethernet20": "1000000000015",
-    "Ethernet68": "1000000000020"
+    "Ethernet8": "oid:0x1000000000017",
+    "Ethernet0": "oid:0x1000000000018",
+    "Ethernet4": "oid:0x1000000000016",
+    "Ethernet108": "oid:0x1000000000007",
+    "Ethernet100": "oid:0x1000000000009",
+    "Ethernet104": "oid:0x1000000000008",
+    "Ethernet96": "oid:0x100000000000a",
+    "Ethernet124": "oid:0x1000000000003",
+    "Ethernet120": "oid:0x1000000000004",
+    "Ethernet92": "oid:0x100000000000c",
+    "Ethernet28": "oid:0x1000000000013",
+    "Ethernet52": "oid:0x100000000001c",
+    "Ethernet56": "oid:0x100000000001d",
+    "Ethernet76": "oid:0x1000000000022",
+    "Ethernet72": "oid:0x1000000000021",
+    "Ethernet32": "oid:0x1000000000011",
+    "Ethernet16": "oid:0x100000000001a",
+    "Ethernet36": "oid:0x100000000000f",
+    "Ethernet12": "oid:0x1000000000019",
+    "Ethernet88": "oid:0x100000000000e",
+    "Ethernet24": "oid:0x1000000000014",
+    "Ethernet116": "oid:0x1000000000005",
+    "Ethernet80": "oid:0x1000000000012",
+    "Ethernet112": "oid:0x1000000000006",
+    "Ethernet84": "oid:0x1000000000010",
+    "Ethernet48": "oid:0x100000000001b",
+    "Ethernet44": "oid:0x100000000000b",
+    "Ethernet40": "oid:0x100000000000d",
+    "Ethernet64": "oid:0x100000000001f",
+    "Ethernet60": "oid:0x100000000001e",
+    "Ethernet20": "oid:0x1000000000015",
+    "Ethernet68": "oid:0x1000000000020"
   },
-  "COUNTERS:1000000000009": {
+  "COUNTERS:oid:0x1000000000009": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1881,7 +1881,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000004": {
+  "COUNTERS:oid:0x1000000000004": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -1965,7 +1965,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000008": {
+  "COUNTERS:oid:0x1000000000008": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -2049,7 +2049,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000011": {
+  "COUNTERS:oid:0x1000000000011": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -2133,7 +2133,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000003": {
+  "COUNTERS:oid:0x1000000000003": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -2217,7 +2217,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000013": {
+  "COUNTERS:oid:0x1000000000013": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -2301,7 +2301,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000012": {
+  "COUNTERS:oid:0x1000000000012": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -2385,7 +2385,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000015": {
+  "COUNTERS:oid:0x1000000000015": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -2469,7 +2469,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000014": {
+  "COUNTERS:oid:0x1000000000014": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -2553,7 +2553,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000017": {
+  "COUNTERS:oid:0x1000000000017": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",
@@ -2637,7 +2637,7 @@
     "SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0"
   },
-  "COUNTERS:1000000000016": {
+  "COUNTERS:oid:0x1000000000016": {
     "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
     "SAI_PORT_STAT_IF_OUT_ERRORS": "0",