X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=test%2Fframework.py;fp=test%2Fframework.py;h=f0d916fd9a60eeaae698c8639280b53030f22c53;hp=73da515064afbcbecca2a71d3af4604c2dcd271a;hb=107ad73e1be0b95f72b68c06f22d4e94ea841181;hpb=140af1559e603d319806d1e580a4dc1f5debfb07 diff --git a/test/framework.py b/test/framework.py index 73da515064a..f0d916fd9a6 100644 --- a/test/framework.py +++ b/test/framework.py @@ -1195,7 +1195,7 @@ class VppTestCase(CPUInterface, unittest.TestCase): if pkt.haslayer(ICMPv6EchoReply): self.assert_checksum_valid(pkt, 'ICMPv6EchoReply', 'cksum') - def get_packet_counter(self, counter): + def get_counter(self, counter): if counter.startswith("/"): counter_value = self.statistics.get_counter(counter) else: @@ -1208,8 +1208,17 @@ class VppTestCase(CPUInterface, unittest.TestCase): break return counter_value + def assert_counter_equal(self, counter, expected_value, + thread=None, index=0): + c = self.get_counter(counter) + if thread is not None: + c = c[thread][index] + else: + c = sum(x[index] for x in c) + self.assert_equal(c, expected_value, "counter `%s'" % counter) + def assert_packet_counter_equal(self, counter, expected_value): - counter_value = self.get_packet_counter(counter) + counter_value = self.get_counter(counter) self.assert_equal(counter_value, expected_value, "packet counter `%s'" % counter)