Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "ipsec: VPP-1316 calculate IP/TCP/UDP inner checksums"
[vpp.git]
/
test
/
test_ipsec_esp.py
diff --git
a/test/test_ipsec_esp.py
b/test/test_ipsec_esp.py
index
78f5150
..
15ce4a9
100644
(file)
--- a/
test/test_ipsec_esp.py
+++ b/
test/test_ipsec_esp.py
@@
-1,13
+1,11
@@
import socket
import socket
+import unittest
from scapy.layers.inet import IP, ICMP
from scapy.layers.l2 import Ether
from scapy.layers.inet import IP, ICMP
from scapy.layers.l2 import Ether
-from scapy.layers.ipsec import
*
+from scapy.layers.ipsec import
SecurityAssociation, ESP
-from framework import VppTestCase
-from vpp_ip_route import VppIpRoute
-
-from util import ppp
+from framework import VppTestCase, VppTestRunner
class TestIpsecEsp(VppTestCase):
class TestIpsecEsp(VppTestCase):
@@
-33,11
+31,11
@@
class TestIpsecEsp(VppTestCase):
TUNNEL MODE:
--- encrypt --- plain ---
TUNNEL MODE:
--- encrypt --- plain ---
- |pg0|
-------> |VPP| ------>
|pg1|
+ |pg0|
<------- |VPP| <------
|pg1|
--- --- ---
--- decrypt --- plain ---
--- --- ---
--- decrypt --- plain ---
- |pg0|
<------- |VPP| <------
|pg1|
+ |pg0|
-------> |VPP| ------>
|pg1|
--- --- ---
Note : IPv6 is not covered
--- --- ---
Note : IPv6 is not covered
@@
-105,14
+103,14
@@
class TestIpsecEsp(VppTestCase):
l_stopaddr,
r_startaddr,
r_stopaddr,
l_stopaddr,
r_startaddr,
r_stopaddr,
- protocol=
50
)
+ protocol=
socket.IPPROTO_ESP
)
cls.vapi.ipsec_spd_add_del_entry(
spd_id,
l_startaddr,
l_stopaddr,
r_startaddr,
r_stopaddr,
cls.vapi.ipsec_spd_add_del_entry(
spd_id,
l_startaddr,
l_stopaddr,
r_startaddr,
r_stopaddr,
- protocol=
50
,
+ protocol=
socket.IPPROTO_ESP
,
is_outbound=0)
l_startaddr = l_stopaddr = socket.inet_pton(
socket.AF_INET, cls.remote_pg0_lb_addr)
is_outbound=0)
l_startaddr = l_stopaddr = socket.inet_pton(
socket.AF_INET, cls.remote_pg0_lb_addr)
@@
-174,14
+172,14
@@
class TestIpsecEsp(VppTestCase):
l_stopaddr,
r_startaddr,
r_stopaddr,
l_stopaddr,
r_startaddr,
r_stopaddr,
- protocol=
50
)
+ protocol=
socket.IPPROTO_ESP
)
cls.vapi.ipsec_spd_add_del_entry(
spd_id,
l_startaddr,
l_stopaddr,
r_startaddr,
r_stopaddr,
cls.vapi.ipsec_spd_add_del_entry(
spd_id,
l_startaddr,
l_stopaddr,
r_startaddr,
r_stopaddr,
- protocol=
50
,
+ protocol=
socket.IPPROTO_ESP
,
is_outbound=0)
l_startaddr = l_stopaddr = cls.pg2.local_ip4n
r_startaddr = r_stopaddr = cls.pg2.remote_ip4n
is_outbound=0)
l_startaddr = l_stopaddr = cls.pg2.local_ip4n
r_startaddr = r_stopaddr = cls.pg2.remote_ip4n
@@
-283,7
+281,7
@@
class TestIpsecEsp(VppTestCase):
self.pg2, send_pkts, self.pg2, count=count)
# ESP TRA VPP encryption/decryption verification
for Pkts in recv_pkts:
self.pg2, send_pkts, self.pg2, count=count)
# ESP TRA VPP encryption/decryption verification
for Pkts in recv_pkts:
-
decrypt_pkt =
self.local_tra_sa.decrypt(Pkts[IP])
+ self.local_tra_sa.decrypt(Pkts[IP])
finally:
self.logger.info(self.vapi.ppcli("show error"))
self.logger.info(self.vapi.ppcli("show ipsec"))
finally:
self.logger.info(self.vapi.ppcli("show error"))
self.logger.info(self.vapi.ppcli("show ipsec"))