Fix Pfc/Qos counter integer range

Signed-off-by: Qi Luo <[email protected]>

Author: qiluo-msft

src/sonic_ax_impl/mibs/vendor/cisco/ciscoPfcExtMIB.py

@@ -94,7 +94,7 @@ def _get_counter(self, oid, counter_name):
 
         try:
             counter_value = self.if_counters[sai_id][_counter_name]
-            counter_value = int(counter_value)
+            counter_value = int(counter_value) & 0x00000000ffffffff
             # done!
             return counter_value
         except KeyError as e:

src/sonic_ax_impl/mibs/vendor/cisco/ciscoSwitchQosMIB.py

@@ -197,7 +197,10 @@ def handle_stat_request(self, sub_id):
         """
         # if_index, if_direction, queue_index and counter id should be passed
 
-        return self.mib_oid_to_queue_map.get(sub_id)
+        if sub_id in self.mib_oid_to_queue_map:
+            return self.mib_oid_to_queue_map[sub_id] & 0x00000000ffffffff
+        else:
+            return None
 
 class csqIfQosGroupStatsTable(metaclass=MIBMeta, prefix='.1.3.6.1.4.1.9.9.580.1.5.5'):
     """

tests/mock_tables/counters_db.json

@@ -1104,7 +1104,7 @@
     "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0",
     "SAI_PORT_STAT_PAUSE_RX_PKTS": "0",
     "SAI_PORT_STAT_PAUSE_TX_PKTS": "0",
-    "SAI_PORT_STAT_PFC_0_RX_PKTS": "1",
+    "SAI_PORT_STAT_PFC_0_RX_PKTS": "209347219842134092490",
     "SAI_PORT_STAT_PFC_0_TX_PKTS": "1",
     "SAI_PORT_STAT_PFC_1_RX_PKTS": "2",
     "SAI_PORT_STAT_PFC_1_TX_PKTS": "2",
@@ -3351,7 +3351,7 @@
   },
   "COUNTERS:oid:0x15000000000230": {
     "SAI_QUEUE_STAT_PACKETS": "1",
-    "SAI_QUEUE_STAT_BYTES": "2",
+    "SAI_QUEUE_STAT_BYTES": "23492723984237432",
     "SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
     "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
     "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",

tests/test_pfc.py

@@ -115,7 +115,7 @@ def test_getPduRequestForPriority(self):
         value0 = response.values[0]
         self.assertEqual(value0.type_, ValueType.INTEGER)
         self.assertEqual(str(value0.name), str(oid))
-        self.assertEqual(value0.data, 1)
+        self.assertEqual(value0.data, 209347219842134092490 % pow(2, 32)) # Test integer truncation
 
     def test_getNextPduRequestForPriority(self):
         oid = ObjectIdentifier(8, 0, 0, 0, (1, 3, 6, 1, 4, 1, 9, 9, 813, 1, 2, 1, 2, 1, 2))
@@ -202,4 +202,4 @@ def test_getPfcSubtree(self):
         value0 = response.values[0]
         self.assertEqual(value0.type_, ValueType.INTEGER)
         self.assertEqual(str(value0.name), str(expected_oid))
-        self.assertEqual(value0.data, 1)
+        self.assertEqual(value0.data, 209347219842134092490 % pow(2, 32)) # Test integer truncation

tests/test_queues_stat.py

@@ -59,7 +59,7 @@ def test_getNextPduForQueueCounter(self):
         value0 = response.values[0]
         self.assertEqual(value0.type_, ValueType.INTEGER)
         self.assertEqual(str(value0.name), str(expected_oid))
-        self.assertEqual(value0.data, 2)
+        self.assertEqual(value0.data, 23492723984237432 & 0x00000000ffffffff) # Test integer truncation
 
     def test_getIngressQueueCounters(self):
         oid = ObjectIdentifier(8, 0, 0, 0, (1, 3, 6, 1, 4, 1, 9, 9, 580, 1, 5, 5, 1, 4, 1, 1, 1, 1))