X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_mtu.py;h=57d56001ee277e1bc46a448e54058e499a9ba1a8;hb=a173a7a;hp=d6be2e2afb5c620b8c1213f7d200a4fadd30cf07;hpb=313f7e2feac232ac841ad8a9d5e21e8387514803;p=vpp.git diff --git a/test/test_mtu.py b/test/test_mtu.py index d6be2e2afb5..57d56001ee2 100644 --- a/test/test_mtu.py +++ b/test/test_mtu.py @@ -12,7 +12,8 @@ import unittest from scapy.layers.inet6 import IPv6, Ether, IP, UDP, ICMPv6PacketTooBig from scapy.layers.inet import ICMP from framework import VppTestCase, VppTestRunner -from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto +from vpp_ip import DpoProto +from vpp_ip_route import VppIpRoute, VppRoutePath from socket import AF_INET, AF_INET6, inet_pton import StringIO @@ -45,9 +46,9 @@ class TestMTU(VppTestCase): cls.create_pg_interfaces(range(2)) cls.interfaces = list(cls.pg_interfaces) - def setUp(cls): - super(TestMTU, cls).setUp() - for i in cls.interfaces: + def setUp(self): + super(TestMTU, self).setUp() + for i in self.interfaces: i.admin_up() i.config_ip4() i.config_ip6() @@ -187,16 +188,16 @@ class TestMTU(VppTestCase): p_icmp6 = ICMPv6PacketTooBig(mtu=1280, cksum=0x4c7a) icmp6_reply = (IPv6(src=self.pg0.local_ip6, dst=self.pg0.remote_ip6, - hlim=254, plen=1240) / + hlim=255, plen=1240) / p_icmp6 / p_ip6 / p_payload) icmp6_reply[2].hlim -= 1 n = icmp6_reply.__class__(str(icmp6_reply)) s = str(icmp6_reply) - icmp6_reply = s[0:1280] + icmp6_reply_str = s[0:1280] rx = self.send_and_expect(self.pg0, p6*9, self.pg0) for p in rx: - self.validate_bytes(str(p[1]), icmp6_reply) + self.validate_bytes(str(p[1]), icmp6_reply_str) # Reset MTU self.vapi.sw_interface_set_mtu(self.pg1.sw_if_index,