fib: fix ip drop path crashes

[vpp.git] / test / test_ipsec_ah.py

diff --git a/test/test_ipsec_ah.py b/test/test_ipsec_ah.py
index 190bde7..8fece50 100644 (file)
--- a/test/test_ipsec_ah.py
+++ b/test/test_ipsec_ah.py
@@ -7,7 +7,7 @@ from scapy.layers.inet6 import IPv6
 from scapy.layers.l2 import Ether
 from scapy.packet import Raw
 
-from framework import VppTestRunner
+from asfframework import VppTestRunner
 from template_ipsec import (
     TemplateIpsec,
     IpsecTra46Tests,
@@ -154,8 +154,8 @@ class ConfigIpsecAH(TemplateIpsec):
             crypt_algo_vpp_id,
             crypt_key,
             self.vpp_ah_protocol,
-            self.tun_if.local_addr[addr_type],
             self.tun_if.remote_addr[addr_type],
+            self.tun_if.local_addr[addr_type],
             tun_flags=tun_flags,
             flags=flags,
             dscp=params.dscp,
@@ -170,8 +170,8 @@ class ConfigIpsecAH(TemplateIpsec):
             crypt_algo_vpp_id,
             crypt_key,
             self.vpp_ah_protocol,
-            self.tun_if.remote_addr[addr_type],
             self.tun_if.local_addr[addr_type],
+            self.tun_if.remote_addr[addr_type],
             tun_flags=tun_flags,
             flags=flags,
             dscp=params.dscp,
@@ -208,12 +208,12 @@ class ConfigIpsecAH(TemplateIpsec):
         e1 = VppIpsecSpdEntry(
             self,
             self.tun_spd,
-            vpp_tun_sa_id,
+            scapy_tun_sa_id,
             remote_tun_if_host,
             remote_tun_if_host,
             self.pg1.remote_addr[addr_type],
             self.pg1.remote_addr[addr_type],
-            0,
+            socket.IPPROTO_RAW,
             priority=10,
             policy=e.IPSEC_API_SPD_ACTION_PROTECT,
             is_outbound=0,
@@ -221,24 +221,24 @@ class ConfigIpsecAH(TemplateIpsec):
         e2 = VppIpsecSpdEntry(
             self,
             self.tun_spd,
-            scapy_tun_sa_id,
+            vpp_tun_sa_id,
             self.pg1.remote_addr[addr_type],
             self.pg1.remote_addr[addr_type],
             remote_tun_if_host,
             remote_tun_if_host,
-            0,
+            socket.IPPROTO_RAW,
             policy=e.IPSEC_API_SPD_ACTION_PROTECT,
             priority=10,
         )
         e3 = VppIpsecSpdEntry(
             self,
             self.tun_spd,
-            vpp_tun_sa_id,
+            scapy_tun_sa_id,
             remote_tun_if_host,
             remote_tun_if_host,
             self.pg0.local_addr[addr_type],
             self.pg0.local_addr[addr_type],
-            0,
+            socket.IPPROTO_RAW,
             priority=20,
             policy=e.IPSEC_API_SPD_ACTION_PROTECT,
             is_outbound=0,
@@ -246,12 +246,12 @@ class ConfigIpsecAH(TemplateIpsec):
         e4 = VppIpsecSpdEntry(
             self,
             self.tun_spd,
-            scapy_tun_sa_id,
+            vpp_tun_sa_id,
             self.pg0.local_addr[addr_type],
             self.pg0.local_addr[addr_type],
             remote_tun_if_host,
             remote_tun_if_host,
-            0,
+            socket.IPPROTO_RAW,
             policy=e.IPSEC_API_SPD_ACTION_PROTECT,
             priority=20,
         )
@@ -336,12 +336,12 @@ class ConfigIpsecAH(TemplateIpsec):
             VppIpsecSpdEntry(
                 self,
                 self.tra_spd,
-                vpp_tra_sa_id,
+                scapy_tra_sa_id,
                 self.tra_if.local_addr[addr_type],
                 self.tra_if.local_addr[addr_type],
                 self.tra_if.remote_addr[addr_type],
                 self.tra_if.remote_addr[addr_type],
-                0,
+                socket.IPPROTO_RAW,
                 priority=10,
                 policy=e.IPSEC_API_SPD_ACTION_PROTECT,
                 is_outbound=0,
@@ -351,12 +351,12 @@ class ConfigIpsecAH(TemplateIpsec):
             VppIpsecSpdEntry(
                 self,
                 self.tra_spd,
-                scapy_tra_sa_id,
+                vpp_tra_sa_id,
                 self.tra_if.local_addr[addr_type],
                 self.tra_if.local_addr[addr_type],
                 self.tra_if.remote_addr[addr_type],
                 self.tra_if.remote_addr[addr_type],
-                0,
+                socket.IPPROTO_RAW,
                 policy=e.IPSEC_API_SPD_ACTION_PROTECT,
                 priority=10,
             )