tests: add enhanced packet counter verification

[vpp.git] / test / util.py

diff --git a/test/util.py b/test/util.py
index e21fdb8..653b667 100644 (file)
--- a/test/util.py
+++ b/test/util.py
@@ -1,12 +1,11 @@
 """ test framework utilities """
 
-import abc
 import ipaddress
 import logging
 import socket
 from socket import AF_INET6
-import sys
 import os.path
+from copy import deepcopy
 
 import scapy.compat
 from scapy.layers.l2 import Ether
@@ -452,3 +451,50 @@ def reassemble4_ether(listoffragments):
 
 def reassemble4(listoffragments):
     return reassemble4_core(listoffragments, True)
+
+
+def recursive_dict_merge(dict_base, dict_update):
+    """Recursively merge base dict with update dict, return merged dict"""
+    for key in dict_update:
+        if key in dict_base:
+            if type(dict_update[key]) is dict:
+                dict_base[key] = recursive_dict_merge(dict_base[key],
+                                                      dict_update[key])
+            else:
+                dict_base[key] = dict_update[key]
+        else:
+            dict_base[key] = dict_update[key]
+    return dict_base
+
+
+class StatsDiff:
+    """
+    Diff dictionary is a dictionary of dictionaries of interesting stats:
+
+        diff_dictionary =
+        {
+            "err" : { '/error/counter1' : 4, },
+            sw_if_index1 : { '/stat/segment/counter1' : 5,
+                             '/stat/segment/counter2' : 6,
+                           },
+            sw_if_index2 : { '/stat/segment/counter1' : 7,
+                           },
+        }
+
+    It describes a per sw-if-index diffset, where each key is stat segment
+    path and value is the expected change for that counter for sw-if-index.
+    Special case string "err" is used for error counters, which are not per
+    sw-if-index.
+    """
+
+    def __init__(self, stats_diff={}):
+        self.stats_diff = stats_diff
+
+    def update(self, sw_if_index, key, value):
+        if sw_if_index in self.stats_diff:
+            self.stats_diff[sw_if_index][key] = value
+        else:
+            self.stats_diff[sw_if_index] = {key: value}
+
+    def __or__(self, other):
+        return recursive_dict_merge(deepcopy(self.stats_diff), other)