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

tests: Re-enable ipsec tests on ARM

Browse Source 
Type: fix

* test_ipsec_tun_if_esp.TestIpsecGreTebIfEsp
* test_ipsec_esp.TestIpsecEspAll
  add keepalive messages before each algo/engine to prevent test timeout

Change-Id: I726f3f9613bab02a65e65542cee494c68176ded7
Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>
This commit is contained in:
juraj.linkes
2019-07-08 10:22:55 +02:00
committed by Neale Ranns
parent e4f9556d30
commit 1105766b8f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/test_ipsec_esp.py
View File

@ -3,7 +3,7 @@ import unittest
from scapy.layers.ipsec import ESP from scapy.layers.ipsec import ESP
from scapy.layers.inet import UDP from scapy.layers.inet import UDP
from framework import VppTestRunner, is_skip_aarch64_set, is_platform_aarch64 from framework import VppTestRunner
from template_ipsec import IpsecTra46Tests, IpsecTun46Tests, TemplateIpsec, \ from template_ipsec import IpsecTra46Tests, IpsecTun46Tests, TemplateIpsec, \
IpsecTcpTests, IpsecTun4Tests, IpsecTra4Tests, config_tra_params, \ IpsecTcpTests, IpsecTun4Tests, IpsecTra4Tests, config_tra_params, \
IPsecIPv4Params, IPsecIPv6Params, \ IPsecIPv4Params, IPsecIPv6Params, \
@ -352,8 +352,6 @@ class TestIpsecEspUdp(TemplateIpsecEspUdp, IpsecTra4Tests):
pass pass
@unittest.skipIf(is_skip_aarch64_set and is_platform_aarch64,
"test doesn't work on aarch64")
class TestIpsecEspAll(ConfigIpsecESP, class TestIpsecEspAll(ConfigIpsecESP,
IpsecTra4, IpsecTra6, IpsecTra4, IpsecTra6,
IpsecTun4, IpsecTun6): IpsecTun4, IpsecTun6):
@ -464,6 +462,8 @@ class TestIpsecEspAll(ConfigIpsecESP,
p.salt = algo['salt'] p.salt = algo['salt']
p.flags = p.flags | flag p.flags = p.flags | flag
self.reporter.send_keep_alive(self)
# #
# configure the SPDs. SAs, etc # configure the SPDs. SAs, etc
# #

4
test/test_ipsec_tun_if_esp.py
View File

@ -6,7 +6,7 @@ from scapy.layers.ipsec import ESP
from scapy.layers.l2 import Ether, Raw, GRE from scapy.layers.l2 import Ether, Raw, GRE
from scapy.layers.inet import IP, UDP from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import IPv6 from scapy.layers.inet6 import IPv6
from framework import VppTestRunner, is_skip_aarch64_set, is_platform_aarch64 from framework import VppTestRunner
from template_ipsec import TemplateIpsec, IpsecTun4Tests, IpsecTun6Tests, \ from template_ipsec import TemplateIpsec, IpsecTun4Tests, IpsecTun6Tests, \
IpsecTun4, IpsecTun6, IpsecTcpTests, config_tun_params IpsecTun4, IpsecTun6, IpsecTcpTests, config_tun_params
from vpp_ipsec_tun_interface import VppIpsecTunInterface from vpp_ipsec_tun_interface import VppIpsecTunInterface
@ -450,8 +450,6 @@ class TestIpsec6MultiTunIfEsp(TemplateIpsec, IpsecTun6):
self.assertEqual(c['packets'], 127) self.assertEqual(c['packets'], 127)
@unittest.skipIf(is_skip_aarch64_set and is_platform_aarch64,
"test doesn't work on aarch64")
class TestIpsecGreTebIfEsp(TemplateIpsec, class TestIpsecGreTebIfEsp(TemplateIpsec,
IpsecTun4Tests): IpsecTun4Tests):
""" Ipsec GRE TEB ESP - TUN tests """ """ Ipsec GRE TEB ESP - TUN tests """