nat: use correct data types for memory sizes

[vpp.git] / test / test_ipsec_esp.py

diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py
index 5b057e7..6be49ef 100644 (file)
--- a/test/test_ipsec_esp.py
+++ b/test/test_ipsec_esp.py
@@ -509,9 +509,10 @@ class RunTestIpsecEspAll(ConfigIpsecESP,
                            count=NUM_PKTS)
 
         LARGE_PKT_SZ = [
+            1970,  # results in 2 chained buffers entering decrypt node
+                   # but leaving as simple buffer due to ICV removal (tra4)
             4010,  # ICV ends up splitted accross 2 buffers in esp_decrypt
                    # for transport4; transport6 takes normal path
-
             4020,  # same as above but tra4 and tra6 are switched
         ]
         if self.engine in engines_supporting_chain_bufs:
@@ -545,6 +546,7 @@ class RunTestIpsecEspAll(ConfigIpsecESP,
 # GEN     AES-GCM-192/NONE AES-GCM-256/NONE AES-CBC-128/MD5-96 \
 # GEN     AES-CBC-192/SHA1-96 AES-CBC-256/SHA1-96 \
 # GEN     3DES-CBC/SHA1-96 NONE/SHA1-96; do \
+# GEN      [[ ${FLG} == "ESN" &&  ${ALG} == *"NONE" ]] && continue
 # GEN      echo -e "\n\nclass Test_${ENG}_${FLG}_${ALG}(RunTestIpsecEspAll):" |
 # GEN             sed -e 's/-/_/g' -e 's#/#_#g' ; \
 # GEN      echo '    """'$ENG $FLG $ALG IPSec test'"""' ;
@@ -601,24 +603,6 @@ class Test_ia32_noESN_NONE_SHA1_96(RunTestIpsecEspAll):
         self.run_test()
 
 
-class Test_ia32_ESN_AES_GCM_128_NONE(RunTestIpsecEspAll):
-    """ia32 ESN AES-GCM-128/NONE IPSec test"""
-    def test_ipsec(self):
-        self.run_test()
-
-
-class Test_ia32_ESN_AES_GCM_192_NONE(RunTestIpsecEspAll):
-    """ia32 ESN AES-GCM-192/NONE IPSec test"""
-    def test_ipsec(self):
-        self.run_test()
-
-
-class Test_ia32_ESN_AES_GCM_256_NONE(RunTestIpsecEspAll):
-    """ia32 ESN AES-GCM-256/NONE IPSec test"""
-    def test_ipsec(self):
-        self.run_test()
-
-
 class Test_ia32_ESN_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """ia32 ESN AES-CBC-128/MD5-96 IPSec test"""
     def test_ipsec(self):
@@ -697,24 +681,6 @@ class Test_ipsecmb_noESN_NONE_SHA1_96(RunTestIpsecEspAll):
         self.run_test()
 
 
-class Test_ipsecmb_ESN_AES_GCM_128_NONE(RunTestIpsecEspAll):
-    """ipsecmb ESN AES-GCM-128/NONE IPSec test"""
-    def test_ipsec(self):
-        self.run_test()
-
-
-class Test_ipsecmb_ESN_AES_GCM_192_NONE(RunTestIpsecEspAll):
-    """ipsecmb ESN AES-GCM-192/NONE IPSec test"""
-    def test_ipsec(self):
-        self.run_test()
-
-
-class Test_ipsecmb_ESN_AES_GCM_256_NONE(RunTestIpsecEspAll):
-    """ipsecmb ESN AES-GCM-256/NONE IPSec test"""
-    def test_ipsec(self):
-        self.run_test()
-
-
 class Test_ipsecmb_ESN_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """ipsecmb ESN AES-CBC-128/MD5-96 IPSec test"""
     def test_ipsec(self):
@@ -793,24 +759,6 @@ class Test_openssl_noESN_NONE_SHA1_96(RunTestIpsecEspAll):
         self.run_test()
 
 
-class Test_openssl_ESN_AES_GCM_128_NONE(RunTestIpsecEspAll):
-    """openssl ESN AES-GCM-128/NONE IPSec test"""
-    def test_ipsec(self):
-        self.run_test()
-
-
-class Test_openssl_ESN_AES_GCM_192_NONE(RunTestIpsecEspAll):
-    """openssl ESN AES-GCM-192/NONE IPSec test"""
-    def test_ipsec(self):
-        self.run_test()
-
-
-class Test_openssl_ESN_AES_GCM_256_NONE(RunTestIpsecEspAll):
-    """openssl ESN AES-GCM-256/NONE IPSec test"""
-    def test_ipsec(self):
-        self.run_test()
-
-
 class Test_openssl_ESN_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """openssl ESN AES-CBC-128/MD5-96 IPSec test"""
     def test_ipsec(self):