X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ipip.py;h=efaaf52539eba8c19c3dc4a2eb6a2806c302585f;hb=58492a83722caf1c49977d73abf931418ce1f8f2;hp=5754bd0366b85f11c61e06bd6c9785e135051879;hpb=732021070fa0c731896ab3e29f802d3834c72ab7;p=vpp.git diff --git a/test/test_ipip.py b/test/test_ipip.py index 5754bd0366b..efaaf52539e 100644 --- a/test/test_ipip.py +++ b/test/test_ipip.py @@ -5,7 +5,8 @@ import unittest from scapy.layers.inet6 import IPv6, Ether, IP, UDP from scapy.all import fragment, RandShort from framework import VppTestCase, VppTestRunner -from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto, VppIpTable +from vpp_ip import DpoProto +from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable from socket import AF_INET, AF_INET6, inet_pton import StringIO @@ -144,9 +145,9 @@ class TestIPIP(VppTestCase): for p in rx: self.validate(p[1], p4_reply) - err = '/err/ipip4-input/packets decapsulated' - cnt = self.statistics.dump_str(err) - self.assertEqual(cnt[err], 10) + err = self.statistics.get_counter( + '/err/ipip4-input/packets decapsulated') + self.assertEqual(err, 10) # IPv4 tunnel to IPv6 p_ip6 = IPv6(src="1:2:3::4", dst=self.pg0.remote_ip6) @@ -158,8 +159,9 @@ class TestIPIP(VppTestCase): for p in rx: self.validate(p[1], p6_reply) - cnt = self.statistics.dump_str(err) - self.assertEqual(cnt[err], 20) + err = self.statistics.get_counter( + '/err/ipip4-input/packets decapsulated') + self.assertEqual(err, 20) # # Fragmentation / Reassembly and Re-fragmentation @@ -181,8 +183,9 @@ class TestIPIP(VppTestCase): for p in rx: self.validate(p[1], p4_reply) - cnt = self.statistics.dump_str(err) - self.assertEqual(cnt[err], 1020) + err = self.statistics.get_counter( + '/err/ipip4-input/packets decapsulated') + self.assertEqual(err, 1020) f = [] r = []