From 4a7cbcd06b3fa1f44366a606d5c148cce816503b Mon Sep 17 00:00:00 2001
From: Florin Coras <florin.coras@gmail.com>
Date: Wed, 2 Jan 2019 17:43:01 +0000
Subject: Revert "add ipsecmb plugin"

This reverts commit be16020c5034bc69df25a8ecd7081aec9898d93c.

The arm verify job actually failed but the result was overwritten by an x86 ubuntu retry.

Change-Id: Idcae7691fc575053563b8ff8bcad661c15891668
Signed-off-by: Florin Coras <fcoras@cisco.com>
---
 test/test_ipsec_nat.py   |  9 ++-------
 test/test_ipsecmb_ah.py  | 31 -------------------------------
 test/test_ipsecmb_esp.py | 30 ------------------------------
 test/test_ipsecmb_nat.py | 13 -------------
 4 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 test/test_ipsecmb_ah.py
 delete mode 100644 test/test_ipsecmb_esp.py
 delete mode 100644 test/test_ipsecmb_nat.py

(limited to 'test')

diff --git a/test/test_ipsec_nat.py b/test/test_ipsec_nat.py
index 7e6e1d4d912..e9efa032a13 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 TemplateIPSecNAT(TemplateIpsec):
+class IPSecNATTestCase(TemplateIpsec):
     """ IPSec/NAT
     TUNNEL MODE:
 
@@ -33,7 +33,7 @@ class TemplateIPSecNAT(TemplateIpsec):
 
     @classmethod
     def setUpClass(cls):
-        super(TemplateIPSecNAT, cls).setUpClass()
+        super(IPSecNATTestCase, 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,8 +236,3 @@ class TemplateIPSecNAT(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
deleted file mode 100644
index 294d5ceeb89..00000000000
--- a/test/test_ipsecmb_ah.py
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index cf60724fca6..00000000000
--- a/test/test_ipsecmb_esp.py
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 82f5daa0fb1..00000000000
--- a/test/test_ipsecmb_nat.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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)
-- 
cgit 1.2.3-korg