X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ipsec_esp.py;h=c3a6b43996c91d83d37d1b054ed8664dcb233be1;hb=7f9b7f9f492d1748d8ba025b3a713058fdb1943d;hp=09b72401541163b7c3e331cbc4333cbff1a46376;hpb=53f526b680973df1455bbc77986ec133d470898a;p=vpp.git

diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py
index 09b72401541..c3a6b43996c 100644
--- a/test/test_ipsec_esp.py
+++ b/test/test_ipsec_esp.py
@@ -5,7 +5,7 @@ from scapy.layers.inet import UDP
 
 from framework import VppTestRunner
 from template_ipsec import IpsecTra46Tests, IpsecTun46Tests, TemplateIpsec, \
-    IpsecTcpTests, IpsecTun4Tests, IpsecTra4Tests
+    IpsecTcpTests, IpsecTun4Tests, IpsecTra4Tests, config_tra_params
 from vpp_ipsec import VppIpsecSpd, VppIpsecSpdEntry, VppIpsecSA,\
         VppIpsecSpdItfBinding
 from vpp_ip_route import VppIpRoute, VppRoutePath
@@ -153,11 +153,11 @@ class TemplateIpsecEsp(TemplateIpsec):
 
     Below 4 cases are covered as part of this test
     1) ipsec esp v4 transport basic test  - IPv4 Transport mode
-        scenario using HMAC-SHA1-96 intergrity algo
+        scenario using HMAC-SHA1-96 integrity algo
     2) ipsec esp v4 transport burst test
         Above test for 257 pkts
     3) ipsec esp 4o4 tunnel basic test    - IPv4 Tunnel mode
-        scenario using HMAC-SHA1-96 intergrity algo
+        scenario using HMAC-SHA1-96 integrity algo
     4) ipsec esp 4o4 tunnel burst test
         Above test for 257 pkts
 
@@ -177,8 +177,14 @@ class TemplateIpsecEsp(TemplateIpsec):
     |pg0| ------->  |VPP| ------> |pg1|
      ---             ---           ---
     """
-    config_esp_tun = config_esp_tun
-    config_esp_tra = config_esp_tra
+
+    @classmethod
+    def setUpClass(cls):
+        super(TemplateIpsecEsp, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TemplateIpsecEsp, cls).tearDownClass()
 
     def setUp(self):
         super(TemplateIpsecEsp, self).setUp()
@@ -193,8 +199,8 @@ class TemplateIpsecEsp(TemplateIpsec):
                               self.tra_if).add_vpp_config()
 
         for _, p in self.params.items():
-            self.config_esp_tra(p)
-            self.configure_sa_tra(p)
+            config_esp_tra(self, p)
+            config_tra_params(p, self.encryption_type)
         self.logger.info(self.vapi.ppcli("show ipsec"))
 
         self.tun_spd = VppIpsecSpd(self, self.tun_spd_id)
@@ -203,7 +209,7 @@ class TemplateIpsecEsp(TemplateIpsec):
                               self.tun_if).add_vpp_config()
 
         for _, p in self.params.items():
-            self.config_esp_tun(p)
+            config_esp_tun(self, p)
         self.logger.info(self.vapi.ppcli("show ipsec"))
 
         for _, p in self.params.items():
@@ -241,8 +247,14 @@ class TemplateIpsecEspUdp(TemplateIpsec):
     """
     UDP encapped ESP
     """
-    config_esp_tun = config_esp_tun
-    config_esp_tra = config_esp_tra
+
+    @classmethod
+    def setUpClass(cls):
+        super(TemplateIpsecEspUdp, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TemplateIpsecEspUdp, cls).tearDownClass()
 
     def setUp(self):
         super(TemplateIpsecEspUdp, self).setUp()
@@ -261,15 +273,15 @@ class TemplateIpsecEspUdp(TemplateIpsec):
         VppIpsecSpdItfBinding(self, self.tra_spd,
                               self.tra_if).add_vpp_config()
 
-        self.config_esp_tra(p)
-        self.configure_sa_tra(p)
+        config_esp_tra(self, p)
+        config_tra_params(p, self.encryption_type)
 
         self.tun_spd = VppIpsecSpd(self, self.tun_spd_id)
         self.tun_spd.add_vpp_config()
         VppIpsecSpdItfBinding(self, self.tun_spd,
                               self.tun_if).add_vpp_config()
 
-        self.config_esp_tun(p)
+        config_esp_tun(self, p)
         self.logger.info(self.vapi.ppcli("show ipsec"))
 
         d = DpoProto.DPO_PROTO_IP4