4 files changed, 81 insertions, 2 deletions
diff --git a/test/test_ipsec_nat.py b/test/test_ipsec_nat.py
index e9efa032a13..7e6e1d4d912 100644
--- a/test/test_ipsec_nat.py
+++ b/test/test_ipsec_nat.py
@@ -9,7 +9,7 @@ from util import ppp, ppc
 from template_ipsec import TemplateIpsec
 
 
-class IPSecNATTestCase(TemplateIpsec):
+class TemplateIPSecNAT(TemplateIpsec):
     """ IPSec/NAT
     TUNNEL MODE:
 
@@ -33,7 +33,7 @@ class IPSecNATTestCase(TemplateIpsec):
 
     @classmethod
     def setUpClass(cls):
-        super(IPSecNATTestCase, cls).setUpClass()
+        super(TemplateIPSecNAT, cls).setUpClass()
         cls.tun_if = cls.pg0
         cls.vapi.ipsec_spd_add_del(cls.tun_spd_id)
         cls.vapi.ipsec_interface_add_del_spd(cls.tun_spd_id,
@@ -236,3 +236,8 @@ class IPSecNATTestCase(TemplateIpsec):
         self.pg_start()
         capture = self.pg1.get_capture(len(pkts))
         self.verify_capture_plain(capture)
+
+
+class IPSecNAT(TemplateIPSecNAT):
+    """ IPSec/NAT """
+    pass
diff --git a/test/test_ipsecmb_ah.py b/test/test_ipsecmb_ah.py
new file mode 100644
index 00000000000..294d5ceeb89
--- /dev/null
+++ b/test/test_ipsecmb_ah.py
@@ -0,0 +1,31 @@
+from test_ipsec_ah import TemplateIpsecAh
+from template_ipsec import IpsecTraTests, IpsecTunTests, IpsecTcpTests
+
+
+class TestIpsecMBAh1(TemplateIpsecAh, IpsecTraTests, IpsecTunTests):
+    """ IpsecMB AH - TUN & TRA tests """
+    extra_vpp_plugin_config = [
+        "plugin", "ipsecmb_plugin.so", "{", "enable", "}"]
+
+    tra4_encrypt_node_name = "ah4-encrypt-ipsecmb"
+    tra4_decrypt_node_name = "ah4-decrypt-ipsecmb"
+    tra6_encrypt_node_name = "ah6-encrypt-ipsecmb"
+    tra6_decrypt_node_name = "ah6-decrypt-ipsecmb"
+    tun4_encrypt_node_name = "ah4-encrypt-ipsecmb"
+    tun4_decrypt_node_name = "ah4-decrypt-ipsecmb"
+    tun6_encrypt_node_name = "ah6-encrypt-ipsecmb"
+    tun6_decrypt_node_name = "ah6-decrypt-ipsecmb"
+
+    @classmethod
+    def ipsec_select_backend(cls):
+        cls.vapi.ipsec_select_backend(protocol=cls.vpp_ah_protocol, index=1)
+
+
+class TestIpsecMBAh2(TemplateIpsecAh, IpsecTcpTests):
+    """ IpsecMB AH - TCP tests """
+    extra_vpp_plugin_config = [
+        "plugin", "ipsecmb_plugin.so", "{", "enable", "}"]
+
+    @classmethod
+    def ipsec_select_backend(cls):
+        cls.vapi.ipsec_select_backend(protocol=cls.vpp_ah_protocol, index=1)
diff --git a/test/test_ipsecmb_esp.py b/test/test_ipsecmb_esp.py
new file mode 100644
index 00000000000..cf60724fca6
--- /dev/null
+++ b/test/test_ipsecmb_esp.py
@@ -0,0 +1,30 @@
+from test_ipsec_esp import TemplateIpsecEsp
+from template_ipsec import IpsecTraTests, IpsecTunTests, IpsecTcpTests
+
+
+class TestIpsecMBEsp1(TemplateIpsecEsp, IpsecTraTests, IpsecTunTests):
+    """ IpsecMB ESP - TUN & TRA tests """
+    extra_vpp_plugin_config = [
+        "plugin", "ipsecmb_plugin.so", "{", "enable", "}"]
+    tra4_encrypt_node_name = "esp4-encrypt-ipsecmb"
+    tra4_decrypt_node_name = "esp4-decrypt-ipsecmb"
+    tra6_encrypt_node_name = "esp6-encrypt-ipsecmb"
+    tra6_decrypt_node_name = "esp6-decrypt-ipsecmb"
+    tun4_encrypt_node_name = "esp4-encrypt-ipsecmb"
+    tun4_decrypt_node_name = "esp4-decrypt-ipsecmb"
+    tun6_encrypt_node_name = "esp6-encrypt-ipsecmb"
+    tun6_decrypt_node_name = "esp6-decrypt-ipsecmb"
+
+    @classmethod
+    def ipsec_select_backend(cls):
+        cls.vapi.ipsec_select_backend(protocol=cls.vpp_esp_protocol, index=1)
+
+
+class TestIpsecMBEsp2(TemplateIpsecEsp, IpsecTcpTests):
+    """ IpsecMB ESP - TCP tests """
+    extra_vpp_plugin_config = [
+        "plugin", "ipsecmb_plugin.so", "{", "enable", "}"]
+
+    @classmethod
+    def ipsec_select_backend(cls):
+        cls.vapi.ipsec_select_backend(protocol=cls.vpp_esp_protocol, index=1)
diff --git a/test/test_ipsecmb_nat.py b/test/test_ipsecmb_nat.py
new file mode 100644
index 00000000000..82f5daa0fb1
--- /dev/null
+++ b/test/test_ipsecmb_nat.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from test_ipsec_nat import TemplateIPSecNAT
+
+
+class IPSecMBNATTestCase(TemplateIPSecNAT):
+    """ IPSecMB/NAT """
+    extra_vpp_plugin_config = [
+        "plugin", "ipsecmb_plugin.so", "{", "enable", "}"]
+
+    @classmethod
+    def ipsec_select_backend(cls):
+        cls.vapi.ipsec_select_backend(protocol=cls.vpp_ah_protocol, index=1)