ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipsec: tests support python3

Browse Source 
Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: Id13da9371c71c10c12a0120ec89ba21c1ca47524
This commit is contained in:
Ole Troan
2019-10-21 20:55:13 +02:00
parent 1556b3ad7d
commit 8b76c23d57
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/template_ipsec.py
View File

@ -223,7 +223,7 @@ class TemplateIpsec(VppTestCase):
payload_size=54): payload_size=54):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) / return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IP(src=src, dst=dst) / sa.encrypt(IP(src=src, dst=dst) /
ICMP() / Raw('X' * payload_size)) ICMP() / Raw(b'X' * payload_size))
for i in range(count)] for i in range(count)]
def gen_encrypt_pkts6(self, sa, sw_intf, src, dst, count=1, def gen_encrypt_pkts6(self, sa, sw_intf, src, dst, count=1,
@ -236,7 +236,7 @@ class TemplateIpsec(VppTestCase):
def gen_pkts(self, sw_intf, src, dst, count=1, payload_size=54): def gen_pkts(self, sw_intf, src, dst, count=1, payload_size=54):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) / return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
IP(src=src, dst=dst) / ICMP() / Raw('X' * payload_size) IP(src=src, dst=dst) / ICMP() / Raw(b'X' * payload_size)
for i in range(count)] for i in range(count)]
def gen_pkts6(self, sw_intf, src, dst, count=1, payload_size=54): def gen_pkts6(self, sw_intf, src, dst, count=1, payload_size=54):
@ -812,7 +812,7 @@ class IpsecTun4(object):
pkt = (Ether(src=self.tun_if.remote_mac, dst=self.tun_if.local_mac) / pkt = (Ether(src=self.tun_if.remote_mac, dst=self.tun_if.local_mac) /
IP(src=p.remote_tun_if_host, dst=self.tun_if.local_ip4) / IP(src=p.remote_tun_if_host, dst=self.tun_if.local_ip4) /
UDP(sport=333, dport=4500) / UDP(sport=333, dport=4500) /
Raw(0xff)) Raw(b'\xff'))
self.send_and_assert_no_replies(self.tun_if, pkt*31) self.send_and_assert_no_replies(self.tun_if, pkt*31)
self.assert_error_counter_equal( self.assert_error_counter_equal(
'/err/%s/NAT Keepalive' % self.tun4_input_node, 31) '/err/%s/NAT Keepalive' % self.tun4_input_node, 31)
@ -820,7 +820,7 @@ class IpsecTun4(object):
pkt = (Ether(src=self.tun_if.remote_mac, dst=self.tun_if.local_mac) / pkt = (Ether(src=self.tun_if.remote_mac, dst=self.tun_if.local_mac) /
IP(src=p.remote_tun_if_host, dst=self.tun_if.local_ip4) / IP(src=p.remote_tun_if_host, dst=self.tun_if.local_ip4) /
UDP(sport=333, dport=4500) / UDP(sport=333, dport=4500) /
Raw(0xfe)) Raw(b'\xfe'))
self.send_and_assert_no_replies(self.tun_if, pkt*31) self.send_and_assert_no_replies(self.tun_if, pkt*31)
self.assert_error_counter_equal( self.assert_error_counter_equal(
'/err/%s/Too Short' % self.tun4_input_node, 31) '/err/%s/Too Short' % self.tun4_input_node, 31)