IP mcast: allow unicast address as a next-hop

[vpp.git] / test / test_ipsec_ah.py

diff --git a/test/test_ipsec_ah.py b/test/test_ipsec_ah.py
index 6e73241..042bb88 100644 (file)
--- a/test/test_ipsec_ah.py
+++ b/test/test_ipsec_ah.py
@@ -1,13 +1,11 @@
 import socket
+import unittest
 
 from scapy.layers.inet import IP, ICMP
-from scapy.layers.l2 import Ether
-from scapy.layers.ipsec import *
+from scapy.layers.l2 import Ether, Raw
+from scapy.layers.ipsec import SecurityAssociation, AH
 
-from framework import VppTestCase
-from vpp_ip_route import VppIpRoute
-
-from util import ppp
+from framework import VppTestCase, VppTestRunner
 
 
 class TestIpsecAh(VppTestCase):
@@ -265,7 +263,7 @@ class TestIpsecAh(VppTestCase):
             for Pkts in recv_pkts:
                 Pkts[AH].padding = Pkts[AH].icv[12:]
                 Pkts[AH].icv = Pkts[AH].icv[:12]
-                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"))
@@ -303,9 +301,8 @@ class TestIpsecAh(VppTestCase):
                 self.pg1, send_pkts, self.pg0, count=count)
             # ESP TUN VPP encryption verification
             for recv_pkt in recv_pkts:
-                recv_pkt[IP] = recv_pkt[IP] / IP(recv_pkt[AH].icv[12:])
-                recv_pkt[AH].icv = recv_pkt[AH].icv[:12]
                 decrypt_pkt = self.local_tun_sa.decrypt(recv_pkt[IP])
+                decrypt_pkt = IP(decrypt_pkt[Raw].load)
                 self.assert_equal(decrypt_pkt.src, self.remote_pg1_lb_addr)
                 self.assert_equal(decrypt_pkt.dst, self.remote_pg0_lb_addr)
         finally: